Keep the yaml

Author: lionello

src/pkg/cli/client/byoc/aws/byoc.go

@@ -124,7 +124,7 @@ func (b *ByocAws) Deploy(ctx context.Context, req *defangv1.DeployRequest) (*def
 		return nil, err
 	}
 
-	p, err := loader.LoadWithContext(ctx, compose.ConfigDetails{ConfigFiles: []compose.ConfigFile{{Config: req.Compose.AsMap()}}})
+	p, err := loader.LoadWithContext(ctx, compose.ConfigDetails{ConfigFiles: []compose.ConfigFile{{Content: req.Compose}}})
 	if err != nil {
 		return nil, err
 	}

src/pkg/cli/composeUp.go

@@ -9,8 +9,6 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/term"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 	"github.com/compose-spec/compose-go/v2/types"
-	"google.golang.org/protobuf/types/known/structpb"
-	"gopkg.in/yaml.v3"
 )
 
 type ComposeError struct {
@@ -56,25 +54,14 @@ func ComposeUp(ctx context.Context, c client.Client, force bool, mode defangv1.D
 		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
-	}
-
-	strpb, err := structpb.NewStruct(asMap)
-	if err != nil {
-		return nil, project, err
-	}
-
 	for _, service := range project.Services {
 		term.Info("Deploying service", service.Name)
 	}
 
 	resp, err := c.Deploy(ctx, &defangv1.DeployRequest{
 		Mode:    mode,
 		Project: project.Name,
-		Compose: strpb,
+		Compose: bytes,
 	})
 	if err != nil {
 		return nil, project, err

src/pkg/cli/composeUp_test.go

@@ -24,9 +24,8 @@ func (d deployMock) Deploy(ctx context.Context, req *defangv1.DeployRequest) (*d
 		return nil, errors.New("DeployRequest needs Compose or Services")
 	}
 
-	asMap := req.Compose.AsMap()
-	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
+	p, err := loader.LoadWithContext(ctx, types.ConfigDetails{ConfigFiles: []types.ConfigFile{{Content: req.Compose}}}, func(o *loader.Options) {
+		o.SetProjectName(req.Project, 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