Fix an issue with E3044 (#3670)

Author: kddejong

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": {

src/cfnlint/rules/resources/ecs/FargateDeploymentSchedulingStrategy.py

@@ -5,10 +5,7 @@
 
 from __future__ import annotations
 
-from typing import Any
-
 import cfnlint.data.schemas.extensions.aws_ecs_service
-from cfnlint.jsonschema import ValidationError
 from cfnlint.rules.jsonschema.CfnLintJsonSchema import CfnLintJsonSchema, SchemaDetails
 
 
@@ -19,8 +16,7 @@ class FargateDeploymentSchedulingStrategy(CfnLintJsonSchema):
         "use SchedulingStrategy of REPLICA"
     )
     description = (
-        "When using a TargetType of Fargate or External the SchedulingStrategy "
-        "has to be Replica"
+        "When using a LaunchType of Fargate the SchedulingStrategy " "has to be Replica"
     )
     source_url = "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-schedulingstrategy"
     tags = ["properties", "ecs", "service", "container", "fargate"]
@@ -32,7 +28,5 @@ def __init__(self) -> None:
                 module=cfnlint.data.schemas.extensions.aws_ecs_service,
                 filename="fargate.json",
             ),
+            all_matches=True,
         )
-
-    def message(self, instance: Any, err: ValidationError) -> str:
-        return err.message

test/unit/rules/resources/ecs/test_ecs_fargate.py

@@ -46,10 +46,43 @@ def rule():
             },
             [],
         ),
+        (
+            {
+                "LaunchType": "EXTERNAL",
+                "SchedulingStrategy": "DAEMON",
+            },
+            [],
+        ),
+        (
+            {
+                "LaunchType": "EXTERNAL",
+                "SchedulingStrategy": "DAEMON",
+                "DeploymentController": {"Type": "ECS"},
+            },
+            [],
+        ),
+        (
+            {
+                "LaunchType": "EXTERNAL",
+                "SchedulingStrategy": "DAEMON",
+                "DeploymentController": {"Type": "CODE_DEPLOY"},
+            },
+            [
+                ValidationError(
+                    "'REPLICA' was expected",
+                    rule=FargateDeploymentSchedulingStrategy(),
+                    path=deque(["SchedulingStrategy"]),
+                    validator="const",
+                    schema_path=deque(
+                        ["then", "properties", "SchedulingStrategy", "const"]
+                    ),
+                )
+            ],
+        ),
         (
             {
                 "LaunchType": "FARGATE",
-                "SchedulingStrategy": "Foo",
+                "SchedulingStrategy": "DAEMON",
             },
             [
                 ValidationError(