Merge pull request #1519 from jlongtine/mod-get-europa

Remove dependence on project, use cue.mod path.

cmd/dagger/cmd/mod/get.go

@@ -3,10 +3,10 @@ package mod
 import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"go.dagger.io/dagger/cmd/dagger/cmd/common"
 	"go.dagger.io/dagger/cmd/dagger/logger"
 	"go.dagger.io/dagger/mod"
-	"go.dagger.io/dagger/telemetry"
+	"go.dagger.io/dagger/pkg"
+	"go.dagger.io/dagger/state"
 )
 
 var getCmd = &cobra.Command{
@@ -25,25 +25,28 @@ var getCmd = &cobra.Command{
 		lg := logger.New()
 		ctx := lg.WithContext(cmd.Context())
 
-		project := common.CurrentProject(ctx)
-		doneCh := common.TrackProjectCommand(ctx, cmd, project, nil, &telemetry.Property{
-			Name:  "packages",
-			Value: args,
-		})
+		var err error
+
+		cueModPath := pkg.GetCueModParent()
+		// err = pkg.CueModInit(ctx, cueModPath)
+		_, err = state.Init(ctx, cueModPath)
+		if err != nil && err != state.ErrAlreadyInit {
+			lg.Fatal().Err(err).Msg("failed to initialize cue.mod")
+		}
 
 		var update = viper.GetBool("update")
 
 		var processedRequires []*mod.Require
-		var err error
+
 		if update && len(args) == 0 {
 			lg.Info().Msg("updating all installed packages...")
-			processedRequires, err = mod.UpdateInstalled(ctx, project.Path)
+			processedRequires, err = mod.UpdateInstalled(ctx, cueModPath)
 		} else if update && len(args) > 0 {
 			lg.Info().Msg("updating specified packages...")
-			processedRequires, err = mod.UpdateAll(ctx, project.Path, args)
+			processedRequires, err = mod.UpdateAll(ctx, cueModPath, args)
 		} else if !update && len(args) > 0 {
 			lg.Info().Msg("installing specified packages...")
-			processedRequires, err = mod.InstallAll(ctx, project.Path, args)
+			processedRequires, err = mod.InstallAll(ctx, cueModPath, args)
 		} else {
 			lg.Fatal().Msg("unrecognized update/install operation")
 		}
@@ -58,7 +61,6 @@ var getCmd = &cobra.Command{
 			lg.Error().Err(err).Msg("error installing/updating packages")
 		}
 
-		<-doneCh
 	},
 }
 

mod/repo.go

@@ -84,7 +84,8 @@ func (r *repo) checkout(ctx context.Context, version string) error {
 	}
 
 	err = w.Checkout(&git.CheckoutOptions{
-		Hash: *h,
+		Hash:  *h,
+		Force: true,
 	})
 	if err != nil {
 		return err

pkg/pkg.go

@@ -39,7 +39,7 @@ var (
 
 func Vendor(ctx context.Context, p string) error {
 	if p == "" {
-		p = getCueModParent()
+		p = GetCueModParent()
 	}
 
 	cuePkgDir := path.Join(p, "cue.mod", "pkg")
@@ -141,8 +141,8 @@ func extractModules(dest string) error {
 	})
 }
 
-// getCueModParent traverses the directory tree up through ancestors looking for a cue.mod folder
-func getCueModParent() string {
+// GetCueModParent traverses the directory tree up through ancestors looking for a cue.mod folder
+func GetCueModParent() string {
 	cwd, _ := os.Getwd()
 	parentDir := cwd