Remove rule E2504 and add back in E3671 (#3220)

* Remove rule E2504 and add back in E3671
* Update rule to E3013 to v1 logic

scripts/fix_data_files.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 """
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0

scripts/update_schemas_manually.py

@@ -17,7 +17,10 @@
 
 
 common_patches = {
-    "BlockDeviceMapping": {"requiredXor": ["VirtualName", "Ebs", "NoDevice"]},
+    "BlockDeviceMapping": {
+        "requiredXor": ["VirtualName", "Ebs", "NoDevice"],
+        "cfnLint": "",
+    },
 }
 
 patches.extend(
@@ -75,6 +78,10 @@
                     values={"requiredXor": ["LaunchTemplateID", "LaunchTemplateName"]},
                     path="/definitions/LaunchTemplateSpecification",
                 ),
+                Patch(
+                    values={"pattern": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"},
+                    path="/definitions/BlockDeviceMapping/properties/VirtualName",
+                ),
                 Patch(
                     values={
                         "dependentExcluded": {
@@ -708,6 +715,10 @@
                     values=common_patches.get("BlockDeviceMapping"),
                     path="/definitions/BlockDeviceMapping",
                 ),
+                Patch(
+                    values={"pattern": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"},
+                    path="/definitions/BlockDeviceMapping/properties/VirtualName",
+                ),
                 Patch(
                     values={
                         "requiredXor": [
@@ -730,6 +741,10 @@
                     values=common_patches.get("BlockDeviceMapping"),
                     path="/definitions/BlockDeviceMapping",
                 ),
+                Patch(
+                    values={"pattern": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"},
+                    path="/definitions/BlockDeviceMapping/properties/VirtualName",
+                ),
                 Patch(
                     values={
                         "requiredXor": [
@@ -853,6 +868,10 @@
                     path="/definitions/BlockDeviceMapping",
                     values=common_patches.get("BlockDeviceMapping"),
                 ),
+                Patch(
+                    values={"pattern": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"},
+                    path="/definitions/BlockDeviceMapping/properties/VirtualName",
+                ),
                 Patch(
                     path="/",
                     values={
@@ -1280,6 +1299,10 @@
         ResourcePatch(
             resource_type="AWS::OpsWorks::Instance",
             patches=[
+                Patch(
+                    values={"pattern": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"},
+                    path="/definitions/BlockDeviceMapping/properties/VirtualName",
+                ),
                 Patch(
                     values=common_patches.get("BlockDeviceMapping"),
                     path="/definitions/BlockDeviceMapping",

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

@@ -1 +1 @@
-{"etag": "\"a28d105c151831cc5180280626141bb0\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"3dd742de2ec80b745805f5f705447eef\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"16faf7f7ee2bf9b671f16907ed752da5\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"a839d54983fe419c855f2caf50942ec2\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"50991ed57eec9b35aca76b739bdba942\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"962be477eb92934af7da12e651d99acb\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"0df9abdb662a218e7acc5b80cb694d80\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"267889b2ace92a6fbaf41e3133707465\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"4dbc3b1d393d5657c54b33b7624e465e\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"71176a64c8e68ea6236d454556d1b6f9\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"0400dcb7cf03bd5300c643f276317490\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"0a9e9a9a0dc6facc824f365f7e5cb16e\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"cc2ccd1ad83ecf92920eb785d76f7029\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"754e501de3902e1de87f2f57e61c4238\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"2df68147099660c918ad0e83dc356419\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"a3222442280299facfd86f35ef14b6eb\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"5edcf3854aa5b8f11b6bfee1a4d2746d\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"d4e4dcbc4dadd679556c86241c1f18e7\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"5e41e68d96eef89d4e61b8ccea19d555\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"5829d5c557f814a26d5abacb675469b1\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"6289722dad60968a8b68ff63af49dbbd\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"7b65805e8574450beebe592e34b1bdb5\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"0e95510b53ab754970ddca008c67c2d4\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"71a2b1013f69978557919514942992d4\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"2db61544901899a81d8f39d2a550f41e\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"f37045c31ae98236e5d944dd8cec4778\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"c51c693c3184880c5f7a1d1c651adc45\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"7e7cd3bcdd1bcd328f57fb0537babc79\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/schemas/extensions/aws_ec2_instance/blockdevicemappings.json

@@ -0,0 +1,48 @@
+{
+ "allOf": [
+  {
+   "if": {
+    "properties": {
+     "VolumeType": {
+      "enum": [
+       "io1",
+       "io2"
+      ],
+      "type": "string"
+     }
+    },
+    "required": [
+     "VolumeType"
+    ]
+   },
+   "then": {
+    "required": [
+     "Iops"
+    ]
+   }
+  },
+  {
+   "if": {
+    "properties": {
+     "VolumeType": {
+      "enum": [
+       "gp2",
+       "st1",
+       "sc1",
+       "standard"
+      ],
+      "type": "string"
+     }
+    },
+    "required": [
+     "VolumeType"
+    ]
+   },
+   "then": {
+    "properties": {
+     "Iops": false
+    }
+   }
+  }
+ ]
+}

src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_autoscalinggroup/manual.json

@@ -15,6 +15,11 @@
    "LaunchTemplateName"
   ]
  },
+ {
+  "op": "add",
+  "path": "/definitions/BlockDeviceMapping/properties/VirtualName/pattern",
+  "value": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"
+ },
  {
   "op": "add",
   "path": "/dependentExcluded",

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

@@ -0,0 +1,9 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/BlockDevice/cfnLint",
+  "value": [
+   "AWS::AutoScaling::LaunchConfiguration/Properties/BlockDeviceMappings/Ebs"
+  ]
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_cloudfront_distribution/cfn_lint.json

@@ -0,0 +1,9 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/DistributionConfig/properties/Aliases/items/cfnLint",
+  "value": [
+   "AWS::CloudFront::Distribution/Properties/DistributionConfig/Aliases/Alias"
+  ]
+ }
+]

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

@@ -6,6 +6,13 @@
    "AWS::EC2::Instance/Properties/InstanceType"
   ]
  },
+ {
+  "op": "add",
+  "path": "/definitions/Ebs/cfnLint",
+  "value": [
+   "AWS::EC2::Instance/Properties/BlockDeviceMappings/Ebs"
+  ]
+ },
  {
   "op": "add",
   "path": "/properties/AvailabilityZone/cfnLint",

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

@@ -8,6 +8,11 @@
    "NoDevice"
   ]
  },
+ {
+  "op": "add",
+  "path": "/definitions/BlockDeviceMapping/properties/VirtualName/pattern",
+  "value": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"
+ },
  {
   "op": "add",
   "path": "/requiredXor",

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

@@ -5,5 +5,12 @@
   "value": [
    "AWS::EC2::LaunchTemplate/LaunchTemplateData/Placement/AvailabilityZone"
   ]
+ },
+ {
+  "op": "add",
+  "path": "/definitions/Ebs/cfnLint",
+  "value": [
+   "AWS::EC2::LaunchTemplate/Properties/BlockDeviceMappings/Ebs"
+  ]
  }
 ]

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

@@ -8,6 +8,11 @@
    "NoDevice"
   ]
  },
+ {
+  "op": "add",
+  "path": "/definitions/BlockDeviceMapping/properties/VirtualName/pattern",
+  "value": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"
+ },
  {
   "op": "add",
   "path": "/definitions/LaunchTemplateData/requiredXor",

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

@@ -19,5 +19,12 @@
   "value": [
    "AWS::EC2::SpotFleet/Properties/SpotFleetRequestConfigData/IamFleetRole"
   ]
+ },
+ {
+  "op": "add",
+  "path": "/definitions/EbsBlockDevice/cfnLint",
+  "value": [
+   "AWS::EC2::SpotFleet/Properties/BlockDeviceMappings/Ebs"
+  ]
  }
 ]

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

@@ -8,6 +8,11 @@
    "NoDevice"
   ]
  },
+ {
+  "op": "add",
+  "path": "/definitions/BlockDeviceMapping/properties/VirtualName/pattern",
+  "value": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"
+ },
  {
   "op": "add",
   "path": "/requiredXor",

src/cfnlint/data/schemas/patches/extensions/all/aws_opsworks_instance/cfn_lint.json

@@ -5,5 +5,12 @@
   "value": [
    "AWS::OpsWorks::Instance/Properties/AvailabilityZone"
   ]
+ },
+ {
+  "op": "add",
+  "path": "/definitions/EbsBlockDevice/cfnLint",
+  "value": [
+   "AWS::OpsWorks::Instance/Properties/BlockDeviceMappings/Ebs"
+  ]
  }
 ]

src/cfnlint/data/schemas/patches/extensions/all/aws_opsworks_instance/manual.json

@@ -1,4 +1,9 @@
 [
+ {
+  "op": "add",
+  "path": "/definitions/BlockDeviceMapping/properties/VirtualName/pattern",
+  "value": "^ephemeral([0-9]|[1][0-9]|[2][0-3])$"
+ },
  {
   "op": "add",
   "path": "/definitions/BlockDeviceMapping/requiredXor",