Patch in a few more schema issues

aws-cloudformation · Jun 21, 2024 · 6992a72 · 6992a72
1 parent 7ed0377
commit 6992a72
Show file tree

Hide file tree

Showing 72 changed files with 6,504 additions and 330 deletions.
diff --git a/...nloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json b/...nloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json
@@ -1 +1 @@
-{"etag": "\"bb0848e7da2d2fe268507920fe4bcfcb\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"05654284dad54e6b1cdd6bfa0e9354bc\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/...nloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json b/...nloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json
@@ -1 +1 @@
-{"etag": "\"fe1ef75cacc7621574c01a09a6a6ec16\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"a1f848436addd536bd60599ef5b5f231\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cloudwatch_insightrule/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_cloudwatch_insightrule/__init__.py
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cloudwatch_insightrule/tags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_cloudwatch_insightrule/tags.json
@@ -0,0 +1,28 @@
+[
+ {
+  "op": "test",
+  "path": "/definitions/Tags",
+  "value": {
+   "additionalProperties": false,
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/definitions/Tags",
+  "value": {
+   "items": {
+    "properties": {
+     "Key": {
+      "type": "string"
+     },
+     "Value": {
+      "type": "string"
+     }
+    },
+    "type": "object"
+   },
+   "type": "array"
+  }
+ }
+]
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_transfer_server/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_transfer_server/__init__.py
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_transfer_server/protocol.json b/src/cfnlint/data/schemas/patches/providers/all/aws_transfer_server/protocol.json
@@ -0,0 +1,17 @@
+[
+ {
+  "op": "test",
+  "path": "/definitions/Protocol",
+  "value": {
+   "additionalProperties": false,
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/definitions/Protocol",
+  "value": {
+   "type": "string"
+  }
+ }
+]
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_transfer_user/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_transfer_user/__init__.py
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_transfer_user/sshpublickeys.json b/src/cfnlint/data/schemas/patches/providers/all/aws_transfer_user/sshpublickeys.json
@@ -0,0 +1,17 @@
+[
+ {
+  "op": "test",
+  "path": "/definitions/SshPublicKey",
+  "value": {
+   "additionalProperties": false,
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/definitions/SshPublicKey",
+  "value": {
+   "type": "string"
+  }
+ }
+]
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/__init__.py b/src/cfnlint/data/schemas/providers/af_south_1/__init__.py
@@ -1478,7 +1478,6 @@
     "aws-redshift-scheduledaction.json",
     "aws-rds-dbsecuritygroup.json",
     "aws-apigatewayv2-routeresponse.json",
-    "aws-cloudwatch-metricstream.json",
     "aws-sso-applicationassignment.json",
     "aws-dms-dataprovider.json",
     "aws-ssm-parameter.json",

diff --git a/...theast_1/aws-cloudwatch-metricstream.json → ..._south_1/aws-cloudwatch-metricstream.json b/...theast_1/aws-cloudwatch-metricstream.json → ..._south_1/aws-cloudwatch-metricstream.json
@@ -1,19 +1,33 @@
 {
  "additionalProperties": false,
- "allOf": [
+ "anyOf": [
   {
    "required": [
     "FirehoseArn",
     "RoleArn",
     "OutputFormat"
    ]
   },
+  {
+   "allOf": [
+    {
+     "required": [
+      "FirehoseArn",
+      "RoleArn",
+      "OutputFormat"
+     ]
+    }
+   ]
+  },
   {
    "oneOf": [
-    {},
     {
      "required": [
-      "IncludeFilters",
+      "IncludeFilters"
+     ]
+    },
+    {
+     "required": [
       "ExcludeFilters"
      ]
     }
@@ -103,7 +117,7 @@
     },
     "Value": {
      "maxLength": 256,
-     "minLength": 0,
+     "minLength": 1,
      "type": "string"
     }
    },
@@ -247,6 +261,11 @@
   "/properties/LastUpdateDate",
   "/properties/State"
  ],
+ "required": [
+  "FirehoseArn",
+  "RoleArn",
+  "OutputFormat"
+ ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
  "taggable": true,
  "typeName": "AWS::CloudWatch::MetricStream",

diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py
@@ -1458,7 +1458,6 @@
     "aws-redshift-scheduledaction.json",
     "aws-rds-dbsecuritygroup.json",
     "aws-apigatewayv2-routeresponse.json",
-    "aws-cloudwatch-metricstream.json",
     "aws-sso-applicationassignment.json",
     "aws-dms-dataprovider.json",
     "aws-ssm-parameter.json",

diff --git a/...theast_1/aws-cloudwatch-metricstream.json → ...p_east_1/aws-cloudwatch-metricstream.json b/...theast_1/aws-cloudwatch-metricstream.json → ...p_east_1/aws-cloudwatch-metricstream.json
@@ -1,19 +1,33 @@
 {
  "additionalProperties": false,
- "allOf": [
+ "anyOf": [
   {
    "required": [
     "FirehoseArn",
     "RoleArn",
     "OutputFormat"
    ]
   },
+  {
+   "allOf": [
+    {
+     "required": [
+      "FirehoseArn",
+      "RoleArn",
+      "OutputFormat"
+     ]
+    }
+   ]
+  },
   {
    "oneOf": [
-    {},
     {
      "required": [
-      "IncludeFilters",
+      "IncludeFilters"
+     ]
+    },
+    {
+     "required": [
       "ExcludeFilters"
      ]
     }
@@ -103,7 +117,7 @@
     },
     "Value": {
      "maxLength": 256,
-     "minLength": 0,
+     "minLength": 1,
      "type": "string"
     }
    },
@@ -247,6 +261,11 @@
   "/properties/LastUpdateDate",
   "/properties/State"
  ],
+ "required": [
+  "FirehoseArn",
+  "RoleArn",
+  "OutputFormat"
+ ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
  "taggable": true,
  "typeName": "AWS::CloudWatch::MetricStream",

diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py
@@ -2282,6 +2282,7 @@
     "aws-mediapackage-channel.json",
     "aws-apigatewayv2-routeresponse.json",
     "aws-codeartifact-packagegroup.json",
+    "aws-cloudwatch-metricstream.json",
     "aws-sso-applicationassignment.json",
     "aws-dms-dataprovider.json",
     "aws-location-geofencecollection.json",

diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py
@@ -2076,7 +2076,6 @@
     "aws-rds-dbsecuritygroup.json",
     "aws-mediapackage-channel.json",
     "aws-apigatewayv2-routeresponse.json",
-    "aws-cloudwatch-metricstream.json",
     "aws-sso-applicationassignment.json",
     "aws-dms-dataprovider.json",
     "aws-ssm-parameter.json",

diff --git a/..._north_1/aws-cloudwatch-metricstream.json → ...theast_2/aws-cloudwatch-metricstream.json b/..._north_1/aws-cloudwatch-metricstream.json → ...theast_2/aws-cloudwatch-metricstream.json
@@ -1,19 +1,33 @@
 {
  "additionalProperties": false,
- "allOf": [
+ "anyOf": [
   {
    "required": [
     "FirehoseArn",
     "RoleArn",
     "OutputFormat"
    ]
   },
+  {
+   "allOf": [
+    {
+     "required": [
+      "FirehoseArn",
+      "RoleArn",
+      "OutputFormat"
+     ]
+    }
+   ]
+  },
   {
    "oneOf": [
-    {},
     {
      "required": [
-      "IncludeFilters",
+      "IncludeFilters"
+     ]
+    },
+    {
+     "required": [
       "ExcludeFilters"
      ]
     }
@@ -103,7 +117,7 @@
     },
     "Value": {
      "maxLength": 256,
-     "minLength": 0,
+     "minLength": 1,
      "type": "string"
     }
    },
@@ -247,6 +261,11 @@
   "/properties/LastUpdateDate",
   "/properties/State"
  ],
+ "required": [
+  "FirehoseArn",
+  "RoleArn",
+  "OutputFormat"
+ ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
  "taggable": true,
  "typeName": "AWS::CloudWatch::MetricStream",

diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py
@@ -1417,7 +1417,6 @@
     "aws-rds-dbsecuritygroup.json",
     "aws-mediapackage-channel.json",
     "aws-apigatewayv2-routeresponse.json",
-    "aws-cloudwatch-metricstream.json",
     "aws-sso-applicationassignment.json",
     "aws-dms-dataprovider.json",
     "aws-ssm-parameter.json",

diff --git a/...entral_1/aws-cloudwatch-metricstream.json → ...theast_3/aws-cloudwatch-metricstream.json b/...entral_1/aws-cloudwatch-metricstream.json → ...theast_3/aws-cloudwatch-metricstream.json
@@ -1,19 +1,33 @@
 {
  "additionalProperties": false,
- "allOf": [
+ "anyOf": [
   {
    "required": [
     "FirehoseArn",
     "RoleArn",
     "OutputFormat"
    ]
   },
+  {
+   "allOf": [
+    {
+     "required": [
+      "FirehoseArn",
+      "RoleArn",
+      "OutputFormat"
+     ]
+    }
+   ]
+  },
   {
    "oneOf": [
-    {},
     {
      "required": [
-      "IncludeFilters",
+      "IncludeFilters"
+     ]
+    },
+    {
+     "required": [
       "ExcludeFilters"
      ]
     }
@@ -103,7 +117,7 @@
     },
     "Value": {
      "maxLength": 256,
-     "minLength": 0,
+     "minLength": 1,
      "type": "string"
     }
    },
@@ -247,6 +261,11 @@
   "/properties/LastUpdateDate",
   "/properties/State"
  ],
+ "required": [
+  "FirehoseArn",
+  "RoleArn",
+  "OutputFormat"
+ ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
  "taggable": true,
  "typeName": "AWS::CloudWatch::MetricStream",

diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py
@@ -2080,7 +2080,6 @@
     "aws-apigatewayv2-routeresponse.json",
     "aws-codeartifact-packagegroup.json",
     "aws-quicksight-topic.json",
-    "aws-cloudwatch-metricstream.json",
     "aws-sso-applicationassignment.json",
     "aws-dms-dataprovider.json",
     "aws-location-geofencecollection.json",