Convert json resource properties into better json schem validation (#…

…3423)

* JSON object type cleanup
* 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/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json

@@ -1 +1 @@
-{"etag": "\"77f8f0ff694760d9d86001ab4dca1909\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"cab7c18393919e17ef44d9fca8c62008\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"bb135f465b3346b7dea602d254e4c44c\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"ca78dae4bedfa5f1574d2d0cafd31df2\"", "url": "https://schema.cloudformation.ca-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

@@ -0,0 +1,20 @@
+[
+ {
+  "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

@@ -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_apigateway_restapi/policy.json

@@ -0,0 +1,20 @@
+[
+ {
+  "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,22 @@
+[
+ {
+  "op": "test",
+  "path": "/properties/Tags",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/Tags",
+  "value": {
+   "additionalProperties": false,
+   "patternProperties": {
+    ".*": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  }
+ }
+]

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,22 @@
+[
+ {
+  "op": "test",
+  "path": "/properties/Tags",
+  "value": {
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/properties/Tags",
+  "value": {
+   "additionalProperties": false,
+   "patternProperties": {
+    ".*": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  }
+ }
+]

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"
+   ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_integrationresponse/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"
+   ]
+  }
+ }
+]

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_integrationresponse/responsetemplates.json

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

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

@@ -0,0 +1,20 @@
+[
+ {
+  "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_apigatewayv2_route/requestmodels.json

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

src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_route/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"
+   ]
+  }
+ }
+]