Fix getUnreferencedManagedResources tests

Author: lionello

src/cmd/cli/command/compose.go

@@ -27,7 +27,7 @@ func isManagedService(service compose.ServiceConfig) bool {
 	return service.Extensions["x-defang-static-files"] != nil || service.Extensions["x-defang-redis"] != nil || service.Extensions["x-defang-postgres"] != nil
 }
 
-func GetUnreferencedManagedResources(serviceInfos compose.Services) []string {
+func getUnreferencedManagedResources(serviceInfos compose.Services) []string {
 	managedResources := make([]string, 0)
 	for _, service := range serviceInfos {
 		if isManagedService(service) {
@@ -65,7 +65,7 @@ func makeComposeUpCmd() *cobra.Command {
 
 			printPlaygroundPortalServiceURLs(deploy.Services)
 
-			var managedResources = GetUnreferencedManagedResources(project.Services)
+			var managedResources = getUnreferencedManagedResources(project.Services)
 			if len(managedResources) > 0 {
 				term.Warnf("Defang cannot monitor status of the following managed service(s): %v.\n   To check if the managed service is up, check the status of the service which depends on it.", managedResources)
 			}

src/cmd/cli/command/compose_test.go

@@ -3,75 +3,83 @@ package command
 import (
 	"testing"
 
-	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
+	"github.com/compose-spec/compose-go/v2/types"
 )
 
 func TestGetUnreferencedManagedResources(t *testing.T) {
 
 	t.Run("no services", func(t *testing.T) {
-		project := []*defangv1.ServiceInfo{}
-		managed := GetUnreferencedManagedResources(project)
+		project := types.Services{}
+
+		managed := getUnreferencedManagedResources(project)
 		if len(managed) != 0 {
 			t.Errorf("Expected 0 managed resources, got %d (%v)", len(managed), managed)
 		}
 	})
 
 	t.Run("one service all managed", func(t *testing.T) {
-		project := []*defangv1.ServiceInfo{}
-		project = append(project, &defangv1.ServiceInfo{
-			Service: &defangv1.ServiceID{Name: "service1", Postgres: &defangv1.Postgres{}}})
+		project := types.Services{
+			"service1": types.ServiceConfig{
+				Extensions: map[string]any{"x-defang-postgres": true},
+			},
+		}
 
-		managed := GetUnreferencedManagedResources(project)
+		managed := getUnreferencedManagedResources(project)
 		if len(managed) != 1 {
 			t.Errorf("Expected 1 managed resource, got %d (%v)", len(managed), managed)
 		}
 	})
 
 	t.Run("one service unmanaged", func(t *testing.T) {
-		project := []*defangv1.ServiceInfo{}
-		project = append(project, &defangv1.ServiceInfo{
-			Service: &defangv1.ServiceID{Name: "service1"}})
+		project := types.Services{
+			"service1": types.ServiceConfig{},
+		}
 
-		managed := GetUnreferencedManagedResources(project)
+		managed := getUnreferencedManagedResources(project)
 		if len(managed) != 0 {
 			t.Errorf("Expected 0 managed resource, got %d (%v)", len(managed), managed)
 		}
 	})
 
 	t.Run("one service unmanaged, one service managed", func(t *testing.T) {
-		project := []*defangv1.ServiceInfo{}
-		project = append(project, &defangv1.ServiceInfo{
-			Service: &defangv1.ServiceID{Name: "service1"}})
-		project = append(project, &defangv1.ServiceInfo{
-			Service: &defangv1.ServiceID{Name: "service2", Postgres: &defangv1.Postgres{}}})
+		project := types.Services{
+			"service1": types.ServiceConfig{},
+			"service2": types.ServiceConfig{
+				Extensions: map[string]any{"x-defang-postgres": true},
+			},
+		}
 
-		managed := GetUnreferencedManagedResources(project)
+		managed := getUnreferencedManagedResources(project)
 		if len(managed) != 1 {
 			t.Errorf("Expected 1 managed resource, got %d (%v)", len(managed), managed)
 		}
 	})
 
 	t.Run("two service two unmanaged", func(t *testing.T) {
-		project := []*defangv1.ServiceInfo{}
-		project = append(project, &defangv1.ServiceInfo{
-			Service: &defangv1.ServiceID{Name: "service1"}})
-		project = append(project, &defangv1.ServiceInfo{
-			Service: &defangv1.ServiceID{Name: "service2"}})
+		project := types.Services{
+			"service1": types.ServiceConfig{},
+			"service2": types.ServiceConfig{},
+		}
 
-		managed := GetUnreferencedManagedResources(project)
+		managed := getUnreferencedManagedResources(project)
 		if len(managed) != 0 {
 			t.Errorf("Expected 0 managed resource, got %d (%v)", len(managed), managed)
 		}
 	})
 
 	t.Run("one service two managed", func(t *testing.T) {
-		project := []*defangv1.ServiceInfo{}
-		project = append(project, &defangv1.ServiceInfo{
-			Service: &defangv1.ServiceID{Name: "service1", Postgres: &defangv1.Postgres{}, Redis: &defangv1.Redis{}}})
+		project := types.Services{
+			"service1": types.ServiceConfig{
+				Extensions: map[string]any{"x-defang-postgres": true},
+			},
+			"service2": types.ServiceConfig{
+				Extensions: map[string]any{"x-defang-redis": true},
+			},
+		}
 
-		managed := GetUnreferencedManagedResources(project)
-		if len(managed) != 1 {
-			t.Errorf("Expected 1 managed resource, got %d (%s)", len(managed), managed)
+		managed := getUnreferencedManagedResources(project)
+		if len(managed) != 2 {
+			t.Errorf("Expected 2 managed resource, got %d (%s)", len(managed), managed)
 		}
 	})
 }