Some security group ID cleanup based on docs (#3925)

docs/format_keyword.md

@@ -14,15 +14,19 @@ This format ensures that the value is a valid VPC ID, which is a string of the p
 
 ### AWS::EC2::SecurityGroup.Id
 
-This format validates that the value is a valid Security Group ID, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`.
+This format validates that the value is a valid security group ID, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`.
 
 ### AWS::EC2::SecurityGroup.Ids
 
-This format validates that the value is a valid list of Security Group IDs, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`.
+This format validates that the value is a valid list of security group IDs, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`.
 
 ### AWS::EC2::SecurityGroup.Name
 
-This format validates that the value is a valid Security Group Name, which must be a string of 1 to 255 characters, starting with a letter, and containing only letters, numbers, and certain special characters.
+This format validates that the value is a valid security group name, which must be a string of 1 to 255 characters, starting with a letter, and containing only letters, numbers, and certain special characters.
+
+### AWS::EC2::SecurityGroup.Names
+
+This format validates that the value is a valid list of security group names, which must be a string of 1 to 255 characters, starting with a letter, and containing only letters, numbers, and certain special characters.
 
 ### AWS::EC2::Image.Id
 

scripts/update_schemas_format.py

@@ -66,7 +66,11 @@ def _create_subnet_ids_patch(type_name: str, ref: str, resolver: RefResolver):
 
 
 def _create_security_group_ids_patch(type_name: str, ref: str, resolver: RefResolver):
-    if type_name in ["AWS::Pipes::Pipe", "AWS::EC2::NetworkInsightsAnalysis"]:
+    if type_name in [
+        "AWS::Pipes::Pipe",
+        "AWS::EC2::NetworkInsightsAnalysis",
+        "AWS::AutoScaling::LaunchConfiguration",
+    ]:
         return []
 
     _, resolved = resolver.resolve(ref)
@@ -181,6 +185,26 @@ def _create_patch(value: dict[str, str], ref: Sequence[str], resolver: RefResolv
             path="/properties/GroupId",
         ),
     ],
+    "AWS::AutoScaling::LaunchConfiguration": [
+        Patch(
+            values={
+                "anyOf": [
+                    {"format": "AWS::EC2::SecurityGroup.Ids"},
+                    {"format": "AWS::EC2::SecurityGroup.Names"},
+                ]
+            },
+            path="/properties/SecurityGroups",
+        ),
+        Patch(
+            values={
+                "anyOf": [
+                    {"format": "AWS::EC2::SecurityGroup.Id"},
+                    {"format": "AWS::EC2::SecurityGroup.Name"},
+                ]
+            },
+            path="/properties/SecurityGroups/items",
+        ),
+    ],
 }
 
 
@@ -256,7 +280,6 @@ def main():
                 obj,
                 [
                     "CustomSecurityGroupIds",
-                    "DBSecurityGroups",
                     "Ec2SecurityGroupIds",
                     "GroupSet",
                     "InputSecurityGroups",
@@ -282,7 +305,7 @@ def main():
                     "EC2SecurityGroupId",
                     "SecurityGroup",
                     "SecurityGroupId",
-                    "SecurityGroupIngress" "SourceSecurityGroupId",
+                    "SourceSecurityGroupId",
                     "VpcSecurityGroupId",
                 ],
             ):
@@ -298,9 +321,8 @@ def main():
                 [
                     "CacheSecurityGroupName",
                     "ClusterSecurityGroupName",
-                    "DBSecurityGroupName",
                     "EC2SecurityGroupName",
-                    "SourceSecurityGroupName" "SourceSecurityGroupName",
+                    "SourceSecurityGroupName",
                 ],
             ):
                 if path[-2] == "properties":

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

@@ -1 +1 @@
-{"etag": "\"40a213aff984b3807375de209bb3bc6c\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"91791f53d414564db7cbbceaefd59f7a\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"eb4395911f52bbbb03124419ba1b9ccd\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"1d368feb392c9238293424f22c4ffecd\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"86d631145410662623cf0520b230c5d4\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"436de8b4c9c2dee7797804b5df85d5b9\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"5d466585bd04bb49223e7c7af41512be\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"221c4d1a9d10c9315e0ec8587dbea986\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"c7256740190e7d5bd5f4675305a4bf6e\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"0cbc4482c76af92fbc6eea221cdb9c98\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"8714f0418f6643de9580f2e975741334\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"c7a1f96603c2f7c761969d8e74de566e\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json

@@ -1 +1 @@
-{"etag": "\"05a2935e5783359150b442e6b54a5f04\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"590e86f2a1e3385fea04ad561fddb9c1\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json

@@ -1 +1 @@
-{"etag": "\"b285f9c337046a431f1d441d40d2af23\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"4f4207eee4a69ce7239383cdfd6a9f5d\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json

@@ -1 +1 @@
-{"etag": "\"fe5cfbe54570dd0eeabe1449257d794d\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"dee69b39f5065715f44431593be4a8fb\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"e67e8c5978bcf756b3e8d9e2a863204c\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"25561abddab9670c6847decaea2cee17\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"5632be4bf7daac191f555cdaddbab019\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"c83e911c87a4d3c34e01c983af9c9eef\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"37c6ee8b69f2a1eb8d2cb16bdca7a147\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"3edf4bb213b2ce927ac0f081ca07bee3\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"39c9ca732b0c3abc8fae0203af388e06\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"8e7a8e4d44d86c36bd47803e6b216d90\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"f57ba55d8370b1856af2d1ad9ee237af\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"71c1b7578d6b772fb2554f5e9609d056\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}

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

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

src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"5fe6eb2452a1c9099e355fe33f2a026e\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"acd24b3c720250c5322f1fd431bdd8a6\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"096287bae86748364be5f2b0b7e3840e\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"f6dc3aefe61ba028746825c07904d9f8\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"69e685e22df2aa7744642da364e15348\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"76f411d041441e0593a4c4fd2b454e0a\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"caca23482a63315b3845fe4853b4a2b7\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"79d8af5b8b8146526af29619358b73ee\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"ff9a5a488b992946f2e81f4b7d87c962\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"08a79e162a116588e6d2ecae02d26d7b\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"f355de13bcbfc33284deacdd006f807c\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"6648106b37560fe53b0ad16ade488048\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"1fa555169a872eae4f4a00d05f48379f\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"452d03cdc679fe474f5d1103c48c3c1a\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"55484435bd4477aea5738b45d8538baa\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"08eb30332494d51ce03c5ca2ba8ad3f7\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_launchconfiguration/format.json

@@ -1,17 +1,31 @@
 [
  {
   "op": "add",
-  "path": "/properties/ImageId/format",
-  "value": "AWS::EC2::Image.Id"
+  "path": "/properties/SecurityGroups/anyOf",
+  "value": [
+   {
+    "format": "AWS::EC2::SecurityGroup.Id"
+   },
+   {
+    "format": "AWS::EC2::SecurityGroup.Name"
+   }
+  ]
  },
  {
   "op": "add",
-  "path": "/properties/SecurityGroups/format",
-  "value": "AWS::EC2::SecurityGroup.Ids"
+  "path": "/properties/SecurityGroups/items/anyOf",
+  "value": [
+   {
+    "format": "AWS::EC2::SecurityGroup.Id"
+   },
+   {
+    "format": "AWS::EC2::SecurityGroup.Name"
+   }
+  ]
  },
  {
   "op": "add",
-  "path": "/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.Id"
+  "path": "/properties/ImageId/format",
+  "value": "AWS::EC2::Image.Id"
  }
 ]

src/cfnlint/data/schemas/patches/extensions/all/aws_elasticache_securitygroupingress/format.json

@@ -0,0 +1,12 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/CacheSecurityGroupName/format",
+  "value": "AWS::EC2::SecurityGroup.Name"
+ },
+ {
+  "op": "add",
+  "path": "/properties/EC2SecurityGroupName/format",
+  "value": "AWS::EC2::SecurityGroup.Name"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbsecuritygroup/format.json

@@ -0,0 +1,12 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/Ingress/properties/EC2SecurityGroupId/format",
+  "value": "AWS::EC2::SecurityGroup.Id"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/Ingress/properties/EC2SecurityGroupName/format",
+  "value": "AWS::EC2::SecurityGroup.Name"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbsecuritygroupingress/format.json

@@ -0,0 +1,12 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/EC2SecurityGroupId/format",
+  "value": "AWS::EC2::SecurityGroup.Id"
+ },
+ {
+  "op": "add",
+  "path": "/properties/EC2SecurityGroupName/format",
+  "value": "AWS::EC2::SecurityGroup.Name"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_clustersecuritygroupingress/format.json

@@ -0,0 +1,12 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/ClusterSecurityGroupName/format",
+  "value": "AWS::EC2::SecurityGroup.Name"
+ },
+ {
+  "op": "add",
+  "path": "/properties/EC2SecurityGroupName/format",
+  "value": "AWS::EC2::SecurityGroup.Name"
+ }
+]

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

@@ -877,6 +877,7 @@
     "Module",
     "aws-accessanalyzer-analyzer.json",
     "aws-acmpca-certificate.json",
+    "aws-acmpca-certificateauthority.json",
     "aws-acmpca-certificateauthorityactivation.json",
     "aws-acmpca-permission.json",
     "aws-amazonmq-broker.json",
@@ -1025,7 +1026,6 @@
     "aws-cloudwatch-compositealarm.json",
     "aws-cloudwatch-dashboard.json",
     "aws-cloudwatch-insightrule.json",
-    "aws-cloudwatch-metricstream.json",
     "aws-codebuild-project.json",
     "aws-codebuild-reportgroup.json",
     "aws-codebuild-sourcecredential.json",
@@ -1134,7 +1134,6 @@
     "aws-docdb-eventsubscription.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
-    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
@@ -1217,7 +1216,6 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
-    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ec2-vpngatewayroutepropagation.json",
@@ -1288,7 +1286,6 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
-    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
@@ -1399,7 +1396,9 @@
     "aws-logs-resourcepolicy.json",
     "aws-logs-subscriptionfilter.json",
     "aws-logs-transformer.json",
+    "aws-m2-application.json",
     "aws-m2-deployment.json",
+    "aws-m2-environment.json",
     "aws-macie-allowlist.json",
     "aws-macie-session.json",
     "aws-mediaconnect-bridge.json",
@@ -1426,6 +1425,7 @@
     "aws-neptune-dbcluster.json",
     "aws-neptune-dbsubnetgroup.json",
     "aws-neptune-eventsubscription.json",
+    "aws-networkfirewall-firewall.json",
     "aws-networkfirewall-firewallpolicy.json",
     "aws-networkfirewall-loggingconfiguration.json",
     "aws-networkfirewall-rulegroup.json",
@@ -1519,6 +1519,7 @@
     "aws-route53-recordsetgroup.json",
     "aws-route53profiles-profile.json",
     "aws-route53profiles-profileassociation.json",
+    "aws-route53profiles-profileresourceassociation.json",
     "aws-route53resolver-firewalldomainlist.json",
     "aws-route53resolver-firewallrulegroup.json",
     "aws-route53resolver-firewallrulegroupassociation.json",