AWS AppConfig Data Update: Fix FIPS Endpoints in aws-us-gov.

AWS · AWS · commit f969c452c77d · 2024-01-22T19:11:15.000Z
diff --git a/.changes/next-release/feature-AWSAppConfigData-5470690.json b/.changes/next-release/feature-AWSAppConfigData-5470690.json
@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS AppConfig Data",
+    "contributor": "",
+    "description": "Fix FIPS Endpoints in aws-us-gov."
+}
diff --git a/services/appconfigdata/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/appconfigdata/src/main/resources/codegen-resources/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": [
@@ -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,12 +212,37 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
+                                        {
+                                            "conditions": [
+                                                {
+                                                    "fn": "stringEquals",
+                                                    "argv": [
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "name"
+                                                            ]
+                                                        },
+                                                        "aws-us-gov"
+                                                    ]
+                                                }
+                                            ],
+                                            "endpoint": {
+                                                "url": "https://appconfigdata.{Region}.amazonaws.com",
+                                                "properties": {},
+                                                "headers": {}
+                                            },
+                                            "type": "endpoint"
+                                        },
                                         {
                                             "conditions": [],
                                             "endpoint": {
@@ -231,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +324,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/services/appconfigdata/src/main/resources/codegen-resources/endpoint-tests.json b/services/appconfigdata/src/main/resources/codegen-resources/endpoint-tests.json
@@ -420,7 +420,7 @@
             "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://appconfigdata-fips.us-gov-east-1.amazonaws.com"
+                    "url": "https://appconfigdata.us-gov-east-1.amazonaws.com"
                 }
             },
             "params": {

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": [`
`@@ -133,7 +131,6 @@`
`133`	`131`	`]`
`134`	`132`	`}`
`135`	`133`	`],`
`136`		`- "type": "tree",`
`137`	`134`	`"rules": [`
`138`	`135`	`{`
`139`	`136`	`"conditions": [`
`@@ -168,7 +165,6 @@`
`168`	`165`	`]`
`169`	`166`	`}`
`170`	`167`	`],`
`171`		`- "type": "tree",`
`172`	`168`	`"rules": [`
`173`	`169`	`{`
`174`	`170`	`"conditions": [],`
`@@ -179,14 +175,16 @@`
`179`	`175`	`},`
`180`	`176`	`"type": "endpoint"`
`181`	`177`	`}`
`182`		`- ]`
	`178`	`+ ],`
	`179`	`+ "type": "tree"`
`183`	`180`	`},`
`184`	`181`	`{`
`185`	`182`	`"conditions": [],`
`186`	`183`	`"error": "FIPS and DualStack are enabled, but this partition does not support one or both",`
`187`	`184`	`"type": "error"`
`188`	`185`	`}`
`189`		`- ]`
	`186`	`+ ],`
	`187`	`+ "type": "tree"`
`190`	`188`	`},`
`191`	`189`	`{`
`192`	`190`	`"conditions": [`
`@@ -200,14 +198,12 @@`
`200`	`198`	`]`
`201`	`199`	`}`
`202`	`200`	`],`
`203`		`- "type": "tree",`
`204`	`201`	`"rules": [`
`205`	`202`	`{`
`206`	`203`	`"conditions": [`
`207`	`204`	`{`
`208`	`205`	`"fn": "booleanEquals",`
`209`	`206`	`"argv": [`
`210`		`- true,`
`211`	`207`	`{`
`212`	`208`	`"fn": "getAttr",`
`213`	`209`	`"argv": [`
`@@ -216,12 +212,37 @@`
`216`	`212`	`},`
`217`	`213`	`"supportsFIPS"`
`218`	`214`	`]`
`219`		`- }`
	`215`	`+ },`
	`216`	`+ true`
`220`	`217`	`]`
`221`	`218`	`}`
`222`	`219`	`],`
`223`		`- "type": "tree",`
`224`	`220`	`"rules": [`
	`221`	`+ {`
	`222`	`+ "conditions": [`
	`223`	`+ {`
	`224`	`+ "fn": "stringEquals",`
	`225`	`+ "argv": [`
	`226`	`+ {`
	`227`	`+ "fn": "getAttr",`
	`228`	`+ "argv": [`
	`229`	`+ {`
	`230`	`+ "ref": "PartitionResult"`
	`231`	`+ },`
	`232`	`+ "name"`
	`233`	`+ ]`
	`234`	`+ },`
	`235`	`+ "aws-us-gov"`
	`236`	`+ ]`
	`237`	`+ }`
	`238`	`+ ],`
	`239`	`+ "endpoint": {`
	`240`	`+ "url": "https://appconfigdata.{Region}.amazonaws.com",`
	`241`	`+ "properties": {},`
	`242`	`+ "headers": {}`
	`243`	`+ },`
	`244`	`+ "type": "endpoint"`
	`245`	`+ },`
`225`	`246`	`{`
`226`	`247`	`"conditions": [],`
`227`	`248`	`"endpoint": {`
`@@ -231,14 +252,16 @@`
`231`	`252`	`},`
`232`	`253`	`"type": "endpoint"`
`233`	`254`	`}`
`234`		`- ]`
	`255`	`+ ],`
	`256`	`+ "type": "tree"`
`235`	`257`	`},`
`236`	`258`	`{`
`237`	`259`	`"conditions": [],`
`238`	`260`	`"error": "FIPS is enabled but this partition does not support FIPS",`
`239`	`261`	`"type": "error"`
`240`	`262`	`}`
`241`		`- ]`
	`263`	`+ ],`
	`264`	`+ "type": "tree"`
`242`	`265`	`},`
`243`	`266`	`{`
`244`	`267`	`"conditions": [`
`@@ -252,7 +275,6 @@`
`252`	`275`	`]`
`253`	`276`	`}`
`254`	`277`	`],`
`255`		`- "type": "tree",`
`256`	`278`	`"rules": [`
`257`	`279`	`{`
`258`	`280`	`"conditions": [`
`@@ -272,7 +294,6 @@`
`272`	`294`	`]`
`273`	`295`	`}`
`274`	`296`	`],`
`275`		`- "type": "tree",`
`276`	`297`	`"rules": [`
`277`	`298`	`{`
`278`	`299`	`"conditions": [],`
`@@ -283,14 +304,16 @@`
`283`	`304`	`},`
`284`	`305`	`"type": "endpoint"`
`285`	`306`	`}`
`286`		`- ]`
	`307`	`+ ],`
	`308`	`+ "type": "tree"`
`287`	`309`	`},`
`288`	`310`	`{`
`289`	`311`	`"conditions": [],`
`290`	`312`	`"error": "DualStack is enabled but this partition does not support DualStack",`
`291`	`313`	`"type": "error"`
`292`	`314`	`}`
`293`		`- ]`
	`315`	`+ ],`
	`316`	`+ "type": "tree"`
`294`	`317`	`},`
`295`	`318`	`{`
`296`	`319`	`"conditions": [],`
`@@ -301,9 +324,11 @@`
`301`	`324`	`},`
`302`	`325`	`"type": "endpoint"`
`303`	`326`	`}`
`304`		`- ]`
	`327`	`+ ],`
	`328`	`+ "type": "tree"`
`305`	`329`	`}`
`306`		`- ]`
	`330`	`+ ],`
	`331`	`+ "type": "tree"`
`307`	`332`	`},`
`308`	`333`	`{`
`309`	`334`	`"conditions": [],`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@`
`420`	`420`	`"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",`
`421`	`421`	`"expect": {`
`422`	`422`	`"endpoint": {`
`423`		`- "url": "https://appconfigdata-fips.us-gov-east-1.amazonaws.com"`
	`423`	`+ "url": "https://appconfigdata.us-gov-east-1.amazonaws.com"`
`424`	`424`	`}`
`425`	`425`	`},`
`426`	`426`	`"params": {`