Convert all json properties to support string too

.pre-commit-config.yaml

@@ -24,18 +24,18 @@ repos:
     hooks:
     - id: isort
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.4.4"
+    rev: "v0.4.10"
     hooks:
       - id: ruff
   - repo: https://github.com/PyCQA/bandit
-    rev: "1.7.8"
+    rev: "1.7.9"
     hooks:
       - id: bandit
         additional_dependencies:
         - "bandit[toml]"
         args: ["-c", "pyproject.toml"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.10.0"
+    rev: "v1.10.1"
     hooks:
     - id: mypy
       additional_dependencies:

src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json

@@ -1 +1 @@
-{"etag": "\"b658285000afc83f21ab25b390d22e7f\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"9afc60ca795ea9f3bd3399d820201ffb\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json

@@ -1 +1 @@
-{"etag": "\"58cb8abae39cb16173d1dcfb5774b930\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"b026f401ac1698c34da9505b2687c666\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json

@@ -1 +1 @@
-{"etag": "\"834f790a8008964e76e447e2a8432aea\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"9cae6b551468d4777291165964ac439d\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json

@@ -1 +1 @@
-{"etag": "\"9d74a5b82b6011e69a3f13ef657ffb01\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"ff2d86966614e2da2818a06627b839b4\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json

@@ -1 +1 @@
-{"etag": "\"87dbe8d72b114f79fbc608c98806364a\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"66934d611a2eb3f5c8878ea30df0351d\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json

@@ -1 +1 @@
-{"etag": "\"fc2de0a27081580b398d58c00348446e\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"5292e9a834f0c72f512ff815414232f0\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json

@@ -1 +1 @@
-{"etag": "\"20bd1097ea12df81de72376235c6670e\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"cf0cf4bff0da3e45998eaea296e3ca27\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json

@@ -1 +1 @@
-{"etag": "\"8ad868ec672f842b68b05600b5a5d103\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"d34ccc2ac672aba8821b3afc1cc7a6bc\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json

@@ -1 +1 @@
-{"etag": "\"fa0b097f427f0f923400285b256dfafb\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"eb993b3a9009cdf11b131cb1ad6c9d7d\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json

@@ -1 +1 @@
-{"etag": "\"55e291fbd1d194744195d829488aaf0b\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"330741cbbbacf1fc399fd4b5c32210b5\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json

@@ -1 +1 @@
-{"etag": "\"a48bf3fc3f1917a864d583600f4bf38d\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"8bedc60ccb57f9f836f1f576c107b12d\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json

@@ -1 +1 @@
-{"etag": "\"9d35728649cd2bfeac7fbcdd355cab1b\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"955fdade794e290a83d37778bf3c44e6\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/schemas/patches/providers/all/alexa_ask_skill/overrides_manifest.json

@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/definitions/Overrides/properties/Manifest",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/definitions/Overrides/properties/Manifest",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
+   ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_model/schema.json

@@ -1,19 +1,20 @@
 [
-    {
-     "op": "test",
-     "path": "/properties/Schema",
-     "value": {
-      "type": "object"
-     }
-    },
-    {
-     "op": "replace",
-     "path": "/properties/Schema",
-     "value": {
-      "type": [
-       "object",
-       "string"
-      ]
-     }
-    }
+ {
+  "op": "test",
+  "path": "/properties/Schema",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/Schema",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
    ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/body.json

@@ -1,19 +1,20 @@
 [
-    {
-     "op": "test",
-     "path": "/properties/Body",
-     "value": {
-      "type": "object"
-     }
-    },
-    {
-     "op": "replace",
-     "path": "/properties/Body",
-     "value": {
-      "type": [
-       "object",
-       "string"
-      ]
-     }
-    }
+ {
+  "op": "test",
+  "path": "/properties/Body",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/Body",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
    ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/policy.json

@@ -1,19 +1,20 @@
 [
-    {
-     "op": "test",
-     "path": "/properties/Policy",
-     "value": {
-      "type": "object"
-     }
-    },
-    {
-     "op": "replace",
-     "path": "/properties/Policy",
-     "value": {
-      "type": [
-       "object",
-       "string"
-      ]
-     }
-    }
+ {
+  "op": "test",
+  "path": "/properties/Policy",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/Policy",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
    ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_api/body.json

@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/properties/Body",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/Body",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
+   ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_api/tags.json

@@ -0,0 +1,32 @@
+[
+ {
+  "op": "test",
+  "path": "/properties/Tags",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/Tags",
+  "value": {
+   "items": {
+    "additionalProperties": false,
+    "properties": {
+     "Key": {
+      "type": "string"
+     },
+     "Value": {
+      "type": "string"
+     }
+    },
+    "required": [
+     "Value",
+     "Key"
+    ],
+    "type": "object"
+   },
+   "type": "array"
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_apigatewaymanagedoverrides/stageoverrides_routesettings.json

@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/definitions/StageOverrides/properties/RouteSettings",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/definitions/StageOverrides/properties/RouteSettings",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
+   ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_apigatewaymanagedoverrides/stageoverrides_stagevariables.json

@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/definitions/StageOverrides/properties/StageVariables",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/definitions/StageOverrides/properties/StageVariables",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
+   ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_domainname/tags.json

@@ -0,0 +1,32 @@
+[
+ {
+  "op": "test",
+  "path": "/properties/Tags",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/Tags",
+  "value": {
+   "items": {
+    "additionalProperties": false,
+    "properties": {
+     "Key": {
+      "type": "string"
+     },
+     "Value": {
+      "type": "string"
+     }
+    },
+    "required": [
+     "Value",
+     "Key"
+    ],
+    "type": "object"
+   },
+   "type": "array"
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_integration/requestparameters.json

@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/properties/RequestParameters",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/RequestParameters",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
+   ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_integration/requesttemplates.json

@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/properties/RequestTemplates",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/RequestTemplates",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
+   ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_integration/responseparameters.json

@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/properties/ResponseParameters",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/ResponseParameters",
+  "value": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
+   ]
+  }
+ }
+]