wip

Author: lionello

src/pkg/cli/compose/convert.go

@@ -10,167 +10,6 @@ import (
 	compose "github.com/compose-spec/compose-go/v2/types"
 )
 
-// Deprecated: keep compose as-is
-func ConvertServices(serviceConfigs compose.Services) []*defangv1.Service {
-	//
-	// Publish updates
-	//
-	var services []*defangv1.Service
-	for _, svccfg := range serviceConfigs {
-		var healthcheck *defangv1.HealthCheck
-		if svccfg.HealthCheck != nil && len(svccfg.HealthCheck.Test) > 0 && !svccfg.HealthCheck.Disable {
-			healthcheck = &defangv1.HealthCheck{
-				Test: svccfg.HealthCheck.Test,
-			}
-			if nil != svccfg.HealthCheck.Interval {
-				healthcheck.Interval = uint32(*svccfg.HealthCheck.Interval / 1e9)
-			}
-			if nil != svccfg.HealthCheck.Timeout {
-				healthcheck.Timeout = uint32(*svccfg.HealthCheck.Timeout / 1e9)
-			}
-			if nil != svccfg.HealthCheck.Retries {
-				healthcheck.Retries = uint32(*svccfg.HealthCheck.Retries)
-			}
-		}
-
-		var deploy *defangv1.Deploy
-		if svccfg.Deploy != nil {
-			deploy = &defangv1.Deploy{}
-			if svccfg.Deploy.Replicas != nil {
-				deploy.Replicas = uint32(*svccfg.Deploy.Replicas)
-			}
-
-			reservations := getResourceReservations(svccfg.Deploy.Resources)
-			if reservations != nil {
-				var devices []*defangv1.Device
-				for _, d := range reservations.Devices {
-					devices = append(devices, &defangv1.Device{
-						Capabilities: d.Capabilities,
-						Count:        uint32(d.Count),
-						Driver:       d.Driver,
-					})
-				}
-				deploy.Resources = &defangv1.Resources{
-					Reservations: &defangv1.Resource{
-						Cpus:    float32(reservations.NanoCPUs),
-						Memory:  float32(reservations.MemoryBytes) / MiB,
-						Devices: devices,
-					},
-				}
-			}
-		}
-
-		var build *defangv1.Build
-		if svccfg.Build != nil {
-			build = &defangv1.Build{
-				Context:    svccfg.Build.Context,
-				Dockerfile: svccfg.Build.Dockerfile,
-				ShmSize:    float32(svccfg.Build.ShmSize) / MiB,
-				Target:     svccfg.Build.Target,
-			}
-
-			if len(svccfg.Build.Args) > 0 {
-				build.Args = make(map[string]string, len(svccfg.Build.Args))
-				for key, value := range svccfg.Build.Args {
-					if key == "" || value == nil {
-						term.Warnf("service %q: skipping unset build argument %q", svccfg.Name, key)
-						continue
-					}
-					build.Args[key] = *value
-				}
-			}
-		}
-
-		// Extract environment variables
-		var configs []*defangv1.Secret
-		envs := make(map[string]string, len(svccfg.Environment))
-		for key, value := range svccfg.Environment {
-			if value == nil {
-				// Add unset environment variables as "secrets"
-				configs = append(configs, &defangv1.Secret{
-					Source: key,
-				})
-			} else {
-				envs[key] = *value
-			}
-		}
-
-		// Extract secret references; secrets are supposed to be files, not env, but it's kept for backward compatibility
-		for i, secret := range svccfg.Secrets {
-			if i == 0 { // only warn once
-				term.Warnf("service %q: secrets will be exposed as environment variables, not files (use 'environment' instead)", svccfg.Name)
-			}
-			configs = append(configs, &defangv1.Secret{
-				Source: secret.Source,
-			})
-		}
-
-		init := false
-		if svccfg.Init != nil {
-			init = *svccfg.Init
-		}
-
-		var dnsRole string
-		if dnsRoleVal := svccfg.Extensions["x-defang-dns-role"]; dnsRoleVal != nil {
-			dnsRole = dnsRoleVal.(string) // already validated
-		}
-
-		var staticFiles *defangv1.StaticFiles
-		if staticFilesVal := svccfg.Extensions["x-defang-static-files"]; staticFilesVal != nil {
-			if str, ok := staticFilesVal.(string); ok {
-				staticFiles = &defangv1.StaticFiles{Folder: str}
-			} else {
-				obj := staticFilesVal.(map[string]interface{}) // already validated
-				var redirects []string
-				if r, ok := obj["redirects"].([]interface{}); ok {
-					redirects = make([]string, len(r))
-					for i, v := range r {
-						redirects[i] = v.(string)
-					}
-				}
-				staticFiles = &defangv1.StaticFiles{
-					Folder:    obj["folder"].(string),
-					Redirects: redirects,
-				}
-			}
-		}
-
-		var redis *defangv1.Redis
-		if _, ok := svccfg.Extensions["x-defang-redis"]; ok {
-			redis = &defangv1.Redis{}
-		}
-
-		var postgres *defangv1.Postgres
-		if _, ok := svccfg.Extensions["x-defang-postgres"]; ok {
-			postgres = &defangv1.Postgres{}
-		}
-
-		network := network(&svccfg)
-		ports := convertPorts(svccfg.Ports)
-		services = append(services, &defangv1.Service{
-			Name:        svccfg.Name,
-			Image:       svccfg.Image,
-			Build:       build,
-			Internal:    network == defangv1.Network_PRIVATE,
-			Networks:    network,
-			Init:        init,
-			Ports:       ports,
-			Healthcheck: healthcheck,
-			Deploy:      deploy,
-			Environment: envs,
-			Secrets:     configs,
-			Command:     svccfg.Command,
-			Domainname:  svccfg.DomainName,
-			Platform:    convertPlatform(svccfg.Platform),
-			DnsRole:     dnsRole,
-			StaticFiles: staticFiles,
-			Redis:       redis,
-			Postgres:    postgres,
-		})
-	}
-	return services
-}
-
 func getResourceReservations(r compose.Resources) *compose.Resource {
 	if r.Reservations == nil {
 		// TODO: we might not want to default to all the limits, maybe only memory?

src/pkg/cli/compose/convert_test.go

@@ -3,11 +3,9 @@ package compose
 import (
 	"context"
 	"encoding/json"
-	"slices"
 	"strings"
 	"testing"
 
-	"github.com/DefangLabs/defang/src/pkg/cli/client"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 	"github.com/compose-spec/compose-go/v2/loader"
 	"github.com/compose-spec/compose-go/v2/types"
@@ -176,30 +174,3 @@ func TestComposeBlob(t *testing.T) {
 		t.Errorf("expected empty blob, got %v", blob)
 	}
 }
-
-func TestConvert(t *testing.T) {
-	testRunCompose(t, func(t *testing.T, path string) {
-		loader := Loader{path}
-		proj, err := loader.LoadCompose(context.Background())
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := FixupServices(context.Background(), client.MockClient{}, proj.Services, BuildContextIgnore); err != nil {
-			t.Fatal(err)
-		}
-
-		services := ConvertServices(proj.Services)
-		// The order of the services is not guaranteed, so we sort the services before comparing
-		slices.SortFunc(services, func(i, j *defangv1.Service) int { return strings.Compare(i.Name, j.Name) })
-
-		// Convert the protobuf services to pretty JSON for comparison (YAML would include all the zero values)
-		actual, err := json.MarshalIndent(services, "", "  ")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if err := compare(actual, path+".convert"); err != nil {
-			t.Error(err)
-		}
-	})
-}

src/pkg/cli/composeUp.go

@@ -46,22 +46,12 @@ func ComposeUp(ctx context.Context, c client.Client, force bool) (*defangv1.Depl
 		return nil, project, err
 	}
 
-	services := compose.ConvertServices(project.Services)
-	if len(services) == 0 {
-		return nil, project, &ComposeError{fmt.Errorf("no services found")}
-	}
-
 	if DoDryRun {
-		for _, service := range services {
-			PrintObject(service.Name, service)
-		}
+		yaml, _ := project.MarshalYAML()
+		fmt.Println(string(yaml))
 		return nil, project, ErrDryRun
 	}
 
-	for _, service := range services {
-		term.Info("Deploying service", service.Name)
-	}
-
 	bytes, err := project.MarshalYAML()
 	if err != nil {
 		return nil, project, err
@@ -77,10 +67,13 @@ func ComposeUp(ctx context.Context, c client.Client, force bool) (*defangv1.Depl
 		return nil, project, err
 	}
 
+	for _, service := range project.Services {
+		term.Info("Deploying service", service.Name)
+	}
+
 	resp, err := c.Deploy(ctx, &defangv1.DeployRequest{
-		Project:  project.Name,
-		Services: services,
-		Compose:  str,
+		Project: project.Name,
+		Compose: str,
 	})
 	if err != nil {
 		return nil, project, err