From 2bc2f8630b85d903d452b7c02efc99ee933b2243 Mon Sep 17 00:00:00 2001
From: cellarspoon <cellarspoon@riseup.net>
Date: Mon, 6 Dec 2021 01:26:04 +0100
Subject: [PATCH] fix: match exact on filtering

---
 cli/app/logs.go             | 2 +-
 cli/app/restart.go          | 2 +-
 cli/app/run.go              | 2 +-
 cli/internal/copy.go        | 2 +-
 pkg/upstream/stack/stack.go | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/app/logs.go b/cli/app/logs.go
index ae32475b..2ba268f1 100644
--- a/cli/app/logs.go
+++ b/cli/app/logs.go
@@ -75,7 +75,7 @@ var appLogsCommand = &cli.Command{
 		}
 		logrus.Debugf("tailing logs for '%s'", serviceName)
 
-		service := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
+		service := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
 		filters := filters.NewArgs()
 		filters.Add("name", service)
 		serviceOpts := types.ServiceListOptions{Filters: filters}
diff --git a/cli/app/restart.go b/cli/app/restart.go
index 198c67e9..f5ed02b6 100644
--- a/cli/app/restart.go
+++ b/cli/app/restart.go
@@ -34,7 +34,7 @@ var appRestartCommand = &cli.Command{
 			logrus.Fatal(err)
 		}
 
-		serviceFilter := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
+		serviceFilter := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
 		filters := filters.NewArgs()
 		filters.Add("name", serviceFilter)
 		containerOpts := types.ContainerListOptions{Filters: filters}
diff --git a/cli/app/run.go b/cli/app/run.go
index 0003ce55..3477cc28 100644
--- a/cli/app/run.go
+++ b/cli/app/run.go
@@ -55,7 +55,7 @@ var appRunCommand = &cli.Command{
 		}
 
 		serviceName := c.Args().Get(1)
-		stackAndServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
+		stackAndServiceName := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
 		filters := filters.NewArgs()
 		filters.Add("name", stackAndServiceName)
 
diff --git a/cli/internal/copy.go b/cli/internal/copy.go
index c89656ac..38d7f83f 100644
--- a/cli/internal/copy.go
+++ b/cli/internal/copy.go
@@ -31,7 +31,7 @@ func ConfigureAndCp(c *cli.Context, app config.App, srcPath string, dstPath stri
 	}
 
 	filters := filters.NewArgs()
-	filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
+	filters.Add("name", fmt.Sprintf("^%s_%s", appEnv.StackName(), service))
 	containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
 	if err != nil {
 		logrus.Fatal(err)
diff --git a/pkg/upstream/stack/stack.go b/pkg/upstream/stack/stack.go
index e654d4e9..5366f98b 100644
--- a/pkg/upstream/stack/stack.go
+++ b/pkg/upstream/stack/stack.go
@@ -100,7 +100,7 @@ func GetAllDeployedServices(contextName string) StackStatus {
 // GetDeployedServicesByName filters services by name
 func GetDeployedServicesByName(ctx context.Context, cl *dockerclient.Client, stackName, serviceName string) StackStatus {
 	filters := filters.NewArgs()
-	filters.Add("name", fmt.Sprintf("%s_%s", stackName, serviceName))
+	filters.Add("name", fmt.Sprintf("^%s_%s", stackName, serviceName))
 
 	services, err := cl.ServiceList(ctx, types.ServiceListOptions{Filters: filters})
 	if err != nil {