Merge pull request #512 from Chrisyhjiang/483

Nonexistent project error fix

src/cmd/cli/command/commands.go

@@ -99,7 +99,6 @@ func Execute(ctx context.Context) error {
 		if code == connect.CodeFailedPrecondition && (strings.Contains(err.Error(), "EULA") || strings.Contains(err.Error(), "terms")) {
 			printDefangHint("Please use the following command to see the Defang terms of service:", "terms")
 		}
-
 		return ExitCode(code)
 	}
 
@@ -438,7 +437,7 @@ var generateCmd = &cobra.Command{
 			}
 			return cli.InitFromSamples(cmd.Context(), "", []string{sample})
 		}
-
+		sampleList, fetchSamplesErr := cli.FetchSamples(cmd.Context())
 		if sample == "" {
 			if err := survey.AskOne(&survey.Select{
 				Message: "Choose the language you'd like to use:",
@@ -448,17 +447,16 @@ var generateCmd = &cobra.Command{
 			}, &language); err != nil {
 				return err
 			}
-
 			// Fetch the list of samples from the Defang repository
-			if samples, err := cli.FetchSamples(cmd.Context()); err != nil {
-				term.Debug("unable to fetch samples:", err)
-			} else if len(samples) > 0 {
+			if fetchSamplesErr != nil {
+				term.Debug("unable to fetch samples:", fetchSamplesErr)
+			} else if len(sampleList) > 0 {
 				const generateWithAI = "Generate with AI"
 
 				lang := strings.ToLower(language)
 				sampleNames := []string{generateWithAI}
 				sampleDescriptions := []string{"Generate a sample from scratch using a language prompt"}
-				for _, sample := range samples {
+				for _, sample := range sampleList {
 					if slices.Contains(sample.Languages, lang) {
 						sampleNames = append(sampleNames, sample.Name)
 						sampleDescriptions = append(sampleDescriptions, sample.ShortDescription)
@@ -510,6 +508,13 @@ Generate will write files in the current folder. You can edit them and then depl
 
 		if sample != "" {
 			qs = qs[1:] // user picked a sample, so we skip the description question
+			sampleExists := slices.ContainsFunc(sampleList, func(s cli.Sample) bool {
+				return s.Name == sample
+			})
+
+			if !sampleExists {
+				return cli.ErrSampleNotFound
+			}
 		}
 
 		prompt := struct {

src/pkg/cli/new.go

@@ -5,6 +5,7 @@ import (
 	"compress/gzip"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -15,6 +16,8 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/term"
 )
 
+var ErrSampleNotFound = errors.New("sample not found")
+
 type Sample struct {
 	Name             string   `json:"name"`
 	Title            string   `json:"title"`
@@ -63,6 +66,9 @@ func InitFromSamples(ctx context.Context, dir string, names []string) error {
 	defer tarball.Close()
 	tarReader := tar.NewReader(tarball)
 	term.Info("Writing files to disk...")
+
+	sampleFound := false
+
 	for {
 		h, err := tarReader.Next()
 		if err != nil {
@@ -83,6 +89,7 @@ func InitFromSamples(ctx context.Context, dir string, names []string) error {
 			}
 			prefix := fmt.Sprintf("%s-%s/samples/%s/", repo, branch, name)
 			if base, ok := strings.CutPrefix(h.Name, prefix); ok && len(base) > 0 {
+				sampleFound = true
 				fmt.Println("   -", base)
 				path := filepath.Join(dir, subdir, base)
 				if h.FileInfo().IsDir() {
@@ -97,6 +104,9 @@ func InitFromSamples(ctx context.Context, dir string, names []string) error {
 			}
 		}
 	}
+	if !sampleFound {
+		return ErrSampleNotFound
+	}
 	return nil
 }
 

src/pkg/cli/new_test.go

@@ -0,0 +1,17 @@
+package cli
+
+import (
+	"context"
+	"errors"
+	"testing"
+)
+
+func TestInitFromSamples(t *testing.T) {
+	err := InitFromSamples(context.Background(), t.TempDir(), []string{"nonexisting"})
+	if err == nil {
+		t.Fatal("Expected test to fail")
+	}
+	if !errors.Is(err, ErrSampleNotFound) {
+		t.Errorf("Expected error to be %v, got %v", ErrSampleNotFound, err)
+	}
+}