From ffd5137ac7666d362781f55398753a3ad018abbf Mon Sep 17 00:00:00 2001
From: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Wed, 21 Dec 2022 09:23:44 +0100
Subject: [PATCH] check service names based on project, not running containers

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
---
 cmd/compose/ps.go  | 20 ++++++++++----------
 pkg/e2e/ps_test.go | 11 +++++++++++
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/cmd/compose/ps.go b/cmd/compose/ps.go
index 0cf9b91656..007cc2a9cf 100644
--- a/cmd/compose/ps.go
+++ b/cmd/compose/ps.go
@@ -96,6 +96,16 @@ func runPs(ctx context.Context, streams api.Streams, backend api.Service, servic
 	if err != nil {
 		return err
 	}
+
+	if project != nil && len(services) > 0 {
+		names := project.ServiceNames()
+		for _, service := range services {
+			if !utils.StringContains(names, service) {
+				return fmt.Errorf("no such service: %s", service)
+			}
+		}
+	}
+
 	containers, err := backend.Ps(ctx, name, api.PsOptions{
 		Project:  project,
 		All:      opts.All,
@@ -105,16 +115,6 @@ func runPs(ctx context.Context, streams api.Streams, backend api.Service, servic
 		return err
 	}
 
-SERVICES:
-	for _, s := range services {
-		for _, c := range containers {
-			if c.Service == s {
-				continue SERVICES
-			}
-		}
-		return fmt.Errorf("no such service: %s", s)
-	}
-
 	if len(opts.Status) != 0 {
 		containers = filterByStatus(containers, opts.Status)
 	}
diff --git a/pkg/e2e/ps_test.go b/pkg/e2e/ps_test.go
index b9439de933..51e6b24fd2 100644
--- a/pkg/e2e/ps_test.go
+++ b/pkg/e2e/ps_test.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gotest.tools/v3/icmd"
 
 	"github.com/docker/compose/v2/pkg/api"
 )
@@ -108,4 +109,14 @@ func TestPs(t *testing.T) {
 		assert.Equal(t, 4, len(lines))
 	})
 
+	t.Run("ps unknown", func(t *testing.T) {
+		res := c.RunDockerComposeCmd(t, "--project-name", projectName, "stop")
+		assert.NoError(t, res.Error)
+
+		res = c.RunDockerComposeCmd(t, "-f", "./fixtures/ps-test/compose.yaml", "--project-name", projectName, "ps", "nginx")
+		res.Assert(t, icmd.Success)
+
+		res = c.RunDockerComposeCmdNoCheck(t, "-f", "./fixtures/ps-test/compose.yaml", "--project-name", projectName, "ps", "unknown")
+		res.Assert(t, icmd.Expected{ExitCode: 1, Err: "no such service: unknown"})
+	})
 }