Add logic for subnet IDs

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/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/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_ec2fleet/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_instance/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_instanceconnectendpoint/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_launchtemplate/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_natgateway/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_networkinterface/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_spotfleet/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_subnet/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_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/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_subnetroutetableassociation/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_transitgatewaymulticastdomainassociation/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_transitgatewaymulticastgroupmember/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_transitgatewaymulticastgroupsource/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_vpccidrblock/format.json

@@ -1,9 +1,4 @@
 [
- {
-  "op": "add",
-  "path": "/handlers/list/handlerSchema/properties/VpcId/format",
-  "value": "AWS::EC2::VPC.Id"
- },
  {
   "op": "add",
   "path": "/properties/VpcId/format",

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

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

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

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

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

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

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

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