From 7dc1ed86dfb4b1d2609625030f049faf448c5295 Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Thu, 17 Oct 2024 14:40:44 -0700 Subject: [PATCH] Add logic for subnet IDs --- scripts/update_schemas_format.py | 47 +++++++++++++++++++ .../aws_apprunner_vpcconnector/format.json | 10 ++++ .../aws_batch_computeenvironment/format.json | 10 ++++ .../all/aws_cloud9_environmentec2/format.json | 12 +++++ .../all/aws_codebuild_fleet/format.json | 15 ++++++ .../all/aws_codebuild_project/format.json | 10 ++++ .../format.json | 10 ++++ .../all/aws_comprehend_flywheel/format.json | 10 ++++ .../__init__.py | 0 .../format.json | 7 +++ .../all/aws_ec2_ec2fleet/format.json | 7 +++ .../all/aws_ec2_instance/format.json | 10 ++++ .../format.json | 5 ++ .../all/aws_ec2_launchtemplate/format.json | 5 ++ .../all/aws_ec2_natgateway/format.json | 7 +++ .../all/aws_ec2_networkinterface/format.json | 5 ++ .../all/aws_ec2_spotfleet/format.json | 15 ++++++ .../extensions/all/aws_ec2_subnet/format.json | 5 ++ .../all/aws_ec2_subnetcidrblock/__init__.py | 0 .../all/aws_ec2_subnetcidrblock/format.json | 7 +++ .../__init__.py | 0 .../format.json | 7 +++ .../__init__.py | 0 .../format.json | 7 +++ .../__init__.py | 0 .../format.json | 7 +++ .../__init__.py | 0 .../format.json | 7 +++ .../__init__.py | 0 .../format.json | 7 +++ .../all/aws_ec2_vpccidrblock/format.json | 5 -- .../all/aws_ecs_service/format.json | 10 ++++ .../all/aws_ecs_taskset/format.json | 10 ++++ .../all/aws_efs_mounttarget/format.json | 5 ++ .../all/aws_eks_fargateprofile/format.json | 12 +++++ .../all/aws_eks_nodegroup/format.json | 12 +++++ .../format.json | 9 +++- .../format.json | 15 ++++++ .../all/aws_events_rule/format.json | 10 ++++ .../all/aws_glue_connection/format.json | 7 +++ .../all/aws_glue_devendpoint/format.json | 5 ++ .../format.json | 5 ++ .../aws_kafkaconnect_connector/format.json | 10 ++++ .../all/aws_mediaconnect_flow/format.json | 5 ++ .../format.json | 5 ++ .../aws_networkfirewall_firewall/format.json | 5 ++ .../all/aws_opsworks_instance/format.json | 5 ++ .../extensions/all/aws_pipes_pipe/format.json | 22 +++++++++ .../aws_quicksight_vpcconnection/format.json | 5 ++ .../aws_redshift_endpointaccess/format.json | 5 ++ .../format.json | 5 ++ .../format.json | 5 ++ .../all/aws_s3outposts_endpoint/format.json | 5 ++ .../all/aws_sagemaker_cluster/format.json | 22 +++++++++ .../format.json | 10 ++++ .../aws_sagemaker_endpointconfig/format.json | 10 ++++ .../all/aws_sagemaker_model/format.json | 10 ++++ .../format.json | 10 ++++ .../format.json | 10 ++++ .../format.json | 10 ++++ .../format.json | 10 ++++ .../format.json | 5 ++ .../all/aws_scheduler_schedule/format.json | 10 ++++ .../af_south_1/aws-ec2-vpccidrblock.json | 1 + .../af_south_1/aws-opsworks-instance.json | 1 + .../ap_east_1/aws-ec2-vpccidrblock.json | 1 + .../ap_northeast_2/aws-ec2-vpccidrblock.json | 1 + .../ap_northeast_3/aws-ec2-vpccidrblock.json | 1 + .../ap_south_1/aws-ec2-vpccidrblock.json | 1 + .../ap_south_2/aws-ec2-spotfleet.json | 3 ++ .../ap_south_2/aws-ec2-vpccidrblock.json | 1 + .../ap_south_2/aws-opsworks-instance.json | 1 + .../ap_southeast_2/aws-ec2-vpccidrblock.json | 1 + .../ap_southeast_3/aws-ec2-vpccidrblock.json | 1 + .../ap_southeast_3/aws-opsworks-instance.json | 1 + .../ap_southeast_4/aws-ec2-spotfleet.json | 3 ++ .../ap_southeast_4/aws-ec2-vpccidrblock.json | 1 + .../ap_southeast_4/aws-opsworks-instance.json | 1 + .../ap_southeast_5/aws-ec2-subnet.json | 1 + .../aws-ec2-subnetcidrblock.json | 1 + .../aws-ec2-subnetnetworkaclassociation.json | 1 + .../ap_southeast_5/aws-ec2-vpccidrblock.json | 1 + .../ap_southeast_5/aws-ecs-service.json | 2 + .../ap_southeast_5/aws-opsworks-instance.json | 1 + .../ca_central_1/aws-ec2-vpccidrblock.json | 1 + .../ca_west_1/aws-ec2-subnetcidrblock.json | 1 + .../aws-ec2-subnetnetworkaclassociation.json | 1 + .../ca_west_1/aws-ec2-vpccidrblock.json | 1 + .../providers/ca_west_1/aws-ecs-service.json | 2 + .../ca_west_1/aws-opsworks-instance.json | 1 + .../cn_north_1/aws-cloud9-environmentec2.json | 2 + .../cn_north_1/aws-eks-fargateprofile.json | 2 + .../aws-cloud9-environmentec2.json | 2 + .../aws-ec2-subnetcidrblock.json | 1 + .../cn_northwest_1/aws-ec2-vpccidrblock.json | 1 + .../cn_northwest_1/aws-ecs-service.json | 2 + .../cn_northwest_1/aws-ecs-taskset.json | 2 + .../aws-eks-fargateprofile.json | 2 + .../aws-autoscaling-autoscalinggroup.json | 4 +- .../eu_central_1/aws-codebuild-fleet.json | 3 ++ .../eu_central_1/aws-ec2-launchtemplate.json | 1 + .../eu_central_2/aws-ec2-subnetcidrblock.json | 1 + .../eu_central_2/aws-ec2-vpccidrblock.json | 1 + .../eu_central_2/aws-ecs-service.json | 2 + .../eu_central_2/aws-opsworks-instance.json | 1 + .../eu_north_1/aws-ec2-vpccidrblock.json | 1 + .../eu_south_1/aws-ec2-vpccidrblock.json | 1 + .../providers/eu_south_1/aws-ecs-service.json | 2 + .../eu_south_1/aws-opsworks-instance.json | 1 + .../eu_south_2/aws-ec2-vpccidrblock.json | 1 + .../eu_south_2/aws-opsworks-instance.json | 1 + .../eu_west_1/aws-ec2-vpccidrblock.json | 1 + .../eu_west_2/aws-ec2-vpccidrblock.json | 1 + .../aws-redshiftserverless-workgroup.json | 1 + .../eu_west_3/aws-ec2-vpccidrblock.json | 1 + .../il_central_1/aws-ec2-spotfleet.json | 3 ++ .../il_central_1/aws-ec2-subnetcidrblock.json | 1 + .../il_central_1/aws-ec2-vpccidrblock.json | 1 + .../il_central_1/aws-ecs-service.json | 2 + .../il_central_1/aws-opsworks-instance.json | 1 + .../me_central_1/aws-ec2-vpccidrblock.json | 1 + .../me_central_1/aws-opsworks-instance.json | 1 + .../me_south_1/aws-ec2-vpccidrblock.json | 1 + .../sa_east_1/aws-ec2-vpccidrblock.json | 1 + .../us_east_1/aws-apprunner-vpcconnector.json | 2 + .../aws-batch-computeenvironment.json | 2 + .../us_east_1/aws-cloud9-environmentec2.json | 2 + .../us_east_1/aws-codebuild-fleet.json | 3 ++ .../us_east_1/aws-codebuild-project.json | 2 + .../aws-comprehend-documentclassifier.json | 2 + .../us_east_1/aws-comprehend-flywheel.json | 2 + ...ec2-clientvpntargetnetworkassociation.json | 1 + .../providers/us_east_1/aws-ec2-ec2fleet.json | 1 + .../providers/us_east_1/aws-ec2-instance.json | 2 + .../aws-ec2-instanceconnectendpoint.json | 1 + .../us_east_1/aws-ec2-launchtemplate.json | 1 + .../us_east_1/aws-ec2-natgateway.json | 1 + .../us_east_1/aws-ec2-networkinterface.json | 1 + .../us_east_1/aws-ec2-spotfleet.json | 3 ++ .../providers/us_east_1/aws-ec2-subnet.json | 1 + .../us_east_1/aws-ec2-subnetcidrblock.json | 1 + .../aws-ec2-subnetnetworkaclassociation.json | 1 + .../aws-ec2-subnetroutetableassociation.json | 1 + ...nsitgatewaymulticastdomainassociation.json | 1 + ...c2-transitgatewaymulticastgroupmember.json | 1 + ...c2-transitgatewaymulticastgroupsource.json | 1 + .../us_east_1/aws-ec2-vpccidrblock.json | 1 + .../providers/us_east_1/aws-ecs-service.json | 2 + .../providers/us_east_1/aws-ecs-taskset.json | 2 + .../us_east_1/aws-efs-mounttarget.json | 1 + .../us_east_1/aws-eks-fargateprofile.json | 2 + .../us_east_1/aws-eks-nodegroup.json | 2 + ...aws-elasticloadbalancing-loadbalancer.json | 2 + ...s-elasticloadbalancingv2-loadbalancer.json | 3 ++ .../providers/us_east_1/aws-events-rule.json | 2 + .../us_east_1/aws-glue-connection.json | 1 + .../us_east_1/aws-glue-devendpoint.json | 1 + ...gebuilder-infrastructureconfiguration.json | 1 + .../us_east_1/aws-kafkaconnect-connector.json | 2 + .../us_east_1/aws-mediaconnect-flow.json | 1 + .../aws-mediaconnect-flowvpcinterface.json | 1 + .../aws-networkfirewall-firewall.json | 1 + .../us_east_1/aws-opsworks-instance.json | 1 + .../providers/us_east_1/aws-pipes-pipe.json | 4 ++ .../aws-quicksight-vpcconnection.json | 1 + .../aws-redshift-endpointaccess.json | 1 + .../aws-redshiftserverless-workgroup.json | 1 + .../aws-route53resolver-resolverendpoint.json | 1 + .../us_east_1/aws-s3outposts-endpoint.json | 1 + .../us_east_1/aws-sagemaker-cluster.json | 4 ++ ...ws-sagemaker-dataqualityjobdefinition.json | 2 + .../aws-sagemaker-endpointconfig.json | 2 + .../us_east_1/aws-sagemaker-model.json | 2 + .../aws-sagemaker-modelbiasjobdefinition.json | 2 + ...aker-modelexplainabilityjobdefinition.json | 2 + ...s-sagemaker-modelqualityjobdefinition.json | 2 + .../aws-sagemaker-monitoringschedule.json | 2 + .../aws-sagemaker-notebookinstance.json | 1 + .../us_east_1/aws-scheduler-schedule.json | 2 + .../us_east_2/aws-ec2-vpccidrblock.json | 1 + .../us_gov_east_1/aws-codebuild-project.json | 2 + .../us_gov_east_1/aws-ec2-vpccidrblock.json | 1 + .../us_gov_east_1/aws-ecs-service.json | 2 + .../us_gov_east_1/aws-efs-mounttarget.json | 1 + .../us_gov_east_1/aws-events-rule.json | 2 + .../us_gov_west_1/aws-codebuild-project.json | 2 + .../aws-ec2-subnetcidrblock.json | 1 + .../us_gov_west_1/aws-ec2-vpccidrblock.json | 1 + .../us_gov_west_1/aws-ecs-service.json | 2 + .../us_gov_west_1/aws-efs-mounttarget.json | 1 + .../us_gov_west_1/aws-events-rule.json | 2 + .../us_west_1/aws-ec2-vpccidrblock.json | 1 + 192 files changed, 704 insertions(+), 8 deletions(-) create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_cloud9_environmentec2/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpntargetnetworkassociation/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpntargetnetworkassociation/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_ec2fleet/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_natgateway/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetcidrblock/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetcidrblock/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetnetworkaclassociation/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetnetworkaclassociation/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetroutetableassociation/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetroutetableassociation/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastdomainassociation/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastdomainassociation/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupmember/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupmember/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupsource/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupsource/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_eks_fargateprofile/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_eks_nodegroup/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_glue_connection/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_pipes_pipe/format.json create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_cluster/format.json diff --git a/scripts/update_schemas_format.py b/scripts/update_schemas_format.py index 4689573ad9..ce04bd7fad 100755 --- a/scripts/update_schemas_format.py +++ b/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( diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_apprunner_vpcconnector/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_apprunner_vpcconnector/format.json index 182adadf4f..3cda037083 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_apprunner_vpcconnector/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_batch_computeenvironment/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_batch_computeenvironment/format.json index 1836d52d48..eb1e225dc3 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_batch_computeenvironment/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cloud9_environmentec2/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cloud9_environmentec2/format.json new file mode 100644 index 0000000000..9b953f415c --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_fleet/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_fleet/format.json index 1b10a67f85..b2eb6ce3e6 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_fleet/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/format.json index 1b10a67f85..e06d242c3f 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_flywheel/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_flywheel/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_flywheel/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpntargetnetworkassociation/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpntargetnetworkassociation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpntargetnetworkassociation/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpntargetnetworkassociation/format.json new file mode 100644 index 0000000000..94c8c23eb3 --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_ec2fleet/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_ec2fleet/format.json new file mode 100644 index 0000000000..c74a36ef7c --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instance/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instance/format.json index 0806b0a787..d4732e9149 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instance/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instanceconnectendpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instanceconnectendpoint/format.json index 24b4bcaa67..2699321c7a 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instanceconnectendpoint/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_launchtemplate/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_launchtemplate/format.json index 57d268e01b..a5dd048dda 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_launchtemplate/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_natgateway/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_natgateway/format.json new file mode 100644 index 0000000000..94c8c23eb3 --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_networkinterface/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_networkinterface/format.json index b477cfe8f7..f3c5c0f525 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_networkinterface/format.json +++ b/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" } ] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/format.json index 9a8d763fd3..55b97d8afc 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnet/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnet/format.json index b477cfe8f7..f3c5c0f525 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnet/format.json +++ b/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" } ] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetcidrblock/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetcidrblock/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetcidrblock/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetcidrblock/format.json new file mode 100644 index 0000000000..94c8c23eb3 --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetnetworkaclassociation/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetnetworkaclassociation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetnetworkaclassociation/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetnetworkaclassociation/format.json new file mode 100644 index 0000000000..94c8c23eb3 --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetroutetableassociation/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetroutetableassociation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetroutetableassociation/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnetroutetableassociation/format.json new file mode 100644 index 0000000000..94c8c23eb3 --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastdomainassociation/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastdomainassociation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastdomainassociation/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastdomainassociation/format.json new file mode 100644 index 0000000000..94c8c23eb3 --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupmember/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupmember/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupmember/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupmember/format.json new file mode 100644 index 0000000000..94c8c23eb3 --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupsource/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupsource/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupsource/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_transitgatewaymulticastgroupsource/format.json new file mode 100644 index 0000000000..94c8c23eb3 --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_vpccidrblock/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_vpccidrblock/format.json index 9ecf6a5cc4..b477cfe8f7 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_vpccidrblock/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_service/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_service/format.json index 515f170b16..ab938a08e4 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_service/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_taskset/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_taskset/format.json index 515f170b16..ab938a08e4 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_taskset/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_efs_mounttarget/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_efs_mounttarget/format.json index 182adadf4f..306d92d48b 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_efs_mounttarget/format.json +++ b/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_fargateprofile/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_fargateprofile/format.json new file mode 100644 index 0000000000..ddd7fe016d --- /dev/null +++ b/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_nodegroup/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_nodegroup/format.json new file mode 100644 index 0000000000..ddd7fe016d --- /dev/null +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_nodegroup/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" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticloadbalancing_loadbalancer/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticloadbalancing_loadbalancer/format.json index e51e8590e9..3cda037083 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticloadbalancing_loadbalancer/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticloadbalancing_loadbalancer/format.json @@ -1,8 +1,13 @@ [ { "op": "add", - "path": "/properties/SourceSecurityGroup/properties/GroupName/format", - "value": "AWS::EC2::SecurityGroup.GroupName" + "path": "/properties/Subnets/format", + "value": "AWS::EC2::Subnet.Ids" + }, + { + "op": "add", + "path": "/properties/Subnets/items/format", + "value": "AWS::EC2::Subnet.Id" }, { "op": "add", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticloadbalancingv2_loadbalancer/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticloadbalancingv2_loadbalancer/format.json index 182adadf4f..8b3b9f72ea 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticloadbalancingv2_loadbalancer/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticloadbalancingv2_loadbalancer/format.json @@ -1,4 +1,19 @@ [ + { + "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": "/definitions/SubnetMapping/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/properties/SecurityGroups/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_events_rule/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_events_rule/format.json index 515f170b16..ab938a08e4 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_events_rule/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_events_rule/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_glue_connection/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_glue_connection/format.json new file mode 100644 index 0000000000..0600752957 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_glue_connection/format.json @@ -0,0 +1,7 @@ +[ + { + "op": "add", + "path": "/definitions/PhysicalConnectionRequirements/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_glue_devendpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_glue_devendpoint/format.json index f7bdf7d24a..49c2218f19 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_glue_devendpoint/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_glue_devendpoint/format.json @@ -1,4 +1,9 @@ [ + { + "op": "add", + "path": "/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/properties/SecurityGroupIds/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_imagebuilder_infrastructureconfiguration/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_imagebuilder_infrastructureconfiguration/format.json index f7bdf7d24a..49c2218f19 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_imagebuilder_infrastructureconfiguration/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_imagebuilder_infrastructureconfiguration/format.json @@ -1,4 +1,9 @@ [ + { + "op": "add", + "path": "/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/properties/SecurityGroupIds/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_kafkaconnect_connector/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_kafkaconnect_connector/format.json index 221ea6cea4..99d8a6cd0c 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_kafkaconnect_connector/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_kafkaconnect_connector/format.json @@ -1,4 +1,14 @@ [ + { + "op": "add", + "path": "/definitions/Vpc/properties/Subnets/format", + "value": "AWS::EC2::Subnet.Ids" + }, + { + "op": "add", + "path": "/definitions/Vpc/properties/Subnets/items/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/definitions/Vpc/properties/SecurityGroups/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediaconnect_flow/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_mediaconnect_flow/format.json index 0b238bc0b2..4a7f180e09 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediaconnect_flow/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_mediaconnect_flow/format.json @@ -1,4 +1,9 @@ [ + { + "op": "add", + "path": "/definitions/VpcInterface/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/definitions/VpcInterface/properties/SecurityGroupIds/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediaconnect_flowvpcinterface/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_mediaconnect_flowvpcinterface/format.json index f7bdf7d24a..49c2218f19 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediaconnect_flowvpcinterface/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_mediaconnect_flowvpcinterface/format.json @@ -1,4 +1,9 @@ [ + { + "op": "add", + "path": "/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/properties/SecurityGroupIds/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_networkfirewall_firewall/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_networkfirewall_firewall/format.json index b477cfe8f7..2d95e0dc75 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_networkfirewall_firewall/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_networkfirewall_firewall/format.json @@ -3,5 +3,10 @@ "op": "add", "path": "/properties/VpcId/format", "value": "AWS::EC2::VPC.Id" + }, + { + "op": "add", + "path": "/definitions/SubnetMapping/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" } ] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_opsworks_instance/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_opsworks_instance/format.json index 7d3cf7cf72..477ba9d4d8 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_opsworks_instance/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_opsworks_instance/format.json @@ -3,5 +3,10 @@ "op": "add", "path": "/properties/AmiId/format", "value": "AWS::EC2::Image.Id" + }, + { + "op": "add", + "path": "/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" } ] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_pipes_pipe/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_pipes_pipe/format.json new file mode 100644 index 0000000000..740f5ed20a --- /dev/null +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_pipes_pipe/format.json @@ -0,0 +1,22 @@ +[ + { + "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/SelfManagedKafkaAccessConfigurationVpc/properties/Subnets/format", + "value": "AWS::EC2::Subnet.Ids" + }, + { + "op": "add", + "path": "/definitions/SelfManagedKafkaAccessConfigurationVpc/properties/Subnets/items/format", + "value": "AWS::EC2::Subnet.Id" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_vpcconnection/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_vpcconnection/format.json index 4e35b2721d..2e003f656b 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_vpcconnection/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_vpcconnection/format.json @@ -4,6 +4,11 @@ "path": "/properties/VPCId/format", "value": "AWS::EC2::VPC.Id" }, + { + "op": "add", + "path": "/definitions/NetworkInterface/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/properties/SecurityGroupIds/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_endpointaccess/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_endpointaccess/format.json index 9e7c3f519d..913488203f 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_endpointaccess/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_endpointaccess/format.json @@ -3,5 +3,10 @@ "op": "add", "path": "/properties/VpcEndpoint/properties/VpcId/format", "value": "AWS::EC2::VPC.Id" + }, + { + "op": "add", + "path": "/definitions/NetworkInterface/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" } ] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_redshiftserverless_workgroup/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_redshiftserverless_workgroup/format.json index ab8a4fba52..bb7d1dff89 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_redshiftserverless_workgroup/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_redshiftserverless_workgroup/format.json @@ -4,6 +4,11 @@ "path": "/definitions/VpcEndpoint/properties/VpcId/format", "value": "AWS::EC2::VPC.Id" }, + { + "op": "add", + "path": "/definitions/NetworkInterface/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/definitions/Workgroup/properties/SecurityGroupIds/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_route53resolver_resolverendpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_route53resolver_resolverendpoint/format.json index f7bdf7d24a..493cb52cd5 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_route53resolver_resolverendpoint/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_route53resolver_resolverendpoint/format.json @@ -1,4 +1,9 @@ [ + { + "op": "add", + "path": "/definitions/IpAddressRequest/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/properties/SecurityGroupIds/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_s3outposts_endpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_s3outposts_endpoint/format.json index 563477617b..9369cdcb66 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_s3outposts_endpoint/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_s3outposts_endpoint/format.json @@ -1,4 +1,9 @@ [ + { + "op": "add", + "path": "/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/properties/SecurityGroupId/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_cluster/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_cluster/format.json new file mode 100644 index 0000000000..5dfc55f740 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_cluster/format.json @@ -0,0 +1,22 @@ +[ + { + "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", + "value": "AWS::EC2::SecurityGroup.Ids" + }, + { + "op": "add", + "path": "/definitions/VpcConfig/properties/SecurityGroupIds/items/format", + "value": "AWS::EC2::SecurityGroup.GroupId" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_dataqualityjobdefinition/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_dataqualityjobdefinition/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_dataqualityjobdefinition/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_dataqualityjobdefinition/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_endpointconfig/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_endpointconfig/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_endpointconfig/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_endpointconfig/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_model/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_model/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_model/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_model/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelbiasjobdefinition/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelbiasjobdefinition/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelbiasjobdefinition/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelbiasjobdefinition/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelexplainabilityjobdefinition/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelexplainabilityjobdefinition/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelexplainabilityjobdefinition/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelexplainabilityjobdefinition/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelqualityjobdefinition/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelqualityjobdefinition/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelqualityjobdefinition/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelqualityjobdefinition/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_monitoringschedule/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_monitoringschedule/format.json index bfba77bf8a..5dfc55f740 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_monitoringschedule/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_monitoringschedule/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", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_notebookinstance/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_notebookinstance/format.json index f7bdf7d24a..49c2218f19 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_notebookinstance/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_notebookinstance/format.json @@ -1,4 +1,9 @@ [ + { + "op": "add", + "path": "/properties/SubnetId/format", + "value": "AWS::EC2::Subnet.Id" + }, { "op": "add", "path": "/properties/SecurityGroupIds/format", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_scheduler_schedule/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_scheduler_schedule/format.json index 515f170b16..ab938a08e4 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_scheduler_schedule/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_scheduler_schedule/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", diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-spotfleet.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-spotfleet.json index d132978064..e88a9d9272 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-spotfleet.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-spotfleet.json @@ -187,6 +187,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, @@ -224,6 +225,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "WeightedCapacity": { @@ -325,6 +327,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "TagSpecifications": { diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-spotfleet.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-spotfleet.json index d132978064..e88a9d9272 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-spotfleet.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-spotfleet.json @@ -187,6 +187,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, @@ -224,6 +225,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "WeightedCapacity": { @@ -325,6 +327,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "TagSpecifications": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnet.json index ef3918fb82..9b28a8644a 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnet.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnet.json @@ -121,6 +121,7 @@ "type": "object" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnetcidrblock.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnetcidrblock.json index 6c58c1df37..0cd6ef0ee4 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnetcidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnetcidrblock.json @@ -15,6 +15,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnetnetworkaclassociation.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnetnetworkaclassociation.json index c2f822e26c..4444a48194 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnetnetworkaclassociation.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnetnetworkaclassociation.json @@ -18,6 +18,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-vpccidrblock.json index c7487f7d53..2792cf52e0 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-vpccidrblock.json @@ -43,6 +43,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ecs-service.json index ba7baa1de3..26b462c66f 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnetcidrblock.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnetcidrblock.json index f1438be6e2..74fc31e315 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnetcidrblock.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnetcidrblock.json @@ -27,6 +27,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnetnetworkaclassociation.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnetnetworkaclassociation.json index c2f822e26c..4444a48194 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnetnetworkaclassociation.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnetnetworkaclassociation.json @@ -18,6 +18,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ecs-service.json index ba7baa1de3..26b462c66f 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-cloud9-environmentec2.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-cloud9-environmentec2.json index a71bd993aa..ab10ec22a1 100644 --- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-cloud9-environmentec2.json +++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-cloud9-environmentec2.json @@ -63,6 +63,7 @@ "type": "string" }, "ImageId": { + "format": "AWS::EC2::Image.Id", "type": "string" }, "InstanceType": { @@ -82,6 +83,7 @@ "uniqueItems": false }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-eks-fargateprofile.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-eks-fargateprofile.json index c46a40ddd1..299b593a08 100644 --- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-eks-fargateprofile.json +++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-eks-fargateprofile.json @@ -96,7 +96,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloud9-environmentec2.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloud9-environmentec2.json index a71bd993aa..ab10ec22a1 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloud9-environmentec2.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloud9-environmentec2.json @@ -63,6 +63,7 @@ "type": "string" }, "ImageId": { + "format": "AWS::EC2::Image.Id", "type": "string" }, "InstanceType": { @@ -82,6 +83,7 @@ "uniqueItems": false }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-subnetcidrblock.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-subnetcidrblock.json index f1438be6e2..74fc31e315 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-subnetcidrblock.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-subnetcidrblock.json @@ -27,6 +27,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-service.json index ba7baa1de3..26b462c66f 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-taskset.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-taskset.json index 3491488499..37bb5713ca 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-taskset.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-taskset.json @@ -32,7 +32,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "maxItems": 16, diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-eks-fargateprofile.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-eks-fargateprofile.json index c46a40ddd1..299b593a08 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-eks-fargateprofile.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-eks-fargateprofile.json @@ -96,7 +96,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json index 2a0eaf3daf..82e9b574a6 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json @@ -516,8 +516,10 @@ }, "HealthCheckType": { "enum": [ + "EBS", "EC2", - "ELB" + "ELB", + "VPC_LATTICE" ], "type": "string" }, diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-codebuild-fleet.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-codebuild-fleet.json index de0359dd68..fdacce7411 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-codebuild-fleet.json +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-codebuild-fleet.json @@ -73,8 +73,10 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" @@ -128,6 +130,7 @@ "$ref": "#/definitions/VpcConfig" }, "ImageId": { + "format": "AWS::EC2::Image.Id", "pattern": "^((aws/codebuild/[A-Za-z-]+:[0-9]+(-[0-9._]+)?)|ami-[a-z0-9]{1,1020})$", "type": "string" }, diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-launchtemplate.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-launchtemplate.json index 695f0cffe8..5f9b8666c1 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-launchtemplate.json +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-launchtemplate.json @@ -737,6 +737,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-subnetcidrblock.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-subnetcidrblock.json index f1438be6e2..74fc31e315 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-subnetcidrblock.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-subnetcidrblock.json @@ -27,6 +27,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ecs-service.json index ba7baa1de3..26b462c66f 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ecs-service.json index ba7baa1de3..26b462c66f 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-redshiftserverless-workgroup.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-redshiftserverless-workgroup.json index eebdb07ca4..34c0a01e90 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-redshiftserverless-workgroup.json +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-redshiftserverless-workgroup.json @@ -53,6 +53,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-spotfleet.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-spotfleet.json index d132978064..e88a9d9272 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-spotfleet.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-spotfleet.json @@ -187,6 +187,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, @@ -224,6 +225,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "WeightedCapacity": { @@ -325,6 +327,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "TagSpecifications": { diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-subnetcidrblock.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-subnetcidrblock.json index f1438be6e2..74fc31e315 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-subnetcidrblock.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-subnetcidrblock.json @@ -27,6 +27,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-service.json index ba7baa1de3..26b462c66f 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-instance.json index 2f7441b919..7971f63404 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/sa_east_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-apprunner-vpcconnector.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-apprunner-vpcconnector.json index 76e5fe1cd5..dd0fd5a1c2 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-apprunner-vpcconnector.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-apprunner-vpcconnector.json @@ -35,8 +35,10 @@ "uniqueItems": true }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "minItems": 1, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-batch-computeenvironment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-batch-computeenvironment.json index 69abdd1e01..dcdfbd6ca0 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-batch-computeenvironment.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-batch-computeenvironment.json @@ -92,8 +92,10 @@ "type": "string" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloud9-environmentec2.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloud9-environmentec2.json index 91279a2249..16c19bfd0c 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloud9-environmentec2.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloud9-environmentec2.json @@ -63,6 +63,7 @@ "type": "string" }, "ImageId": { + "format": "AWS::EC2::Image.Id", "type": "string" }, "InstanceType": { @@ -82,6 +83,7 @@ "uniqueItems": false }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-fleet.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-fleet.json index 186b0947c9..416cf2e4e9 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-fleet.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-fleet.json @@ -36,8 +36,10 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" @@ -91,6 +93,7 @@ "$ref": "#/definitions/VpcConfig" }, "ImageId": { + "format": "AWS::EC2::Image.Id", "pattern": "^((aws/codebuild/[A-Za-z-]+:[0-9]+(-[0-9._]+)?)|ami-[a-z0-9]{1,1020})$", "type": "string" }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-project.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-project.json index 45eac9b2b9..1db236733f 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-project.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-project.json @@ -470,7 +470,9 @@ "uniqueItems": false }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-documentclassifier.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-documentclassifier.json index 8a72077b84..a88cbd0e18 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-documentclassifier.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-documentclassifier.json @@ -206,8 +206,10 @@ "uniqueItems": true }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 32, "minLength": 1, "pattern": "[-0-9a-zA-Z]+", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-flywheel.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-flywheel.json index 12f8fb7e01..a67fd49893 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-flywheel.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-flywheel.json @@ -153,8 +153,10 @@ "uniqueItems": true }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 32, "minLength": 1, "pattern": "[-0-9a-zA-Z]+", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-clientvpntargetnetworkassociation.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-clientvpntargetnetworkassociation.json index 460308a839..334fb0e571 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-clientvpntargetnetworkassociation.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-clientvpntargetnetworkassociation.json @@ -15,6 +15,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ec2fleet.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ec2fleet.json index 126d77a49d..75973b95a1 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ec2fleet.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ec2fleet.json @@ -114,6 +114,7 @@ "type": "number" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "WeightedCapacity": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-instance.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-instance.json index ba291eb8aa..e49364a310 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-instance.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-instance.json @@ -260,6 +260,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, @@ -1423,6 +1424,7 @@ "type": "object" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-instanceconnectendpoint.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-instanceconnectendpoint.json index 02db6cefb2..e9866f8370 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-instanceconnectendpoint.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-instanceconnectendpoint.json @@ -51,6 +51,7 @@ "uniqueItems": true }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-launchtemplate.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-launchtemplate.json index b0b2276741..a31246bdb6 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-launchtemplate.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-launchtemplate.json @@ -734,6 +734,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-natgateway.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-natgateway.json index 11444a2ca8..4c5e1a862f 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-natgateway.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-natgateway.json @@ -68,6 +68,7 @@ "uniqueItems": true }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-networkinterface.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-networkinterface.json index bf44566086..9e6d32c06c 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-networkinterface.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-networkinterface.json @@ -201,6 +201,7 @@ "type": "boolean" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-spotfleet.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-spotfleet.json index 2b09ab5669..53307e92d3 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-spotfleet.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-spotfleet.json @@ -247,6 +247,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, @@ -457,6 +458,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "WeightedCapacity": { @@ -617,6 +619,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "TagSpecifications": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnet.json index ef2dc5e490..c3c876be2a 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnet.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnet.json @@ -121,6 +121,7 @@ "type": "object" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetcidrblock.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetcidrblock.json index 43364b8508..506aca057d 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetcidrblock.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetcidrblock.json @@ -33,6 +33,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetnetworkaclassociation.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetnetworkaclassociation.json index ac14bb8518..9b5af6ca81 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetnetworkaclassociation.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetnetworkaclassociation.json @@ -15,6 +15,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetroutetableassociation.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetroutetableassociation.json index 7c2cb01b29..19f1943d89 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetroutetableassociation.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnetroutetableassociation.json @@ -15,6 +15,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastdomainassociation.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastdomainassociation.json index 685c7eba98..0f17ef0851 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastdomainassociation.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastdomainassociation.json @@ -21,6 +21,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "TransitGatewayAttachmentId": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastgroupmember.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastgroupmember.json index c2a95118ff..2f08f6ac58 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastgroupmember.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastgroupmember.json @@ -33,6 +33,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "TransitGatewayAttachmentId": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastgroupsource.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastgroupsource.json index 8a15d22020..892af2d0d8 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastgroupsource.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastgroupsource.json @@ -33,6 +33,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "TransitGatewayAttachmentId": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-vpccidrblock.json index 98d20d33e8..e1df44e5d4 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-vpccidrblock.json @@ -50,6 +50,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-service.json index 37e099399e..92226883ad 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-taskset.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-taskset.json index 663d1205f9..8c6ade0c90 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-taskset.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-taskset.json @@ -33,7 +33,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "maxItems": 16, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-efs-mounttarget.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-efs-mounttarget.json index f6945d0135..27c2386fb3 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-efs-mounttarget.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-efs-mounttarget.json @@ -31,6 +31,7 @@ "uniqueItems": true }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "pattern": "^subnet-[0-9a-f]{8,40}$", "type": "string" } diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-fargateprofile.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-fargateprofile.json index ce2b999210..e2fc1e4755 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-fargateprofile.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-fargateprofile.json @@ -96,7 +96,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-nodegroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-nodegroup.json index fc7a96e616..25feaad351 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-nodegroup.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-nodegroup.json @@ -189,8 +189,10 @@ "$ref": "#/definitions/ScalingConfig" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticloadbalancing-loadbalancer.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticloadbalancing-loadbalancer.json index 9bf8856eac..f0e6d5b7b1 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticloadbalancing-loadbalancer.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticloadbalancing-loadbalancer.json @@ -307,7 +307,9 @@ "type": "object" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticloadbalancingv2-loadbalancer.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticloadbalancingv2-loadbalancer.json index bb9cd3acb4..94dc15a3b5 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticloadbalancingv2-loadbalancer.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticloadbalancingv2-loadbalancer.json @@ -31,6 +31,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, @@ -115,8 +116,10 @@ "uniqueItems": true }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-events-rule.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-events-rule.json index 43f9f44d6b..349225ba27 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-events-rule.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-events-rule.json @@ -36,8 +36,10 @@ "uniqueItems": true }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": true, "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-connection.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-connection.json index 2329043b96..2b9c03735f 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-connection.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-connection.json @@ -65,6 +65,7 @@ "uniqueItems": false }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-devendpoint.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-devendpoint.json index c9e89c6980..d76c7eea4e 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-devendpoint.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-devendpoint.json @@ -61,6 +61,7 @@ "uniqueItems": false }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-imagebuilder-infrastructureconfiguration.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-imagebuilder-infrastructureconfiguration.json index 0306a9a8f3..3ea8677c5d 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-imagebuilder-infrastructureconfiguration.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-imagebuilder-infrastructureconfiguration.json @@ -115,6 +115,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-kafkaconnect-connector.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-kafkaconnect-connector.json index 4e1aefc3c4..04a651904d 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-kafkaconnect-connector.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-kafkaconnect-connector.json @@ -316,8 +316,10 @@ "uniqueItems": true }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "minItems": 1, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flow.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flow.json index 0f2b5a7d29..ad664f0d65 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flow.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flow.json @@ -433,6 +433,7 @@ "type": "array" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flowvpcinterface.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flowvpcinterface.json index 8491b922e3..58ac32061d 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flowvpcinterface.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flowvpcinterface.json @@ -33,6 +33,7 @@ "type": "array" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-networkfirewall-firewall.json index 3a6b5ab3ac..cc38cd9b41 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-networkfirewall-firewall.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-networkfirewall-firewall.json @@ -21,6 +21,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-instance.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-instance.json index 245960457c..ffe6273289 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-instance.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-instance.json @@ -211,6 +211,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tenancy": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-pipes-pipe.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-pipes-pipe.json index ea5044ce0a..0161605fd2 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-pipes-pipe.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-pipes-pipe.json @@ -48,7 +48,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 1024, "minLength": 1, "pattern": "^subnet-[0-9a-z]*|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$", @@ -1634,7 +1636,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 1024, "minLength": 1, "pattern": "^subnet-[0-9a-z]*$", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-vpcconnection.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-vpcconnection.json index c7aab4bbf2..1124a8d5c6 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-vpcconnection.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-vpcconnection.json @@ -24,6 +24,7 @@ "$ref": "#/definitions/NetworkInterfaceStatus" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 255, "minLength": 1, "pattern": "^subnet-[0-9a-z]*$", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-redshift-endpointaccess.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-redshift-endpointaccess.json index 3b4d3b4b98..45310c33e5 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-redshift-endpointaccess.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-redshift-endpointaccess.json @@ -28,6 +28,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "relationshipRef": { "propertyPath": "/properties/SubnetId", "typeName": "AWS::EC2::NetworkInterface" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-redshiftserverless-workgroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-redshiftserverless-workgroup.json index ebdad29792..2a3c4edcd8 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-redshiftserverless-workgroup.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-redshiftserverless-workgroup.json @@ -53,6 +53,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-route53resolver-resolverendpoint.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-route53resolver-resolverendpoint.json index 49450e6c25..db6a3d27a5 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-route53resolver-resolverendpoint.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-route53resolver-resolverendpoint.json @@ -17,6 +17,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-s3outposts-endpoint.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-s3outposts-endpoint.json index ce0fdd9a67..2edf5ac225 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-s3outposts-endpoint.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-s3outposts-endpoint.json @@ -108,6 +108,7 @@ "type": "string" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 100, "minLength": 1, "pattern": "^subnet-([0-9a-f]{8}|[0-9a-f]{17})$", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-cluster.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-cluster.json index 751c23f435..06199e5bbc 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-cluster.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-cluster.json @@ -200,8 +200,10 @@ "additionalProperties": false, "properties": { "SecurityGroupIds": { + "format": "AWS::EC2::SecurityGroup.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::SecurityGroup.GroupId", "maxLength": 32, "pattern": "[-0-9a-zA-Z]+", "type": "string" @@ -211,8 +213,10 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 32, "pattern": "[-0-9a-zA-Z]+", "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-dataqualityjobdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-dataqualityjobdefinition.json index 83c8914e4a..3f5a01ed52 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-dataqualityjobdefinition.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-dataqualityjobdefinition.json @@ -412,7 +412,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 32, "pattern": "[-0-9a-zA-Z]+", "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-endpointconfig.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-endpointconfig.json index 5f3ed4ce40..080ab2a787 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-endpointconfig.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-endpointconfig.json @@ -398,7 +398,9 @@ "uniqueItems": false }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-model.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-model.json index 1157e99c81..21e6fec7e6 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-model.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-model.json @@ -189,7 +189,9 @@ "uniqueItems": false }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelbiasjobdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelbiasjobdefinition.json index 4dc1c10d1a..a50fcee2d8 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelbiasjobdefinition.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelbiasjobdefinition.json @@ -442,7 +442,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 32, "pattern": "[-0-9a-zA-Z]+", "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelexplainabilityjobdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelexplainabilityjobdefinition.json index abb0a6d55e..5e073d2b8c 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelexplainabilityjobdefinition.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelexplainabilityjobdefinition.json @@ -402,7 +402,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 32, "pattern": "[-0-9a-zA-Z]+", "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelqualityjobdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelqualityjobdefinition.json index ae4718acfc..f8943ced1e 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelqualityjobdefinition.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelqualityjobdefinition.json @@ -466,7 +466,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 32, "pattern": "[-0-9a-zA-Z]+", "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-monitoringschedule.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-monitoringschedule.json index e97cdbbb1a..52f695e969 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-monitoringschedule.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-monitoringschedule.json @@ -548,7 +548,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 32, "pattern": "[-0-9a-zA-Z]+", "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-notebookinstance.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-notebookinstance.json index 24be3d2cf6..bd2c5206c1 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-notebookinstance.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-notebookinstance.json @@ -99,6 +99,7 @@ "uniqueItems": false }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "Tags": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-scheduler-schedule.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-scheduler-schedule.json index 9b47e4bdde..15abdf7299 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-scheduler-schedule.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-scheduler-schedule.json @@ -31,8 +31,10 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "insertionOrder": false, "items": { + "format": "AWS::EC2::Subnet.Id", "maxLength": 1000, "minLength": 1, "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codebuild-project.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codebuild-project.json index e39c543503..5d634dafa2 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codebuild-project.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codebuild-project.json @@ -455,7 +455,9 @@ "uniqueItems": false }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ecs-service.json index ba7baa1de3..26b462c66f 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-efs-mounttarget.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-efs-mounttarget.json index fe582212f9..552b23126a 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-efs-mounttarget.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-efs-mounttarget.json @@ -30,6 +30,7 @@ "uniqueItems": true }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "pattern": "^subnet-[0-9a-f]{8,40}$", "type": "string" } diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-events-rule.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-events-rule.json index 2f109d3f3f..01ee266802 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-events-rule.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-events-rule.json @@ -21,7 +21,9 @@ "uniqueItems": true }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-codebuild-project.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-codebuild-project.json index e39c543503..5d634dafa2 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-codebuild-project.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-codebuild-project.json @@ -455,7 +455,9 @@ "uniqueItems": false }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-subnetcidrblock.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-subnetcidrblock.json index f1438be6e2..74fc31e315 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-subnetcidrblock.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-subnetcidrblock.json @@ -27,6 +27,7 @@ "type": "integer" }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ecs-service.json index ba7baa1de3..26b462c66f 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ecs-service.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ecs-service.json @@ -28,7 +28,9 @@ "type": "array" }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-efs-mounttarget.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-efs-mounttarget.json index fe582212f9..552b23126a 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-efs-mounttarget.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-efs-mounttarget.json @@ -30,6 +30,7 @@ "uniqueItems": true }, "SubnetId": { + "format": "AWS::EC2::Subnet.Id", "pattern": "^subnet-[0-9a-f]{8,40}$", "type": "string" } diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-events-rule.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-events-rule.json index 2f109d3f3f..01ee266802 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-events-rule.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-events-rule.json @@ -21,7 +21,9 @@ "uniqueItems": true }, "Subnets": { + "format": "AWS::EC2::Subnet.Ids", "items": { + "format": "AWS::EC2::Subnet.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpccidrblock.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpccidrblock.json index 990b5cb413..c915ff6c10 100644 --- a/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpccidrblock.json +++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpccidrblock.json @@ -44,6 +44,7 @@ "type": "string" }, "VpcId": { + "format": "AWS::EC2::VPC.Id", "type": "string" } },