Revert SQS protocol changes

SamRemis · Nov 21, 2023 · 9d07df9 · 9d07df9
1 parent 6e0ec83
commit 9d07df9
Show file tree

Hide file tree

Showing 4 changed files with 322 additions and 409 deletions.
diff --git a/.changes/next-release/bugfix-sqs-67962.json b/.changes/next-release/bugfix-sqs-67962.json
@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "sqs",
+  "description": "Rolled back recent change to wire format protocol"
+}
diff --git a/botocore/data/sqs/2012-11-05/endpoint-rule-set-1.json b/botocore/data/sqs/2012-11-05/endpoint-rule-set-1.json
@@ -40,6 +40,7 @@
                     ]
                 }
             ],
+            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -82,8 +83,7 @@
                     },
                     "type": "endpoint"
                 }
-            ],
-            "type": "tree"
+            ]
         },
         {
             "conditions": [
@@ -96,6 +96,7 @@
                     ]
                 }
             ],
+            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -109,6 +110,7 @@
                             "assign": "PartitionResult"
                         }
                     ],
+                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -131,6 +133,7 @@
                                     ]
                                 }
                             ],
+                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -165,6 +168,7 @@
                                             ]
                                         }
                                     ],
+                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -175,16 +179,14 @@
                                             },
                                             "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": [
@@ -198,12 +200,14 @@
                                     ]
                                 }
                             ],
+                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
+                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -212,17 +216,18 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                },
-                                                true
+                                                }
                                             ]
                                         }
                                     ],
+                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
+                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -231,8 +236,7 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        },
-                                                        "aws-us-gov"
+                                                        }
                                                     ]
                                                 }
                                             ],
@@ -252,16 +256,14 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ],
-                                    "type": "tree"
+                                    ]
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ],
-                            "type": "tree"
+                            ]
                         },
                         {
                             "conditions": [
@@ -275,6 +277,7 @@
                                     ]
                                 }
                             ],
+                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -294,6 +297,7 @@
                                             ]
                                         }
                                     ],
+                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -304,16 +308,14 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ],
-                                    "type": "tree"
+                                    ]
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ],
-                            "type": "tree"
+                            ]
                         },
                         {
                             "conditions": [],
@@ -324,11 +326,9 @@
                             },
                             "type": "endpoint"
                         }
-                    ],
-                    "type": "tree"
+                    ]
                 }
-            ],
-            "type": "tree"
+            ]
         },
         {
             "conditions": [],