fix(ecs): reject phantom clusters, over-limit count, negative desiredCount, phantom task-set service (#2253)

Author: vieiralucas

crates/fakecloud-ecs/src/service_container_instances_etc.rs

@@ -760,6 +760,21 @@ impl EcsService {
         let accounts = self.state.read();
         let mut found = Vec::new();
         let mut failures = Vec::new();
+        {
+            // AWS validates the referenced cluster + service exist, returning
+            // ClusterNotFoundException / ServiceNotFoundException rather than an
+            // empty task-set list.
+            let state = accounts
+                .get(&request.account_id)
+                .ok_or_else(|| service_not_found(&service_name))?;
+            if !state.clusters.contains_key(&cluster_name) {
+                return Err(cluster_not_found(&cluster_name));
+            }
+            let svc_key = EcsState::service_key(&cluster_name, &service_name);
+            if !state.services.contains_key(&svc_key) {
+                return Err(service_not_found(&service_name));
+            }
+        }
         if let Some(state) = accounts.get(&request.account_id) {
             if filter_refs.is_empty() {
                 for ts in state.task_sets.values() {

crates/fakecloud-ecs/src/service_services_resource.rs

@@ -20,11 +20,17 @@ impl EcsService {
         let td_ref = req_str(&body, "taskDefinition")?;
         let cluster_ref = opt_str(&body, "cluster");
         let cluster_name = EcsState::resolve_cluster_name(cluster_ref);
-        let desired_count = body
-            .get("desiredCount")
-            .and_then(|v| v.as_i64())
-            .filter(|n| *n >= 0)
-            .unwrap_or(1) as i32;
+        // AWS rejects a negative desiredCount with InvalidParameterException
+        // rather than silently defaulting it to 1.
+        let desired_count = match body.get("desiredCount").and_then(|v| v.as_i64()) {
+            Some(n) if n >= 0 => n as i32,
+            Some(n) => {
+                return Err(invalid_parameter(format!(
+                    "desiredCount cannot be negative. desiredCount={n}"
+                )))
+            }
+            None => 1,
+        };
         let launch_type = opt_str(&body, "launchType")
             .unwrap_or("FARGATE")
             .to_string();
@@ -133,11 +139,13 @@ impl EcsService {
             let td_arn = td.task_definition_arn.clone();
             let td_family = td.family.clone();
             let td_revision = td.revision;
+            // A phantom cluster is a ClusterNotFoundException on AWS, not an
+            // auto-created cluster.
             let cluster_arn = state
                 .clusters
                 .get(&cluster_name)
                 .map(|c| c.cluster_arn.clone())
-                .unwrap_or_else(|| state.cluster_arn(&cluster_name));
+                .ok_or_else(|| cluster_not_found(&cluster_name))?;
             let service_arn = state.service_arn(&cluster_name, &service_name);
             let key = EcsState::service_key(&cluster_name, &service_name);
             if let Some(existing) = state.services.get(&key) {

crates/fakecloud-ecs/src/service_tasks.rs

@@ -76,11 +76,17 @@ impl EcsService {
             .and_then(|v| v.as_array())
             .cloned()
             .unwrap_or_default();
-        let count = body
-            .get("count")
-            .and_then(|v| v.as_i64())
-            .filter(|n| (1..=10).contains(n))
-            .unwrap_or(1) as usize;
+        // AWS caps RunTask at 1..=10 tasks per call and rejects anything else
+        // with InvalidParameterException — it does NOT silently clamp to 1.
+        let count = match body.get("count").and_then(|v| v.as_i64()) {
+            Some(n) if (1..=10).contains(&n) => n as usize,
+            Some(n) => {
+                return Err(invalid_parameter(format!(
+                    "count should be between 1 and 10, inclusive. count={n}"
+                )))
+            }
+            None => 1,
+        };
         let group = opt_str(&body, "group").map(String::from);
         let started_by = opt_str(&body, "startedBy").map(String::from);
         let enable_execute_command = body
@@ -124,11 +130,13 @@ impl EcsService {
         let runtime = self.runtime.clone();
         let mut accounts = self.state.write();
         let state = accounts.get_or_create(&account);
+        // AWS rejects RunTask against a cluster that does not exist rather than
+        // synthesizing one; a phantom cluster returns ClusterNotFoundException.
         let cluster_arn = state
             .clusters
             .get(&cluster_name)
             .map(|c| c.cluster_arn.clone())
-            .unwrap_or_else(|| state.cluster_arn(&cluster_name));
+            .ok_or_else(|| cluster_not_found(&cluster_name))?;
         let (_, family, rev) = resolve_task_definition_ref(td_ref)?;
         let revisions = state
             .task_definitions
@@ -579,6 +587,47 @@ mod multi_container_tests {
         }
     }
 
+    #[test]
+    fn run_task_count_over_ten_is_invalid_parameter() {
+        let svc = fresh_service();
+        // count is validated before the cluster/task-def are dereferenced.
+        let err = match svc.run_task(&make_request(
+            "RunTask",
+            json!({"taskDefinition": "x", "count": 50}),
+        )) {
+            Ok(_) => panic!("expected InvalidParameterException for count > 10"),
+            Err(e) => e,
+        };
+        assert_eq!(err.code(), "InvalidParameterException");
+    }
+
+    #[test]
+    fn create_service_negative_desired_count_is_invalid_parameter() {
+        let svc = fresh_service();
+        // desiredCount is validated before the cluster/task-def are resolved.
+        let err = match svc.create_service(&make_request(
+            "CreateService",
+            json!({"serviceName": "s", "taskDefinition": "x", "desiredCount": -3}),
+        )) {
+            Ok(_) => panic!("expected InvalidParameterException for negative desiredCount"),
+            Err(e) => e,
+        };
+        assert_eq!(err.code(), "InvalidParameterException");
+    }
+
+    #[test]
+    fn run_task_on_missing_cluster_is_cluster_not_found() {
+        let svc = fresh_service();
+        let err = match svc.run_task(&make_request(
+            "RunTask",
+            json!({"taskDefinition": "x", "cluster": "ghost", "count": 1}),
+        )) {
+            Ok(_) => panic!("expected ClusterNotFoundException for a phantom cluster"),
+            Err(e) => e,
+        };
+        assert_eq!(err.code(), "ClusterNotFoundException");
+    }
+
     #[test]
     fn register_task_def_with_two_containers_then_run_task_starts_both() {
         let svc = fresh_service();