make subscribe channel send map rather than a reference.

DefangLabs · Jun 19, 2024 · 795605e · 795605e
1 parent 9511b3d
commit 795605e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/cmd/cli/command/servicemonitor.go b/src/cmd/cli/command/servicemonitor.go
@@ -24,7 +24,7 @@ func waitServiceStatus(ctx context.Context, targetStatus cli.ServiceStatus, serv
 
 	// monitor for when all services are completed to end this command
 	for serviceStatus := range serviceStatusChan {
-		if allInStatus(targetStatus, *serviceStatus) {
+		if allInStatus(targetStatus, serviceStatus) {
 			for _, sInfo := range serviceInfos {
 				sInfo.Status = string(targetStatus)
 			}

diff --git a/src/pkg/cli/subscribe.go b/src/pkg/cli/subscribe.go
@@ -9,7 +9,7 @@ import (
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
 
-func Subscribe(ctx context.Context, client client.Client, services []string) (<-chan *map[string]string, error) {
+func Subscribe(ctx context.Context, client client.Client, services []string) (<-chan map[string]string, error) {
 	if len(services) == 0 {
 		return nil, fmt.Errorf("no services specified")
 	}
@@ -23,7 +23,7 @@ func Subscribe(ctx context.Context, client client.Client, services []string) (<-
 		serviceStatus[service] = string(ServiceUnknown)
 	}
 
-	statusChan := make(chan *map[string]string, len(services))
+	statusChan := make(chan map[string]string, len(services))
 	if DoDryRun {
 		defer close(statusChan)
 		return statusChan, ErrDryRun
@@ -72,7 +72,7 @@ func Subscribe(ctx context.Context, client client.Client, services []string) (<-
 			//make a copy to be put into channel
 			serviceStatusCopy := cloneServiceStatus(serviceStatus)
 
-			statusChan <- &serviceStatusCopy
+			statusChan <- serviceStatusCopy
 			term.Debugf("service %s with status %s\n", serviceName, servInfo.Status)
 		}
 	}()