consolidate test rulesets into single file

dlm6693 · Nov 16, 2023 · 6961570 · 6961570
1 parent 3e75ac1
commit 6961570
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 86 deletions.
diff --git a/tests/unit/data/endpoints/valid-rules/aws-account-id.json b/tests/unit/data/endpoints/valid-rules/aws-account-id.json
diff --git a/...nts/valid-rules/aws-credential-scope.json → ...ta/endpoints/valid-rules/credentials.json b/...nts/valid-rules/aws-credential-scope.json → ...ta/endpoints/valid-rules/credentials.json
@@ -5,6 +5,11 @@
       "builtIn": "AWS::Region",
       "documentation": "The region to dispatch this request, eg. `us-east-1`."
     },
+    "AccountId": {
+      "type": "string",
+      "builtIn": "AWS::Auth::AccountId",
+      "documentation": "The account ID to dispatch this request, eg. `123456789012`."
+    },
     "CredentialScope": {
       "type": "string",
       "builtIn": "AWS::Auth::CredentialScope",
@@ -13,7 +18,7 @@
   },
   "rules": [
     {
-      "documentation": "Template the credential scope into the URI when it is set",
+    "documentation": "Template the credential scope into the URI when it is set",
       "conditions": [
         {
           "fn": "isSet",
@@ -58,7 +63,41 @@
       "type": "endpoint"
     },
     {
-      "documentation": "Fallback when credential scope isn't set",
+      "documentation": "Template the account ID into the URI when account ID is set",
+      "conditions": [
+        {
+          "fn": "isSet",
+          "argv": [
+            {
+              "ref": "AccountId"
+            }
+          ]
+        },
+        {
+          "fn": "isSet",
+          "argv": [
+            {
+              "ref": "Region"
+            }
+          ]
+        }
+      ],
+      "endpoint": {
+        "url": "https://{AccountId}.amazonaws.com",
+        "properties": {
+          "authSchemes": [
+            {
+              "name": "sigv4",
+              "signingName": "serviceName",
+              "signingRegion": "{Region}"
+            }
+          ]
+        }
+      },
+      "type": "endpoint"
+    },
+    {
+      "documentation": "Fallback when account ID and credential scope aren't set",
       "conditions": [
         {
           "fn": "isSet",
@@ -83,7 +122,6 @@
       },
       "type": "endpoint"
     },
-
     {
       "documentation": "fallback when region is unset",
       "conditions": [],