Add logic for subnet ID format (#3761)

* Add logic to add format for subnet IDs

* Add rule E1154 to validate Subnet IDs

Author: kddejong

scripts/update_schemas_format.py

@@ -36,6 +36,35 @@ def _descend(instance: Any, keywords: Sequence[str]) -> Iterator[deque[str]]:
     return
 
 
+def _create_subnet_ids_patch(type_name: str, ref: str, resolver: RefResolver):
+
+    _, resolved = resolver.resolve(ref)
+    if "$ref" in resolved:
+        return _create_subnet_ids_patch(
+            type_name=type_name,
+            ref=resolved["$ref"],
+            resolver=resolver,
+        )
+    items = resolved.get("items")
+    if items:
+        if "$ref" in items:
+            items_path = items["$ref"]
+        else:
+            items_path = ref + "/items"
+
+    return [
+        Patch(
+            values={"format": "AWS::EC2::Subnet.Ids"},
+            path=ref[1:],
+        ),
+        _create_patch(
+            {"format": "AWS::EC2::Subnet.Id"},
+            items_path,
+            resolver=resolver,
+        ),
+    ]
+
+
 def _create_security_group_ids_patch(type_name: str, ref: str, resolver: RefResolver):
     if type_name in ["AWS::Pipes::Pipe", "AWS::EC2::NetworkInsightsAnalysis"]:
         return []
@@ -184,6 +213,24 @@ def main():
                         )
                     )
 
+            for path in _descend(obj, ["Subnets"]):
+                if path[-2] == "properties":
+                    resource_patches.extend(
+                        _create_subnet_ids_patch(
+                            resource_type, "#/" + "/".join(path), resolver
+                        )
+                    )
+
+            for path in _descend(obj, ["SubnetId"]):
+                if path[-2] == "properties":
+                    resource_patches.append(
+                        _create_patch(
+                            value={"format": "AWS::EC2::Subnet.Id"},
+                            ref="#/" + "/".join(path),
+                            resolver=resolver,
+                        )
+                    )
+
             for path in _descend(obj, ["SecurityGroupIds", "SecurityGroups"]):
                 if path[-2] == "properties":
                     resource_patches.extend(

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

@@ -1 +1 @@
-{"etag": "\"91ff8d94668bdd12d0c5f0e4f14e9176\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"6b272784ab5ee64380e1afbeff2dc2b7\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"c5af86b97e6c01fbc4f631ae9e48c113\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"962d970ff4a0e8eaac7e22be166b04d9\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"3d8f7db562c312c673ef927e94cb9637\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"955b95eb824351800bb6c104fa55a21a\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"6f754221de81bebeae31e1b6a2586746\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"475eabbb5e5612f7dfdd4f0d49c5b195\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"2eedaced886b01dd58140d251c1a9439\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"23876adf542952c6010ec5b9174f72bd\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"572e3015be10b15781cad51a1334c3ae\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"1ee37da9fb13d6e676b7f42949e1313b\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"eaec1f6e0715031b8648f854d31220cd\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"57bff1a398d853571fbd5d1db37a9c13\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"2cf246c47d91e09951a6bfc341e42282\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"0b82384a3134d6f50ca215076c9a2e20\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"83afcd963703374755dc76b0ce5b7656\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"74a926e7b633254339f1fab711eabd99\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"9f01c74202fe43ce076c7c755940b17b\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"26b2184acde767f88f95f7f07414919e\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1,4 +1,14 @@
 [
+ {
+  "op": "add",
+  "path": "/properties/Subnets/format",
+  "value": "AWS::EC2::Subnet.Ids"
+ },
+ {
+  "op": "add",
+  "path": "/properties/Subnets/items/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/properties/SecurityGroups/format",

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

@@ -4,6 +4,16 @@
   "path": "/definitions/ComputeResources/properties/ImageId/format",
   "value": "AWS::EC2::Image.Id"
  },
+ {
+  "op": "add",
+  "path": "/definitions/ComputeResources/properties/Subnets/format",
+  "value": "AWS::EC2::Subnet.Ids"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/ComputeResources/properties/Subnets/items/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/definitions/ComputeResources/properties/SecurityGroupIds/format",

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

@@ -0,0 +1,12 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/ImageId/format",
+  "value": "AWS::EC2::Image.Id"
+ },
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

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

@@ -4,6 +4,21 @@
   "path": "/definitions/VpcConfig/properties/VpcId/format",
   "value": "AWS::EC2::VPC.Id"
  },
+ {
+  "op": "add",
+  "path": "/properties/ImageId/format",
+  "value": "AWS::EC2::Image.Id"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/VpcConfig/properties/Subnets/format",
+  "value": "AWS::EC2::Subnet.Ids"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/VpcConfig/properties/Subnets/items/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/format",

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

@@ -4,6 +4,16 @@
   "path": "/definitions/VpcConfig/properties/VpcId/format",
   "value": "AWS::EC2::VPC.Id"
  },
+ {
+  "op": "add",
+  "path": "/definitions/VpcConfig/properties/Subnets/format",
+  "value": "AWS::EC2::Subnet.Ids"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/VpcConfig/properties/Subnets/items/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/format",

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

@@ -1,4 +1,14 @@
 [
+ {
+  "op": "add",
+  "path": "/definitions/VpcConfig/properties/Subnets/format",
+  "value": "AWS::EC2::Subnet.Ids"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/VpcConfig/properties/Subnets/items/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/format",

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

@@ -1,4 +1,14 @@
 [
+ {
+  "op": "add",
+  "path": "/definitions/VpcConfig/properties/Subnets/format",
+  "value": "AWS::EC2::Subnet.Ids"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/VpcConfig/properties/Subnets/items/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/format",

src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpntargetnetworkassociation/__init__.py

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

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

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/FleetLaunchTemplateOverridesRequest/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

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

@@ -9,6 +9,16 @@
   "path": "/properties/ImageId/format",
   "value": "AWS::EC2::Image.Id"
  },
+ {
+  "op": "add",
+  "path": "/definitions/NetworkInterface/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/format",

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

@@ -1,4 +1,9 @@
 [
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/format",

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

@@ -4,6 +4,11 @@
   "path": "/definitions/LaunchTemplateData/properties/ImageId/format",
   "value": "AWS::EC2::Image.Id"
  },
+ {
+  "op": "add",
+  "path": "/definitions/NetworkInterface/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/definitions/LaunchTemplateData/properties/SecurityGroupIds/format",

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

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

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

@@ -3,5 +3,10 @@
   "op": "add",
   "path": "/properties/VpcId/format",
   "value": "AWS::EC2::VPC.Id"
+ },
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
  }
 ]

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

@@ -4,6 +4,21 @@
   "path": "/definitions/SpotFleetLaunchSpecification/properties/ImageId/format",
   "value": "AWS::EC2::Image.Id"
  },
+ {
+  "op": "add",
+  "path": "/definitions/InstanceNetworkInterfaceSpecification/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/LaunchTemplateOverrides/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/SpotFleetLaunchSpecification/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
  {
   "op": "add",
   "path": "/definitions/SpotFleetLaunchSpecification/properties/SecurityGroups/format",

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

@@ -3,5 +3,10 @@
   "op": "add",
   "path": "/properties/VpcId/format",
   "value": "AWS::EC2::VPC.Id"
+ },
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
  }
 ]

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

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetcidrblock/__init__.py

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

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

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetnetworkaclassociation/__init__.py

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

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

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]