Patch AWS::Glue::SecurityConfiguration and other resource issues (#3371)

* Patch s3 encryption for AWS::Glue::SecurityConfiguration
* Patch in a few more schema issues

src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json

@@ -1 +1 @@
-{"etag": "\"087e99e1ab3bde74923d6a7b3c24fcd6\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"07903209c6db4f89f261743b11f0c11a\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json

@@ -1 +1 @@
-{"etag": "\"3cafd914f4935c3841f1dd0598715fa4\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"40267d0f81599b30854d25f40be73c4d\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json

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

src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json

@@ -1 +1 @@
-{"etag": "\"00d9040f11ddf55b145416d7ed48aa3a\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"fd87d257d9d228e6c6e1ef2c00ab6d9b\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json

@@ -1 +1 @@
-{"etag": "\"d2b9b751b48e2e384de79f01dc131f19\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"6d5965d0a338dfd69b7291aac2290208\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json

@@ -1 +1 @@
-{"etag": "\"335ff38a57d1a89695fcfd1c2470a55e\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"1b78bced7eb52159929d4e2255d2cae9\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json

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

src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json

@@ -1 +1 @@
-{"etag": "\"4068081c6a3339218909e461921934ec\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"402b563254e0765a2ea6c30f516634c6\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json

@@ -1 +1 @@
-{"etag": "\"d8d4f3f86473a403329acb6c72b66547\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"11b67461dd38d2b3547f51f44d34b6d5\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"e63c897c463335198d41d4a33a276a27\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"ebf4273457e71a460f2394004739f0b8\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"6019cf2b598c20334f8d0d1ee3dacf14\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"024c03fa1a45f8e182db8ae83cdd31c1\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"014b30c426afef040318008b5001ba7e\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"05654284dad54e6b1cdd6bfa0e9354bc\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"baff5f51b5b375d6fc5c69794cda7e78\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"fc49d7fdaebcdbe567b58ea44eabf48d\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"8dfcb97d79108da7a3a9bee471753ebd\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"fbfb07c0253c5754f009d71e4c8bb80d\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"f9cac20eb9de7d911294162b3ee171c5\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"a07395e3bd669f3e72ea2df9639898e8\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"afe5254cefc9cf52c52231147b14e53b\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"de613316af2381c4996ae1d15dd14306\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"e0e3a0b69fb1e19fe2322138ff361737\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"c1549028d15e77124d915f42dd5b4f05\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"a241dc508446188f7a36407b75def725\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"5b35c384b930cca8614021755ef3156a\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"6fa47e48ed076ed6b7809cb152c65472\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"084d94123705cb2385b2d2071cf76b1e\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}

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

src/cfnlint/data/schemas/patches/providers/all/aws_glue_securityconfiguration/s3encryptions.json

@@ -0,0 +1,33 @@
+[
+ {
+  "op": "test",
+  "path": "/definitions/S3Encryptions",
+  "value": {
+   "additionalProperties": false,
+   "type": "object"
+  }
+ },
+ {
+  "op": "replace",
+  "path": "/definitions/S3Encryptions",
+  "value": {
+   "items": {
+    "properties": {
+     "KmsKeyArn": {
+      "type": "string"
+     },
+     "S3EncryptionMode": {
+      "enum": [
+       "DISABLED",
+       "SSE-KMS",
+       "SSE-S3"
+      ],
+      "type": "string"
+     }
+    },
+    "type": "object"
+   },
+   "type": "array"
+  }
+ }
+]

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

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

src/cfnlint/data/schemas/providers/af_south_1/__init__.py

@@ -876,7 +876,6 @@
     "aws-acmpca-permission.json",
     "aws-neptune-dbsubnetgroup.json",
     "aws-transfer-server.json",
-    "aws-apigateway-domainname.json",
     "aws-ecs-primarytaskset.json",
     "aws-fms-resourceset.json",
     "aws-cognito-userpooldomain.json",
@@ -1104,7 +1103,6 @@
     "aws-ssm-maintenancewindowtask.json",
     "aws-ec2-transitgatewaymulticastdomain.json",
     "aws-verifiedpermissions-policytemplate.json",
-    "aws-eks-cluster.json",
     "aws-codebuild-project.json",
     "aws-efs-filesystem.json",
     "aws-connect-quickconnect.json",
@@ -1480,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",

src/cfnlint/data/schemas/providers/cn_north_1/aws-apigateway-domainname.json → src/cfnlint/data/schemas/providers/af_south_1/aws-apigateway-domainname.json

@@ -119,12 +119,5 @@
   "/properties/DistributionHostedZoneId"
  ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
  "typeName": "AWS::ApiGateway::DomainName"
 }