diff --git a/.changes/1.34.130.json b/.changes/1.34.130.json
new file mode 100644
index 0000000000..4ca212f92a
--- /dev/null
+++ b/.changes/1.34.130.json
@@ -0,0 +1,32 @@
+[
+  {
+    "category": "``artifact``",
+    "description": "This release adds an acceptanceType field to the ReportSummary structure (used in the ListReports API response).",
+    "type": "api-change"
+  },
+  {
+    "category": "``athena``",
+    "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+    "type": "api-change"
+  },
+  {
+    "category": "``cur``",
+    "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+    "type": "api-change"
+  },
+  {
+    "category": "``directconnect``",
+    "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+    "type": "api-change"
+  },
+  {
+    "category": "``elastictranscoder``",
+    "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+    "type": "api-change"
+  },
+  {
+    "category": "``opensearch``",
+    "description": "This release enables customers to use JSON Web Tokens (JWT) for authentication on their Amazon OpenSearch Service domains.",
+    "type": "api-change"
+  }
+]
\ No newline at end of file
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a24e714557..cb252668e6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.34.130
+========
+
+* api-change:``artifact``: This release adds an acceptanceType field to the ReportSummary structure (used in the ListReports API response).
+* api-change:``athena``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``cur``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``directconnect``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``elastictranscoder``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``opensearch``: This release enables customers to use JSON Web Tokens (JWT) for authentication on their Amazon OpenSearch Service domains.
+
+
 1.34.129
 ========
 
diff --git a/botocore/__init__.py b/botocore/__init__.py
index 5fab6b03a2..d1cc761e96 100644
--- a/botocore/__init__.py
+++ b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.34.129'
+__version__ = '1.34.130'
 
 
 class NullHandler(logging.Handler):
diff --git a/botocore/data/artifact/2018-05-10/service-2.json b/botocore/data/artifact/2018-05-10/service-2.json
index 690eb4ed9e..21144648ac 100644
--- a/botocore/data/artifact/2018-05-10/service-2.json
+++ b/botocore/data/artifact/2018-05-10/service-2.json
@@ -2,9 +2,10 @@
   "version":"2.0",
   "metadata":{
     "apiVersion":"2018-05-10",
+    "auth":["aws.auth#sigv4"],
     "endpointPrefix":"artifact",
-    "jsonVersion":"1.1",
     "protocol":"rest-json",
+    "protocols":["rest-json"],
     "serviceFullName":"AWS Artifact",
     "serviceId":"Artifact",
     "signatureVersion":"v4",
@@ -345,13 +346,13 @@
     "ListReportsResponse":{
       "type":"structure",
       "members":{
-        "nextToken":{
-          "shape":"NextTokenAttribute",
-          "documentation":"<p>Pagination token to request the next page of resources.</p>"
-        },
         "reports":{
           "shape":"ReportsList",
           "documentation":"<p>List of report resources.</p>"
+        },
+        "nextToken":{
+          "shape":"NextTokenAttribute",
+          "documentation":"<p>Pagination token to request the next page of resources.</p>"
         }
       }
     },
@@ -359,7 +360,7 @@
       "type":"string",
       "max":1024,
       "min":1,
-      "pattern":"^[^<>]*$"
+      "pattern":"[^<>]*"
     },
     "MaxResultsAttribute":{
       "type":"integer",
@@ -404,151 +405,155 @@
     "ReportDetail":{
       "type":"structure",
       "members":{
-        "acceptanceType":{
-          "shape":"AcceptanceType",
-          "documentation":"<p>Acceptance type for report.</p>"
-        },
-        "arn":{
-          "shape":"LongStringAttribute",
-          "documentation":"<p>ARN for the report resource.</p>"
-        },
-        "category":{
-          "shape":"ShortStringAttribute",
-          "documentation":"<p>Category for the report resource.</p>"
+        "id":{
+          "shape":"ReportId",
+          "documentation":"<p>Unique resource ID for the report resource.</p>"
         },
-        "companyName":{
+        "name":{
           "shape":"ShortStringAttribute",
-          "documentation":"<p>Associated company name for the report resource.</p>"
-        },
-        "createdAt":{
-          "shape":"TimestampAttribute",
-          "documentation":"<p>Timestamp indicating when the report resource was created.</p>"
-        },
-        "deletedAt":{
-          "shape":"TimestampAttribute",
-          "documentation":"<p>Timestamp indicating when the report resource was deleted.</p>"
+          "documentation":"<p>Name for the report resource.</p>"
         },
         "description":{
           "shape":"LongStringAttribute",
           "documentation":"<p>Description for the report resource.</p>"
         },
-        "id":{
-          "shape":"ReportId",
-          "documentation":"<p>Unique resource ID for the report resource.</p>"
-        },
-        "lastModifiedAt":{
+        "periodStart":{
           "shape":"TimestampAttribute",
-          "documentation":"<p>Timestamp indicating when the report resource was last modified.</p>"
-        },
-        "name":{
-          "shape":"ShortStringAttribute",
-          "documentation":"<p>Name for the report resource.</p>"
+          "documentation":"<p>Timestamp indicating the report resource effective start.</p>"
         },
         "periodEnd":{
           "shape":"TimestampAttribute",
           "documentation":"<p>Timestamp indicating the report resource effective end.</p>"
         },
-        "periodStart":{
+        "createdAt":{
           "shape":"TimestampAttribute",
-          "documentation":"<p>Timestamp indicating the report resource effective start.</p>"
+          "documentation":"<p>Timestamp indicating when the report resource was created.</p>"
         },
-        "productName":{
-          "shape":"ShortStringAttribute",
-          "documentation":"<p>Associated product name for the report resource.</p>"
+        "lastModifiedAt":{
+          "shape":"TimestampAttribute",
+          "documentation":"<p>Timestamp indicating when the report resource was last modified.</p>"
         },
-        "sequenceNumber":{
-          "shape":"SequenceNumberAttribute",
-          "documentation":"<p>Sequence number to enforce optimistic locking.</p>"
+        "deletedAt":{
+          "shape":"TimestampAttribute",
+          "documentation":"<p>Timestamp indicating when the report resource was deleted.</p>"
+        },
+        "state":{
+          "shape":"PublishedState",
+          "documentation":"<p>Current state of the report resource</p>"
+        },
+        "arn":{
+          "shape":"LongStringAttribute",
+          "documentation":"<p>ARN for the report resource.</p>"
         },
         "series":{
           "shape":"ShortStringAttribute",
           "documentation":"<p>Series for the report resource.</p>"
         },
-        "state":{
-          "shape":"PublishedState",
-          "documentation":"<p>Current state of the report resource</p>"
+        "category":{
+          "shape":"ShortStringAttribute",
+          "documentation":"<p>Category for the report resource.</p>"
         },
-        "statusMessage":{
-          "shape":"StatusMessage",
-          "documentation":"<p>The message associated with the current upload state.</p>"
+        "companyName":{
+          "shape":"ShortStringAttribute",
+          "documentation":"<p>Associated company name for the report resource.</p>"
+        },
+        "productName":{
+          "shape":"ShortStringAttribute",
+          "documentation":"<p>Associated product name for the report resource.</p>"
         },
         "termArn":{
           "shape":"LongStringAttribute",
           "documentation":"<p>Unique resource ARN for term resource.</p>"
         },
+        "version":{
+          "shape":"VersionAttribute",
+          "documentation":"<p>Version for the report resource.</p>"
+        },
+        "acceptanceType":{
+          "shape":"AcceptanceType",
+          "documentation":"<p>Acceptance type for report.</p>"
+        },
+        "sequenceNumber":{
+          "shape":"SequenceNumberAttribute",
+          "documentation":"<p>Sequence number to enforce optimistic locking.</p>"
+        },
         "uploadState":{
           "shape":"UploadState",
           "documentation":"<p>The current state of the document upload.</p>"
         },
-        "version":{
-          "shape":"VersionAttribute",
-          "documentation":"<p>Version for the report resource.</p>"
+        "statusMessage":{
+          "shape":"StatusMessage",
+          "documentation":"<p>The message associated with the current upload state.</p>"
         }
       },
       "documentation":"<p>Full detail for report resource metadata.</p>"
     },
     "ReportId":{
       "type":"string",
-      "pattern":"^report-[a-zA-Z0-9]{16}$"
+      "pattern":"report-[a-zA-Z0-9]{16}"
     },
     "ReportSummary":{
       "type":"structure",
       "members":{
+        "id":{
+          "shape":"ReportId",
+          "documentation":"<p>Unique resource ID for the report resource.</p>"
+        },
+        "name":{
+          "shape":"ShortStringAttribute",
+          "documentation":"<p>Name for the report resource.</p>"
+        },
+        "state":{
+          "shape":"PublishedState",
+          "documentation":"<p>Current state of the report resource.</p>"
+        },
         "arn":{
           "shape":"LongStringAttribute",
           "documentation":"<p>ARN for the report resource.</p>"
         },
-        "category":{
-          "shape":"ShortStringAttribute",
-          "documentation":"<p>Category for the report resource.</p>"
+        "version":{
+          "shape":"VersionAttribute",
+          "documentation":"<p>Version for the report resource.</p>"
         },
-        "companyName":{
-          "shape":"ShortStringAttribute",
-          "documentation":"<p>Associated company name for the report resource.</p>"
+        "uploadState":{
+          "shape":"UploadState",
+          "documentation":"<p>The current state of the document upload.</p>"
         },
         "description":{
           "shape":"LongStringAttribute",
           "documentation":"<p>Description for the report resource.</p>"
         },
-        "id":{
-          "shape":"ReportId",
-          "documentation":"<p>Unique resource ID for the report resource.</p>"
-        },
-        "name":{
-          "shape":"ShortStringAttribute",
-          "documentation":"<p>Name for the report resource.</p>"
+        "periodStart":{
+          "shape":"TimestampAttribute",
+          "documentation":"<p>Timestamp indicating the report resource effective start.</p>"
         },
         "periodEnd":{
           "shape":"TimestampAttribute",
           "documentation":"<p>Timestamp indicating the report resource effective end.</p>"
         },
-        "periodStart":{
-          "shape":"TimestampAttribute",
-          "documentation":"<p>Timestamp indicating the report resource effective start.</p>"
+        "series":{
+          "shape":"ShortStringAttribute",
+          "documentation":"<p>Series for the report resource.</p>"
         },
-        "productName":{
+        "category":{
           "shape":"ShortStringAttribute",
-          "documentation":"<p>Associated product name for the report resource.</p>"
+          "documentation":"<p>Category for the report resource.</p>"
         },
-        "series":{
+        "companyName":{
           "shape":"ShortStringAttribute",
-          "documentation":"<p>Series for the report resource.</p>"
+          "documentation":"<p>Associated company name for the report resource.</p>"
         },
-        "state":{
-          "shape":"PublishedState",
-          "documentation":"<p>Current state of the report resource.</p>"
+        "productName":{
+          "shape":"ShortStringAttribute",
+          "documentation":"<p>Associated product name for the report resource.</p>"
         },
         "statusMessage":{
           "shape":"StatusMessage",
           "documentation":"<p>The message associated with the current upload state.</p>"
         },
-        "uploadState":{
-          "shape":"UploadState",
-          "documentation":"<p>The current state of the document upload.</p>"
-        },
-        "version":{
-          "shape":"VersionAttribute",
-          "documentation":"<p>Version for the report resource.</p>"
+        "acceptanceType":{
+          "shape":"AcceptanceType",
+          "documentation":"<p>Acceptance type for report.</p>"
         }
       },
       "documentation":"<p>Summary for report resource.</p>"
@@ -591,17 +596,13 @@
       "type":"structure",
       "required":[
         "message",
-        "quotaCode",
         "resourceId",
         "resourceType",
-        "serviceCode"
+        "serviceCode",
+        "quotaCode"
       ],
       "members":{
         "message":{"shape":"String"},
-        "quotaCode":{
-          "shape":"String",
-          "documentation":"<p>Code for the affected quota.</p>"
-        },
         "resourceId":{
           "shape":"String",
           "documentation":"<p>Identifier of the affected resource.</p>"
@@ -613,6 +614,10 @@
         "serviceCode":{
           "shape":"String",
           "documentation":"<p>Code for the affected service.</p>"
+        },
+        "quotaCode":{
+          "shape":"String",
+          "documentation":"<p>Code for the affected quota.</p>"
         }
       },
       "documentation":"<p>Request would cause a service quota to be exceeded.</p>",
@@ -626,7 +631,7 @@
       "type":"string",
       "max":256,
       "min":1,
-      "pattern":"^[a-zA-Z0-9_\\-\\s]*$"
+      "pattern":"[a-zA-Z0-9_\\-\\s]*"
     },
     "StatusMessage":{"type":"string"},
     "String":{"type":"string"},
@@ -635,6 +640,10 @@
       "required":["message"],
       "members":{
         "message":{"shape":"String"},
+        "serviceCode":{
+          "shape":"String",
+          "documentation":"<p>Code for the affected service.</p>"
+        },
         "quotaCode":{
           "shape":"String",
           "documentation":"<p>Code for the affected quota.</p>"
@@ -644,10 +653,6 @@
           "documentation":"<p>Number of seconds in which the caller can retry the request.</p>",
           "location":"header",
           "locationName":"Retry-After"
-        },
-        "serviceCode":{
-          "shape":"String",
-          "documentation":"<p>Code for the affected service.</p>"
         }
       },
       "documentation":"<p>Request was denied due to request throttling.</p>",
@@ -678,14 +683,14 @@
         "reason"
       ],
       "members":{
-        "fieldList":{
-          "shape":"ValidationExceptionFieldList",
-          "documentation":"<p>The field that caused the error, if applicable.</p>"
-        },
         "message":{"shape":"String"},
         "reason":{
           "shape":"ValidationExceptionReason",
           "documentation":"<p>Reason the request failed validation.</p>"
+        },
+        "fieldList":{
+          "shape":"ValidationExceptionFieldList",
+          "documentation":"<p>The field that caused the error, if applicable.</p>"
         }
       },
       "documentation":"<p>Request fails to satisfy the constraints specified by an AWS service.</p>",
@@ -698,17 +703,17 @@
     "ValidationExceptionField":{
       "type":"structure",
       "required":[
-        "message",
-        "name"
+        "name",
+        "message"
       ],
       "members":{
-        "message":{
-          "shape":"String",
-          "documentation":"<p>Message describing why the field failed validation.</p>"
-        },
         "name":{
           "shape":"String",
           "documentation":"<p>Name of validation exception.</p>"
+        },
+        "message":{
+          "shape":"String",
+          "documentation":"<p>Message describing why the field failed validation.</p>"
         }
       },
       "documentation":"<p>Validation exception message and name.</p>"
diff --git a/botocore/data/artifact/2018-05-10/waiters-2.json b/botocore/data/artifact/2018-05-10/waiters-2.json
new file mode 100644
index 0000000000..13f60ee66b
--- /dev/null
+++ b/botocore/data/artifact/2018-05-10/waiters-2.json
@@ -0,0 +1,5 @@
+{
+  "version": 2,
+  "waiters": {
+  }
+}
diff --git a/botocore/data/athena/2017-05-18/service-2.json b/botocore/data/athena/2017-05-18/service-2.json
index 8d98300bde..66375fe17b 100644
--- a/botocore/data/athena/2017-05-18/service-2.json
+++ b/botocore/data/athena/2017-05-18/service-2.json
@@ -10,7 +10,8 @@
     "serviceId":"Athena",
     "signatureVersion":"v4",
     "targetPrefix":"AmazonAthena",
-    "uid":"athena-2017-05-18"
+    "uid":"athena-2017-05-18",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "BatchGetNamedQuery":{
diff --git a/botocore/data/cur/2017-01-06/service-2.json b/botocore/data/cur/2017-01-06/service-2.json
index 36235badd3..fdcfdaa773 100644
--- a/botocore/data/cur/2017-01-06/service-2.json
+++ b/botocore/data/cur/2017-01-06/service-2.json
@@ -5,12 +5,14 @@
     "endpointPrefix":"cur",
     "jsonVersion":"1.1",
     "protocol":"json",
+    "protocols":["json"],
     "serviceFullName":"AWS Cost and Usage Report Service",
     "serviceId":"Cost and Usage Report Service",
     "signatureVersion":"v4",
     "signingName":"cur",
     "targetPrefix":"AWSOrigamiServiceGatewayService",
-    "uid":"cur-2017-01-06"
+    "uid":"cur-2017-01-06",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "DeleteReportDefinition":{
diff --git a/botocore/data/directconnect/2012-10-25/endpoint-rule-set-1.json b/botocore/data/directconnect/2012-10-25/endpoint-rule-set-1.json
index 72a011aafa..c255b39924 100644
--- a/botocore/data/directconnect/2012-10-25/endpoint-rule-set-1.json
+++ b/botocore/data/directconnect/2012-10-25/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,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/botocore/data/directconnect/2012-10-25/service-2.json b/botocore/data/directconnect/2012-10-25/service-2.json
index 7de7943fee..cd9fafcb86 100644
--- a/botocore/data/directconnect/2012-10-25/service-2.json
+++ b/botocore/data/directconnect/2012-10-25/service-2.json
@@ -5,11 +5,13 @@
     "endpointPrefix":"directconnect",
     "jsonVersion":"1.1",
     "protocol":"json",
+    "protocols":["json"],
     "serviceFullName":"AWS Direct Connect",
     "serviceId":"Direct Connect",
     "signatureVersion":"v4",
     "targetPrefix":"OvertureService",
-    "uid":"directconnect-2012-10-25"
+    "uid":"directconnect-2012-10-25",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "AcceptDirectConnectGatewayAssociationProposal":{
diff --git a/botocore/data/elastictranscoder/2012-09-25/endpoint-rule-set-1.json b/botocore/data/elastictranscoder/2012-09-25/endpoint-rule-set-1.json
index 29f802e532..e6fea0075e 100644
--- a/botocore/data/elastictranscoder/2012-09-25/endpoint-rule-set-1.json
+++ b/botocore/data/elastictranscoder/2012-09-25/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,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/botocore/data/elastictranscoder/2012-09-25/service-2.json b/botocore/data/elastictranscoder/2012-09-25/service-2.json
index 980f4d4dc4..e589644af1 100644
--- a/botocore/data/elastictranscoder/2012-09-25/service-2.json
+++ b/botocore/data/elastictranscoder/2012-09-25/service-2.json
@@ -4,10 +4,12 @@
     "apiVersion":"2012-09-25",
     "endpointPrefix":"elastictranscoder",
     "protocol":"rest-json",
+    "protocols":["rest-json"],
     "serviceFullName":"Amazon Elastic Transcoder",
     "serviceId":"Elastic Transcoder",
     "signatureVersion":"v4",
-    "uid":"elastictranscoder-2012-09-25"
+    "uid":"elastictranscoder-2012-09-25",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "CancelJob":{
diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json
index 89026614d9..ee333c2c88 100644
--- a/botocore/data/endpoints.json
+++ b/botocore/data/endpoints.json
@@ -25256,6 +25256,44 @@
           "us-gov-west-1" : { }
         }
       },
+      "kinesisvideo" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "deprecated" : true,
+            "hostname" : "kinesisvideo-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "deprecated" : true,
+            "hostname" : "kinesisvideo-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "kinesisvideo-fips.us-gov-east-1.amazonaws.com",
+            "variants" : [ {
+              "hostname" : "kinesisvideo-fips.us-gov-east-1.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "kinesisvideo-fips.us-gov-west-1.amazonaws.com",
+            "variants" : [ {
+              "hostname" : "kinesisvideo-fips.us-gov-west-1.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          }
+        }
+      },
       "kms" : {
         "endpoints" : {
           "ProdFips" : {
diff --git a/botocore/data/opensearch/2021-01-01/service-2.json b/botocore/data/opensearch/2021-01-01/service-2.json
index e195aa2023..4414ddf9a9 100644
--- a/botocore/data/opensearch/2021-01-01/service-2.json
+++ b/botocore/data/opensearch/2021-01-01/service-2.json
@@ -8,7 +8,8 @@
     "serviceFullName":"Amazon OpenSearch Service",
     "serviceId":"OpenSearch",
     "signatureVersion":"v4",
-    "uid":"opensearch-2021-01-01"
+    "uid":"opensearch-2021-01-01",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "AcceptInboundConnection":{
@@ -1282,6 +1283,10 @@
           "shape":"SAMLOptionsOutput",
           "documentation":"<p>Container for information about the SAML configuration for OpenSearch Dashboards.</p>"
         },
+        "JWTOptions":{
+          "shape":"JWTOptionsOutput",
+          "documentation":"<p>Container for information about the JWT configuration of the Amazon OpenSearch Service.</p>"
+        },
         "AnonymousAuthDisableDate":{
           "shape":"DisableTimestamp",
           "documentation":"<p>Date and time when the migration period will be disabled. Only necessary when <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/fgac.html#fgac-enabling-existing\">enabling fine-grained access control on an existing domain</a>.</p>"
@@ -1312,6 +1317,10 @@
           "shape":"SAMLOptionsInput",
           "documentation":"<p>Container for information about the SAML configuration for OpenSearch Dashboards.</p>"
         },
+        "JWTOptions":{
+          "shape":"JWTOptionsInput",
+          "documentation":"<p>Container for information about the JWT configuration of the Amazon OpenSearch Service. </p>"
+        },
         "AnonymousAuthEnabled":{
           "shape":"Boolean",
           "documentation":"<p>True to enable a 30-day migration period during which administrators can create role mappings. Only necessary when <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/fgac.html#fgac-enabling-existing\">enabling fine-grained access control on an existing domain</a>.</p>"
@@ -3904,7 +3913,7 @@
         },
         "Status":{
           "shape":"DataSourceStatus",
-          "documentation":"<p>The status of the data source response.</p>"
+          "documentation":"<p>The status of the data source.</p>"
         }
       },
       "documentation":"<p>The result of a <code>GetDataSource</code> operation.</p>"
@@ -4280,6 +4289,50 @@
       "type":"list",
       "member":{"shape":"Issue"}
     },
+    "JWTOptionsInput":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>True to enable JWT authentication and authorization for a domain.</p>"
+        },
+        "SubjectKey":{
+          "shape":"SubjectKey",
+          "documentation":"<p>Element of the JWT assertion to use for the user name.</p>"
+        },
+        "RolesKey":{
+          "shape":"RolesKey",
+          "documentation":"<p>Element of the JWT assertion to use for roles.</p>"
+        },
+        "PublicKey":{
+          "shape":"String",
+          "documentation":"<p>Element of the JWT assertion used by the cluster to verify JWT signatures.</p>"
+        }
+      },
+      "documentation":"<p>The JWT authentication and authorization configuration for an Amazon OpenSearch Service domain.</p>"
+    },
+    "JWTOptionsOutput":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>True if JWT use is enabled.</p>"
+        },
+        "SubjectKey":{
+          "shape":"String",
+          "documentation":"<p>The key used for matching the JWT subject attribute.</p>"
+        },
+        "RolesKey":{
+          "shape":"String",
+          "documentation":"<p>The key used for matching the JWT roles attribute.</p>"
+        },
+        "PublicKey":{
+          "shape":"String",
+          "documentation":"<p>The key used to verify the signature of incoming JWT requests.</p>"
+        }
+      },
+      "documentation":"<p>Describes the JWT options configured for the domain.</p>"
+    },
     "KmsKeyId":{
       "type":"string",
       "max":500,
@@ -5704,6 +5757,11 @@
       "min":20,
       "pattern":"arn:(aws|aws\\-cn|aws\\-us\\-gov|aws\\-iso|aws\\-iso\\-b):iam::[0-9]+:role\\/.*"
     },
+    "RolesKey":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
     "RollbackOnDisable":{
       "type":"string",
       "documentation":"<p>The rollback state while disabling Auto-Tune for the domain.</p>",
@@ -6176,6 +6234,11 @@
       "type":"list",
       "member":{"shape":"String"}
     },
+    "SubjectKey":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
     "TLSSecurityPolicy":{
       "type":"string",
       "enum":[
@@ -6262,7 +6325,7 @@
         },
         "Status":{
           "shape":"DataSourceStatus",
-          "documentation":"<p>The status of the data source update request.</p>"
+          "documentation":"<p>The status of the data source update.</p>"
         }
       },
       "documentation":"<p>Container for the parameters to the <code>UpdateDataSource</code> operation.</p>"
diff --git a/docs/source/conf.py b/docs/source/conf.py
index cb42efeb8b..546ae9c085 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = '1.34.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.34.129'
+release = '1.34.130'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.