Merge pull request #473 from DefangLabs/edw-load-proj-name-from-remote

Load project name from remote when not in a compose folder

src/cmd/cli/command/commands.go

@@ -674,6 +674,13 @@ var configSetCmd = &cobra.Command{
 	Aliases:     []string{"set", "add", "put"},
 	Short:       "Adds or updates a sensitive config value",
 	RunE: func(cmd *cobra.Command, args []string) error {
+
+		// Make sure we have a project to set config for before asking for a value
+		_, err := client.LoadProjectName(cmd.Context())
+		if err != nil {
+			return err
+		}
+
 		parts := strings.SplitN(args[0], "=", 2)
 		name := parts[0]
 

src/pkg/cli/bootstrap.go

@@ -10,12 +10,12 @@ import (
 )
 
 func BootstrapCommand(ctx context.Context, client client.Client, command string) error {
-	project, err := client.LoadProject(ctx)
+	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return err
 	}
 
-	term.Debug("Running CD command", command, "in project", project.Name)
+	term.Debug("Running CD command", command, "in project", projectName)
 	if DoDryRun {
 		return ErrDryRun
 	}

src/pkg/cli/cert.go

@@ -27,12 +27,11 @@ var resolver dns.Resolver = dns.RootResolver{}
 var httpClient HTTPClient = http.DefaultClient
 
 func GenerateLetsEncryptCert(ctx context.Context, client cliClient.Client) error {
-	project, err := client.LoadProject(ctx)
+	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return err
 	}
-
-	term.Debug("Generating TLS cert for project", project.Name)
+	term.Debug("Generating TLS cert for project", projectName)
 
 	services, err := client.GetServices(ctx)
 	if err != nil {

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

@@ -46,10 +46,10 @@ var _ client.Client = (*ByocAws)(nil)
 
 func NewByoc(ctx context.Context, grpcClient client.GrpcClient, tenantId types.TenantID) *ByocAws {
 	b := &ByocAws{
-		ByocBaseClient: byoc.NewByocBaseClient(ctx, grpcClient, tenantId),
-		cdTasks:        make(map[string]ecs.TaskArn),
-		driver:         cfn.New(byoc.CdTaskPrefix, aws.Region("")), // default region
+		cdTasks: make(map[string]ecs.TaskArn),
+		driver:  cfn.New(byoc.CdTaskPrefix, aws.Region("")), // default region
 	}
+	b.ByocBaseClient = byoc.NewByocBaseClient(ctx, grpcClient, tenantId, b)
 	return b
 }
 

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

@@ -2,14 +2,20 @@ package byoc
 
 import (
 	"context"
+	"errors"
+	"fmt"
+	"os"
+	"slices"
 	"strings"
 	"sync"
 
 	"github.com/DefangLabs/defang/src/pkg"
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/quota"
+	"github.com/DefangLabs/defang/src/pkg/term"
 	"github.com/DefangLabs/defang/src/pkg/types"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
+	"github.com/compose-spec/compose-go/v2/consts"
 	compose "github.com/compose-spec/compose-go/v2/types"
 )
 
@@ -32,6 +38,10 @@ func DnsSafe(fqdn string) string {
 	return strings.ToLower(fqdn)
 }
 
+type BootstrapLister interface {
+	BootstrapList(context.Context) ([]string, error)
+}
+
 type ByocBaseClient struct {
 	client.GrpcClient
 
@@ -46,10 +56,11 @@ type ByocBaseClient struct {
 	ShouldDelegateSubdomain bool
 	TenantID                string
 
-	loadProjOnce func() (*compose.Project, error)
+	loadProjOnce    func() (*compose.Project, error)
+	bootstrapLister BootstrapLister
 }
 
-func NewByocBaseClient(ctx context.Context, grpcClient client.GrpcClient, tenantID types.TenantID) *ByocBaseClient {
+func NewByocBaseClient(ctx context.Context, grpcClient client.GrpcClient, tenantID types.TenantID, bl BootstrapLister) *ByocBaseClient {
 	b := &ByocBaseClient{
 		GrpcClient:    grpcClient,
 		TenantID:      string(tenantID),
@@ -64,6 +75,7 @@ func NewByocBaseClient(ctx context.Context, grpcClient client.GrpcClient, tenant
 			Services:   40,
 			ShmSizeMiB: 30720,
 		},
+		bootstrapLister: bl,
 	}
 	b.loadProjOnce = sync.OnceValues(func() (*compose.Project, error) {
 		proj, err := b.GrpcClient.Loader.LoadCompose(ctx)
@@ -86,6 +98,48 @@ func (b *ByocBaseClient) LoadProject(ctx context.Context) (*compose.Project, err
 	return b.loadProjOnce()
 }
 
+func (b *ByocBaseClient) LoadProjectName(ctx context.Context) (string, error) {
+
+	proj, err := b.Loader.LoadCompose(ctx)
+	if err == nil {
+		b.PulumiProject = proj.Name
+		return proj.Name, nil
+	}
+	if !errors.Is(err, types.ErrComposeFileNotFound) {
+		return "", err
+	}
+
+	// Get the list of projects from remote
+	projectNames, err := b.bootstrapLister.BootstrapList(ctx)
+	if err != nil {
+		return "", err
+	}
+	for i, name := range projectNames {
+		projectNames[i] = strings.Split(name, "/")[0] // Remove the stack name
+	}
+
+	if len(projectNames) == 0 {
+		return "", errors.New("no projects found")
+	}
+	if len(projectNames) == 1 {
+		term.Debug("Using default project: ", projectNames[0])
+		b.PulumiProject = projectNames[0]
+		return projectNames[0], nil
+	}
+
+	// When there are multiple projects, take a hint from COMPOSE_PROJECT_NAME environment variable if set
+	if projectName, ok := os.LookupEnv(consts.ComposeProjectName); ok {
+		if !slices.Contains(projectNames, projectName) {
+			return "", fmt.Errorf("project %q specified by COMPOSE_PROJECT_NAME not found", projectName)
+		}
+		term.Debug("Using project from COMPOSE_PROJECT_NAME environment variable:", projectNames[0])
+		b.PulumiProject = projectName
+		return projectName, nil
+	}
+
+	return "", errors.New("multiple projects found; please go to the correct project directory where the compose file is or set COMPOSE_PROJECT_NAME")
+}
+
 func (b *ByocBaseClient) ServiceDNS(name string) string {
 	return DnsSafeLabel(name) // TODO: consider merging this with getPrivateFqdn
 }

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

@@ -40,9 +40,9 @@ func NewByoc(ctx context.Context, grpcClient client.GrpcClient, tenantId types.T
 	}
 
 	b := &ByocDo{
-		ByocBaseClient: byoc.NewByocBaseClient(ctx, grpcClient, tenantId),
-		driver:         appPlatform.New(byoc.CdTaskPrefix, do.Region(regionString)),
+		driver: appPlatform.New(byoc.CdTaskPrefix, do.Region(regionString)),
 	}
+	b.ByocBaseClient = byoc.NewByocBaseClient(ctx, grpcClient, tenantId, b)
 
 	return b
 }
@@ -132,7 +132,7 @@ func (b *ByocDo) BootstrapCommand(ctx context.Context, command string) (string,
 }
 
 func (b *ByocDo) BootstrapList(ctx context.Context) ([]string, error) {
-	return nil, nil
+	return nil, client.ErrNotImplemented("not implemented for ByocDo")
 }
 
 func (b *ByocDo) CreateUploadURL(ctx context.Context, req *defangv1.UploadURLRequest) (*defangv1.UploadURLResponse, error) {

src/pkg/cli/client/client.go

@@ -57,6 +57,7 @@ type Client interface {
 	WhoAmI(context.Context) (*defangv1.WhoAmIResponse, error)
 
 	LoadProject(context.Context) (*compose.Project, error)
+	LoadProjectName(context.Context) (string, error)
 }
 
 type Property struct {

src/pkg/cli/client/mock.go

@@ -30,6 +30,10 @@ func (m MockClient) LoadProject(ctx context.Context) (*compose.Project, error) {
 	return m.Project, nil
 }
 
+func (m MockClient) LoadProjectName(ctx context.Context) (string, error) {
+	return m.Project.Name, nil
+}
+
 func (m MockClient) Tail(ctx context.Context, req *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error) {
 	if m.ServerStream != nil {
 		return m.ServerStream, nil

src/pkg/cli/client/playground.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/DefangLabs/defang/src/pkg/term"
 	"github.com/DefangLabs/defang/src/pkg/types"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 	"github.com/bufbuild/connect-go"
@@ -123,3 +124,22 @@ func (g *PlaygroundClient) Restart(ctx context.Context, names ...string) (types.
 func (g PlaygroundClient) ServiceDNS(name string) string {
 	return string(g.tenantID) + "-" + name
 }
+
+func (g PlaygroundClient) LoadProjectName(ctx context.Context) (string, error) {
+	proj, err := g.Loader.LoadCompose(ctx)
+	if err == nil {
+		return proj.Name, nil
+	}
+	if !errors.Is(err, types.ErrComposeFileNotFound) {
+		return "", err
+	}
+
+	// Hack: Use GetServices to get the current project name
+	// TODO: Use BootstrapList to get the list of projects after playground supports multiple projects
+	resp, err := g.GetServices(ctx)
+	if err != nil {
+		return "", err
+	}
+	term.Debug("Using default playground project: ", resp.Project)
+	return resp.Project, nil
+}

src/pkg/cli/composeDown.go

@@ -9,11 +9,11 @@ import (
 )
 
 func ComposeDown(ctx context.Context, client client.Client) (types.ETag, error) {
-	project, err := client.LoadProject(ctx)
+	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return "", err
 	}
-	term.Debug("Destroying project", project.Name)
+	term.Debug("Destroying project", projectName)
 
 	if DoDryRun {
 		return "", ErrDryRun

src/pkg/cli/configDelete.go

@@ -9,11 +9,11 @@ import (
 )
 
 func ConfigDelete(ctx context.Context, client client.Client, names ...string) error {
-	project, err := client.LoadProject(ctx)
+	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return err
 	}
-	term.Debug("Deleting config", names, "in project", project.Name)
+	term.Debug("Deleting config", names, "in project", projectName)
 
 	if DoDryRun {
 		return ErrDryRun

src/pkg/cli/configList.go

@@ -8,11 +8,11 @@ import (
 )
 
 func ConfigList(ctx context.Context, client client.Client) error {
-	project, err := client.LoadProject(ctx)
+	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return err
 	}
-	term.Debug("Listing config in project", project.Name)
+	term.Debug("Listing config in project", projectName)
 
 	config, err := client.ListConfig(ctx)
 	if err != nil {

src/pkg/cli/configSet.go

@@ -9,11 +9,11 @@ import (
 )
 
 func ConfigSet(ctx context.Context, client client.Client, name string, value string) error {
-	project, err := client.LoadProject(ctx)
+	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return err
 	}
-	term.Debug("Setting config", name, "in project", project.Name)
+	term.Debug("Setting config", name, "in project", projectName)
 
 	if DoDryRun {
 		return ErrDryRun

src/pkg/cli/getServices.go

@@ -9,11 +9,11 @@ import (
 )
 
 func GetServices(ctx context.Context, client client.Client, long bool) error {
-	project, err := client.LoadProject(ctx)
+	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return err
 	}
-	term.Debug("Listing services in project", project.Name)
+	term.Debug("Listing services in project", projectName)
 
 	serviceList, err := client.GetServices(ctx)
 	if err != nil {

src/pkg/cli/loader.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 
 	"github.com/DefangLabs/defang/src/pkg/term"
+	"github.com/DefangLabs/defang/src/pkg/types"
 	"github.com/compose-spec/compose-go/v2/cli"
 	compose "github.com/compose-spec/compose-go/v2/types"
 	"github.com/sirupsen/logrus"
@@ -157,7 +158,7 @@ func getComposeFilePath(userSpecifiedComposeFile string) (string, error) {
 		nextPath := filepath.Dir(path)
 		if nextPath == path {
 			// previous search was of root, we're done
-			err = fmt.Errorf("no Compose file found")
+			err = types.ErrComposeFileNotFound
 			break
 		}
 

src/pkg/cli/tail.go

@@ -136,11 +136,11 @@ func (cerr *CancelError) Unwrap() error {
 }
 
 func Tail(ctx context.Context, client client.Client, params TailOptions) error {
-	project, err := client.LoadProject(ctx) // TODO: Do we need to load the projects here if it is not used at all?
+	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return err
 	}
-	term.Debug("Tailing logs in project", project.Name)
+	term.Debug("Tailing logs in project", projectName)
 
 	if len(params.Services) > 0 {
 		for _, service := range params.Services {

src/pkg/types/error.go

@@ -0,0 +1,5 @@
+package types
+
+import "errors"
+
+var ErrComposeFileNotFound = errors.New("no compose file found")