Merge branch 'main' into fix_no_matching_templates

.github/workflows/ci-pr-data.yaml

@@ -0,0 +1,21 @@
+name: "[CI] Test PR Data"
+
+on:
+  pull_request:
+    paths:
+    - "src/cfnlint/data/**"
+
+jobs:
+  data:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - name: Install Tox and any other packages
+        run: pip install tox
+      - name: Run Tox
+        run: |
+          tox -e py -- -m "data"

.github/workflows/ci-pr.yaml

@@ -32,27 +32,6 @@ jobs:
         with:
           name: coverage-${{ matrix.python }}
           path: coverage-${{ matrix.python }}.xml
-      - name: Save PR number
-        run: |
-          mkdir -p ./pr
-          echo ${{ github.event.number }} > ./pr/NR
-      - uses: actions/upload-artifact@v2
-        with:
-          name: pr
-          path: pr/
-  data:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-      - name: Install Tox and any other packages
-        run: pip install tox
-      - name: Run Tox
-        run: |
-          tox -e py -- -m "data"
   integration:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -89,6 +68,13 @@ jobs:
           pip3 install -e .
           pip install --upgrade pip
           pip install --upgrade setuptools
+          mkdir -p ./pr
+          echo ${{ github.event.number }} > ./pr/NR
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pr
+          path: pr/
+          overwrite: true
       - uses: pypa/gh-action-pip-audit@v1.0.8
         with:
           ignore-vulns: |

CHANGELOG.md

@@ -1,3 +1,10 @@
+### v1.12.4
+## What's Changed
+* Return Symbol instead of None on Fn::Equals logic by @kddejong in https://github.com/aws-cloudformation/cfn-lint/pull/3663
+* Remove handlers and tagging/permissions from specs by @kddejong in https://github.com/aws-cloudformation/cfn-lint/pull/3661
+
+**Full Changelog**: https://github.com/aws-cloudformation/cfn-lint/compare/v1.12.3...v1.12.4
+
 ### v1.12.3
 ## What's Changed
 * Allow for patch in place by @kddejong in https://github.com/aws-cloudformation/cfn-lint/pull/3649

README.md

@@ -342,7 +342,7 @@ If you'd like cfn-lint to be run automatically when making changes to files in y
 ```yaml
 repos:
   - repo: https://github.com/aws-cloudformation/cfn-lint
-    rev: v1.12.3 # The version of cfn-lint to use
+    rev: v1.12.4 # The version of cfn-lint to use
     hooks:
       - id: cfn-lint
         files: path/to/cfn/dir/.*\.(json|yml|yaml)$
@@ -353,7 +353,7 @@ If you are using a `.cfnlintrc` and specifying the `templates` or `ignore_templa
 ```yaml
 repos:
   - repo: https://github.com/aws-cloudformation/cfn-lint
-    rev: v1.12.3 # The version of cfn-lint to use
+    rev: v1.12.4 # The version of cfn-lint to use
     hooks:
       - id: cfn-lint-rc
 ```

scripts/update_schemas_manually.py

@@ -727,6 +727,20 @@
                 ),
             ],
         ),
+        ResourcePatch(
+            resource_type="AWS::EC2::NetworkInterface",
+            patches=[
+                Patch(
+                    values={
+                        "dependentExcluded": {
+                            "Ipv6AddressCount": ["Ipv6Addresses"],
+                            "Ipv6Addresses": ["Ipv6AddressCount"],
+                        },
+                    },
+                    path="/",
+                ),
+            ],
+        ),
         ResourcePatch(
             resource_type="AWS::EC2::SecurityGroup",
             patches=[

scripts/update_snapshot_results.sh

@@ -5,6 +5,7 @@ cfn-lint test/fixtures/templates/integration/dynamic-references.yaml -e -c I --f
 cfn-lint test/fixtures/templates/integration/resources-cloudformation-init.yaml -e -c I --format json > test/fixtures/results/integration/resources-cloudformation-init.json
 cfn-lint test/fixtures/templates/integration/ref-no-value.yaml -e -c I --format json > test/fixtures/results/integration/ref-no-value.json
 cfn-lint test/fixtures/templates/integration/availability-zones.yaml -e -c I --format json > test/fixtures/results/integration/availability-zones.json
+cfn-lint test/fixtures/templates/integration/aws-ec2-networkinterface.yaml -e -c I --format json > test/fixtures/results/integration/aws-ec2-networkinterface.json
 
 # public/
 cfn-lint test/fixtures/templates/public/lambda-poller.yaml -e -c I --format json > test/fixtures/results/public/lambda-poller.json

src/cfnlint/conditions/_equals.py

@@ -158,7 +158,10 @@ def build_cnf(self, params: dict[str, Symbol]) -> BooleanFunction:
                 return BooleanTrue()
             return BooleanFalse()
 
-        return params.get(self.hash)
+        if self.hash in params:
+            return params.get(self.hash)
+
+        return Symbol(self.hash)
 
     def test(self, scenarios: Mapping[str, str]) -> bool:
         """Do an equals based on the provided scenario"""

src/cfnlint/conditions/_rule.py

@@ -91,7 +91,11 @@ def build_cnf(self, params: dict[str, Symbol]) -> BooleanFunction | Symbol | Non
         for assertion in self._assertions:
             assertions.append(assertion.build_cnf(params))
 
-        return And(*assertions)
+        try:
+            return And(*assertions)
+        except Exception as e:
+            LOGGER.debug(f"Error building conditions: {e}")
+            return BooleanTrue()
 
     @property
     def equals(self) -> list[Equal]:

src/cfnlint/data/AdditionalSpecs/Policies.json

@@ -4651,6 +4651,7 @@
     "GetExperiment",
     "GetExperimentTargetAccountConfiguration",
     "GetExperimentTemplate",
+    "GetSafetyLever",
     "GetTargetAccountConfiguration",
     "GetTargetResourceType",
     "InjectApiInternalError",
@@ -4669,6 +4670,7 @@
     "TagResource",
     "UntagResource",
     "UpdateExperimentTemplate",
+    "UpdateSafetyLeverState",
     "UpdateTargetAccountConfiguration"
    ],
    "HasResource": true,

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

@@ -1 +1 @@
-{"etag": "\"149d3ccf3741bcbeac7b5f6f4db029ba\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"f6edd82515a16676926f5f3a12d52efb\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"ae3cfdea6b21f35aadead9d81b516e64\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"8f79f8805b7537d546dc63450fd56a1b\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"34aa8f2646197181cb9a5d939e086ad8\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"2dbd8e8abff7e7518cb07bdbb155d843\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"379f8faec922d6179523dbb35658db99\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"c07546067edbe91211f62c41893f72f1\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"06f7b01112a71d8a61803e9819db4c12\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"48566226bdcbff3cb167c745d575e48d\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"46abb24012deca7f7cdee909373e4247\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"92cfd52881d5c4374a41db95c11d7626\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"f46c8a99f6924c350ac96de522d08d8f\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"6268d8d9cd7faa977e4c2f0af2566842\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"010617485b30b705e5df3b3f74b70f77\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"744db39255294103901edbad31facc38\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"666b6426119d343cdc2d619838351da0\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"5c6f48dc3f473c2b7af7f356078f3fd2\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"038c8cfb262e2c73955d6034ade0ef42\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"89f22231bd8b106a62265463f761fcf3\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"65b6e8a463c9be1ec20a6c602fe21e38\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"7927f7ebb5c0dfd9313f22a2d240bd74\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

@@ -1 +1 @@
-{"etag": "\"54e849c8265eec335296026732f2e064\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"7e87a681c6240323d9f3e9a7e6ac803c\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"8e6d442bd013f225ddf1035aff892013\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"4a35c7ef670a698a55ba78b50e906242\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}

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

@@ -1 +1 @@
-{"etag": "\"777290e6b190993453f9e1874bfa4b8c\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"47562e9ed66c66b2baf8dae4f86a7989\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"ab5ac309e70e155456fd8c136faba1d0\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"37ebcddf2652190b0ba29e20693737ba\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}

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

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

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

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

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

@@ -1 +1 @@
-{"etag": "\"6d7bf81725555153eba880a79178c257\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"318bdb4d630dec177bba9ce86174bbb0\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}

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

@@ -0,0 +1,43 @@
+{
+ "if": {
+  "required": [
+   "PrivateIpAddress"
+  ]
+ },
+ "then": {
+  "properties": {
+   "NetworkInterfaces": {
+    "items": {
+     "properties": {
+      "PrivateIpAddress": false,
+      "PrivateIpAddresses": {
+       "items": {
+        "properties": {
+         "Primary": {
+          "enum": [
+           false
+          ]
+         }
+        }
+       },
+       "type": "array"
+      }
+     }
+    },
+    "type": "array"
+   },
+   "PrivateIpAddresses": {
+    "items": {
+     "properties": {
+      "Primary": {
+       "enum": [
+        false
+       ]
+      }
+     }
+    },
+    "type": "array"
+   }
+  }
+ }
+}

src/cfnlint/data/schemas/extensions/aws_ecs_service/fargate.json

@@ -1,20 +1,48 @@
 {
  "if": {
-  "properties": {
-   "LaunchType": {
-    "enum": [
-     "FARGATE",
-     "EXTERNAL"
-    ]
+  "anyOf": [
+   {
+    "properties": {
+     "LaunchType": {
+      "enum": [
+       "FARGATE"
+      ]
+     },
+     "SchedulingStrategy": {
+      "type": "string"
+     }
+    },
+    "required": [
+     "LaunchType"
+    ],
+    "type": "object"
    },
-   "SchedulingStrategy": {
-    "type": "string"
+   {
+    "properties": {
+     "DeploymentController": {
+      "properties": {
+       "Type": {
+        "enum": [
+         "CODE_DEPLOY",
+         "EXTERNAL"
+        ]
+       }
+      },
+      "required": [
+       "Type"
+      ],
+      "type": "object"
+     },
+     "SchedulingStrategy": {
+      "type": "string"
+     }
+    },
+    "required": [
+     "DeploymentController"
+    ],
+    "type": "object"
    }
-  },
-  "required": [
-   "LaunchType"
-  ],
-  "type": "object"
+  ]
  },
  "then": {
   "properties": {