AWS WAF Update: Add v2 smoke tests and smithy smokeTests trait for SDK testing.

AWS · AWS · commit 4a2726a443b5 · 2024-06-17T18:14:52.000Z
diff --git a/.changes/next-release/feature-AWSWAF-e196a9b.json b/.changes/next-release/feature-AWSWAF-e196a9b.json
@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS WAF",
+    "contributor": "",
+    "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/services/waf/src/main/resources/codegen-resources/waf/endpoint-rule-set.json b/services/waf/src/main/resources/codegen-resources/waf/endpoint-rule-set.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": [
@@ -235,7 +233,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -270,7 +267,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -281,14 +277,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": [
@@ -302,14 +300,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -318,11 +314,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -333,14 +329,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -354,7 +352,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -374,7 +371,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -385,14 +381,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -403,9 +401,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/services/waf/src/main/resources/codegen-resources/waf/service-2.json b/services/waf/src/main/resources/codegen-resources/waf/service-2.json
@@ -5,12 +5,14 @@
     "endpointPrefix":"waf",
     "jsonVersion":"1.1",
     "protocol":"json",
+    "protocols":["json"],
     "serviceAbbreviation":"WAF",
     "serviceFullName":"AWS WAF",
     "serviceId":"WAF",
     "signatureVersion":"v4",
     "targetPrefix":"AWSWAF_20150824",
-    "uid":"waf-2015-08-24"
+    "uid":"waf-2015-08-24",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "CreateByteMatchSet":{

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@`
`40`	`40`	`]`
`41`	`41`	`}`
`42`	`42`	`],`
`43`		`- "type": "tree",`
`44`	`43`	`"rules": [`
`45`	`44`	`{`
`46`	`45`	`"conditions": [`
`@@ -83,7 +82,8 @@`
`83`	`82`	`},`
`84`	`83`	`"type": "endpoint"`
`85`	`84`	`}`
`86`		`- ]`
	`85`	`+ ],`
	`86`	`+ "type": "tree"`
`87`	`87`	`},`
`88`	`88`	`{`
`89`	`89`	`"conditions": [`
`@@ -96,7 +96,6 @@`
`96`	`96`	`]`
`97`	`97`	`}`
`98`	`98`	`],`
`99`		`- "type": "tree",`
`100`	`99`	`"rules": [`
`101`	`100`	`{`
`102`	`101`	`"conditions": [`
`@@ -110,7 +109,6 @@`
`110`	`109`	`"assign": "PartitionResult"`
`111`	`110`	`}`
`112`	`111`	`],`
`113`		`- "type": "tree",`
`114`	`112`	`"rules": [`
`115`	`113`	`{`
`116`	`114`	`"conditions": [`
`@@ -235,7 +233,6 @@`
`235`	`233`	`]`
`236`	`234`	`}`
`237`	`235`	`],`
`238`		`- "type": "tree",`
`239`	`236`	`"rules": [`
`240`	`237`	`{`
`241`	`238`	`"conditions": [`
`@@ -270,7 +267,6 @@`
`270`	`267`	`]`
`271`	`268`	`}`
`272`	`269`	`],`
`273`		`- "type": "tree",`
`274`	`270`	`"rules": [`
`275`	`271`	`{`
`276`	`272`	`"conditions": [],`
`@@ -281,14 +277,16 @@`
`281`	`277`	`},`
`282`	`278`	`"type": "endpoint"`
`283`	`279`	`}`
`284`		`- ]`
	`280`	`+ ],`
	`281`	`+ "type": "tree"`
`285`	`282`	`},`
`286`	`283`	`{`
`287`	`284`	`"conditions": [],`
`288`	`285`	`"error": "FIPS and DualStack are enabled, but this partition does not support one or both",`
`289`	`286`	`"type": "error"`
`290`	`287`	`}`
`291`		`- ]`
	`288`	`+ ],`
	`289`	`+ "type": "tree"`
`292`	`290`	`},`
`293`	`291`	`{`
`294`	`292`	`"conditions": [`
`@@ -302,14 +300,12 @@`
`302`	`300`	`]`
`303`	`301`	`}`
`304`	`302`	`],`
`305`		`- "type": "tree",`
`306`	`303`	`"rules": [`
`307`	`304`	`{`
`308`	`305`	`"conditions": [`
`309`	`306`	`{`
`310`	`307`	`"fn": "booleanEquals",`
`311`	`308`	`"argv": [`
`312`		`- true,`
`313`	`309`	`{`
`314`	`310`	`"fn": "getAttr",`
`315`	`311`	`"argv": [`
`@@ -318,11 +314,11 @@`
`318`	`314`	`},`
`319`	`315`	`"supportsFIPS"`
`320`	`316`	`]`
`321`		`- }`
	`317`	`+ },`
	`318`	`+ true`
`322`	`319`	`]`
`323`	`320`	`}`
`324`	`321`	`],`
`325`		`- "type": "tree",`
`326`	`322`	`"rules": [`
`327`	`323`	`{`
`328`	`324`	`"conditions": [],`
`@@ -333,14 +329,16 @@`
`333`	`329`	`},`
`334`	`330`	`"type": "endpoint"`
`335`	`331`	`}`
`336`		`- ]`
	`332`	`+ ],`
	`333`	`+ "type": "tree"`
`337`	`334`	`},`
`338`	`335`	`{`
`339`	`336`	`"conditions": [],`
`340`	`337`	`"error": "FIPS is enabled but this partition does not support FIPS",`
`341`	`338`	`"type": "error"`
`342`	`339`	`}`
`343`		`- ]`
	`340`	`+ ],`
	`341`	`+ "type": "tree"`
`344`	`342`	`},`
`345`	`343`	`{`
`346`	`344`	`"conditions": [`
`@@ -354,7 +352,6 @@`
`354`	`352`	`]`
`355`	`353`	`}`
`356`	`354`	`],`
`357`		`- "type": "tree",`
`358`	`355`	`"rules": [`
`359`	`356`	`{`
`360`	`357`	`"conditions": [`
`@@ -374,7 +371,6 @@`
`374`	`371`	`]`
`375`	`372`	`}`
`376`	`373`	`],`
`377`		`- "type": "tree",`
`378`	`374`	`"rules": [`
`379`	`375`	`{`
`380`	`376`	`"conditions": [],`
`@@ -385,14 +381,16 @@`
`385`	`381`	`},`
`386`	`382`	`"type": "endpoint"`
`387`	`383`	`}`
`388`		`- ]`
	`384`	`+ ],`
	`385`	`+ "type": "tree"`
`389`	`386`	`},`
`390`	`387`	`{`
`391`	`388`	`"conditions": [],`
`392`	`389`	`"error": "DualStack is enabled but this partition does not support DualStack",`
`393`	`390`	`"type": "error"`
`394`	`391`	`}`
`395`		`- ]`
	`392`	`+ ],`
	`393`	`+ "type": "tree"`
`396`	`394`	`},`
`397`	`395`	`{`
`398`	`396`	`"conditions": [],`
`@@ -403,9 +401,11 @@`
`403`	`401`	`},`
`404`	`402`	`"type": "endpoint"`
`405`	`403`	`}`
`406`		`- ]`
	`404`	`+ ],`
	`405`	`+ "type": "tree"`
`407`	`406`	`}`
`408`		`- ]`
	`407`	`+ ],`
	`408`	`+ "type": "tree"`
`409`	`409`	`},`
`410`	`410`	`{`
`411`	`411`	`"conditions": [],`