Revert "Revert "Copy LoadFromContent from MVP (#838)" (#841)" (#842)

This reverts commit 887dfa7.

Author: lionello

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

@@ -157,7 +157,7 @@ func (b *ByocAws) Preview(ctx context.Context, req *defangv1.DeployRequest) (*de
 
 func (b *ByocAws) deploy(ctx context.Context, req *defangv1.DeployRequest, cmd string) (*defangv1.DeployResponse, error) {
 	// If multiple Compose files were provided, req.Compose is the merged representation of all the files
-	project, err := compose.LoadFromContent(ctx, req.Compose)
+	project, err := compose.LoadFromContent(ctx, req.Compose, "")
 	if err != nil {
 		return nil, err
 	}

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

@@ -158,7 +158,7 @@ func (b *ByocDo) Deploy(ctx context.Context, req *defangv1.DeployRequest) (*defa
 
 func (b *ByocDo) deploy(ctx context.Context, req *defangv1.DeployRequest, cmd string) (*defangv1.DeployResponse, error) {
 	// If multiple Compose files were provided, req.Compose is the merged representation of all the files
-	project, err := compose.LoadFromContent(ctx, req.Compose)
+	project, err := compose.LoadFromContent(ctx, req.Compose, "")
 	if err != nil {
 		return nil, err
 	}

src/pkg/cli/compose/load_content.go

@@ -7,8 +7,9 @@ import (
 	composeTypes "github.com/compose-spec/compose-go/v2/types"
 )
 
-func LoadFromContent(ctx context.Context, content []byte) (*Project, error) {
+func LoadFromContent(ctx context.Context, content []byte, nameFallback string) (*Project, error) {
 	return loader.LoadWithContext(ctx, composeTypes.ConfigDetails{ConfigFiles: []composeTypes.ConfigFile{{Content: content}}}, func(o *loader.Options) {
+		o.SetProjectName(nameFallback, false)
 		o.SkipConsistencyCheck = true // this matches the WithConsistency(false) option from the loader
 		o.SkipInterpolation = true
 		o.SkipResolveEnvironment = true

src/pkg/cli/compose/load_content_test.go

@@ -16,7 +16,7 @@ func TestRoundTrip(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		rt, err := LoadFromContent(context.Background(), content)
+		rt, err := LoadFromContent(context.Background(), content, "should-not-be-used")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -25,3 +25,89 @@ func TestRoundTrip(t *testing.T) {
 		}
 	})
 }
+
+func TestLoadFromContent(t *testing.T) {
+	tdt := []struct {
+		desc        string
+		compose     string
+		fallback    string
+		wantProject string
+	}{
+		{
+			desc:        "compose with project name",
+			compose:     "name: project1\nservices:\n  service1:\n    image: nginx",
+			fallback:    "",
+			wantProject: "project1",
+		},
+		{
+			desc:        "compose without project name",
+			compose:     "services:\n  service1:\n    image: nginx",
+			fallback:    "project2",
+			wantProject: "project2",
+		},
+		{
+			desc:        "compose with project name and ignored fallback",
+			compose:     "name: project3\nservices:\n  service1:\n    image: nginx",
+			fallback:    "project4",
+			wantProject: "project3",
+		},
+		{
+			desc:        "compose with unknown network",
+			compose:     "name: project4\nservices:\n  service1:\n    image: nginx\n    networks:\n      - unknown",
+			wantProject: "project4",
+		},
+		{
+			desc:        "compose with cpus",
+			compose:     "name: project5\nservices:\n  service1:\n    image: nginx\n    deploy:\n      resources:\n        reservations:\n          cpus: 2",
+			wantProject: "project5",
+		},
+		{
+			desc:        "compose with config",
+			compose:     "name: project6\nservices:\n  service1:\n    image: nginx\n    environment:\n      - CONFIG",
+			wantProject: "project6",
+		},
+		{
+			desc:        "compose with interpolation",
+			compose:     "name: project7\nservices:\n  service1:\n    image: nginx\n    environment:\n      - ENVVAR=${ENVVAR}",
+			wantProject: "project7",
+		},
+		{
+			desc:        "should not load env_file",
+			compose:     "name: project9\nservices:\n  service1:\n    image: nginx\n    env_file:\n      - asdf",
+			wantProject: "project9",
+		},
+	}
+
+	t.Setenv("ENVVAR", "value")
+
+	for _, tt := range tdt {
+		t.Run(tt.desc, func(t *testing.T) {
+			project, err := LoadFromContent(context.Background(), []byte(tt.compose), tt.fallback)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if project.Name != tt.wantProject {
+				t.Errorf("Expected project name to be project1, got %s", project.Name)
+			}
+			if len(project.Services) != 1 {
+				t.Errorf("Expected 1 service, got %d", len(project.Services))
+			}
+			if _, ok := project.Services["service1"]; !ok {
+				t.Errorf("Expected service1 to be present, got %v", project.Services)
+			}
+			if project.Services["service1"].Image != "nginx" {
+				t.Errorf("Expected service1 image to be nginx, got %s", project.Services["service1"].Image)
+			}
+			if config, ok := project.Services["service1"].Environment["CONFIG"]; ok {
+				if config != nil {
+					t.Errorf("Expected CONFIG to be nil, got %q", *config)
+				}
+			}
+			if envvar, ok := project.Services["service1"].Environment["ENVVAR"]; ok {
+				if *envvar != "${ENVVAR}" {
+					t.Errorf("Expected ENVVAR to be ${ENVVAR}, got %q", *envvar)
+				}
+			}
+		})
+	}
+}