deprecate old compose proto messages

Author: lionello

src/pkg/cli/cert_test.go

@@ -14,12 +14,7 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/term"
 )
 
-type dnsRequest struct {
-	Type   string
-	Domain string
-}
-
-var notFound = errors.New("not found")
+var errNotFound = errors.New("not found")
 
 func TestGetCNAMEInSync(t *testing.T) {
 	t.Cleanup(func() {
@@ -28,7 +23,7 @@ func TestGetCNAMEInSync(t *testing.T) {
 
 	notFoundResolver := dns.MockResolver{Records: map[dns.DNSRequest]dns.DNSResponse{
 		{Type: "NS", Domain: "web.test.com"}:    {Records: []string{"ns1.example.com", "ns2.example.com"}, Error: nil},
-		{Type: "CNAME", Domain: "web.test.com"}: {Records: nil, Error: notFound},
+		{Type: "CNAME", Domain: "web.test.com"}: {Records: nil, Error: errNotFound},
 	}}
 	foundResolver := dns.MockResolver{Records: map[dns.DNSRequest]dns.DNSResponse{
 		{Type: "NS", Domain: "web.test.com"}:    {Records: []string{"ns1.example.com", "ns2.example.com"}, Error: nil},
@@ -39,7 +34,7 @@ func TestGetCNAMEInSync(t *testing.T) {
 	t.Run("domain not found", func(t *testing.T) {
 		dns.ResolverAt = func(_ string) dns.Resolver { return notFoundResolver }
 		_, err := getCNAMEInSync(context.Background(), "web.test.com")
-		if err != notFound {
+		if err != errNotFound {
 			t.Errorf("Expected NotFound error, got %v", err)
 		}
 	})
@@ -80,7 +75,7 @@ func TestGetIPInSync(t *testing.T) {
 
 	notFoundResolver := dns.MockResolver{Records: map[dns.DNSRequest]dns.DNSResponse{
 		{Type: "NS", Domain: "test.com"}: {Records: []string{"ns1.example.com", "ns2.example.com"}, Error: nil},
-		{Type: "A", Domain: "test.com"}:  {Records: nil, Error: notFound},
+		{Type: "A", Domain: "test.com"}:  {Records: nil, Error: errNotFound},
 	}}
 	partialFoundResolver := dns.MockResolver{Records: map[dns.DNSRequest]dns.DNSResponse{
 		{Type: "NS", Domain: "test.com"}: {Records: []string{"ns1.example.com", "ns2.example.com"}, Error: nil},
@@ -95,7 +90,7 @@ func TestGetIPInSync(t *testing.T) {
 	t.Run("domain not found", func(t *testing.T) {
 		dns.ResolverAt = func(_ string) dns.Resolver { return notFoundResolver }
 		_, err := getIPInSync(context.Background(), "test.com")
-		if err != notFound {
+		if err != errNotFound {
 			t.Errorf("Expected NotFound error, got %v", err)
 		}
 	})

src/pkg/cli/composeUp.go

@@ -46,23 +46,23 @@ func ComposeUp(ctx context.Context, c client.Client, force bool) (*defangv1.Depl
 		return nil, project, err
 	}
 
-	if DoDryRun {
-		yaml, _ := project.MarshalYAML()
-		fmt.Println(string(yaml))
-		return nil, project, ErrDryRun
-	}
-
 	bytes, err := project.MarshalYAML()
 	if err != nil {
 		return nil, project, err
 	}
 
+	if DoDryRun {
+		fmt.Println(string(bytes))
+		return nil, project, ErrDryRun
+	}
+
+	// Unmarshal the project into a map so we can convert it to a structpb.Struct
 	var asMap map[string]any
 	if err := yaml.Unmarshal(bytes, &asMap); err != nil {
 		return nil, project, err
 	}
 
-	str, err := structpb.NewStruct(asMap)
+	strpb, err := structpb.NewStruct(asMap)
 	if err != nil {
 		return nil, project, err
 	}
@@ -73,7 +73,7 @@ func ComposeUp(ctx context.Context, c client.Client, force bool) (*defangv1.Depl
 
 	resp, err := c.Deploy(ctx, &defangv1.DeployRequest{
 		Project: project.Name,
-		Compose: str,
+		Compose: strpb,
 	})
 	if err != nil {
 		return nil, project, err

src/pkg/cli/composeUp_test.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"net/http"
 	"net/http/httptest"
+	"sync/atomic"
 	"testing"
 
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
@@ -24,14 +25,23 @@ func (d deployMock) Deploy(ctx context.Context, req *defangv1.DeployRequest) (*d
 	}
 
 	asMap := req.Compose.AsMap()
-	_, err := loader.LoadWithContext(ctx, types.ConfigDetails{ConfigFiles: []types.ConfigFile{{Config: asMap}}}, func(o *loader.Options) {
+	p, err := loader.LoadWithContext(ctx, types.ConfigDetails{ConfigFiles: []types.ConfigFile{{Config: asMap}}}, func(o *loader.Options) {
 		o.SetProjectName(asMap["name"].(string), true) // HACK: workaround for bug in compose-go where it insists on loading the project name from the file
 	})
 	if err != nil {
 		return nil, err
 	}
 
-	return &defangv1.DeployResponse{}, nil
+	var services []*defangv1.ServiceInfo
+	for _, service := range p.Services {
+		services = append(services, &defangv1.ServiceInfo{
+			Service: &defangv1.ServiceID{
+				Name: service.Name,
+			},
+		})
+	}
+
+	return &defangv1.DeployResponse{Services: services}, nil
 }
 
 func TestComposeUp(t *testing.T) {
@@ -41,24 +51,32 @@ func TestComposeUp(t *testing.T) {
 		t.Fatalf("LoadProject() failed: %v", err)
 	}
 
-	gotContext := false
+	gotContext := atomic.Bool{}
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != http.MethodPut {
 			t.Errorf("ComposeStart() failed: expected PUT request, got %s", r.Method)
 		}
-		gotContext = true
+		gotContext.Store(true)
 		w.WriteHeader(http.StatusOK)
 	}))
 	defer server.Close()
 
-	_, project, err := ComposeUp(context.Background(), deployMock{MockClient: client.MockClient{UploadUrl: server.URL + "/", Project: proj}}, false)
+	d, project, err := ComposeUp(context.Background(), deployMock{MockClient: client.MockClient{UploadUrl: server.URL + "/", Project: proj}}, false)
 	if err != nil {
 		t.Fatalf("ComposeUp() failed: %v", err)
 	}
 	if project == nil {
 		t.Fatalf("ComposeUp() failed: project is nil")
 	}
-	if !gotContext {
+	if !gotContext.Load() {
 		t.Errorf("ComposeStart() failed: did not get context")
 	}
+	if len(d.Services) != len(proj.Services) {
+		t.Errorf("ComposeUp() failed: expected %d services, got %d", len(proj.Services), len(d.Services))
+	}
+	for _, service := range d.Services {
+		if _, ok := proj.Services[service.Service.Name]; !ok {
+			t.Errorf("ComposeUp() failed: service %s not found", service.Service.Name)
+		}
+	}
 }