From 3e605d1d72a6ffbbbee58f652899fa314399234d Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Fri, 2 Apr 2021 16:41:26 -0700 Subject: [PATCH] cli: moved input dir to abs path - fixes #254 Signed-off-by: Sam Alba --- cmd/dagger/cmd/input/dir.go | 9 ++++++++- cmd/dagger/cmd/new.go | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cmd/dagger/cmd/input/dir.go b/cmd/dagger/cmd/input/dir.go index 0b0177cf..6e2c250b 100644 --- a/cmd/dagger/cmd/input/dir.go +++ b/cmd/dagger/cmd/input/dir.go @@ -1,6 +1,8 @@ package input import ( + "path/filepath" + "dagger.io/go/cmd/dagger/logger" "dagger.io/go/dagger" "github.com/spf13/cobra" @@ -22,7 +24,12 @@ var dirCmd = &cobra.Command{ lg := logger.New() ctx := lg.WithContext(cmd.Context()) - updateDeploymentInput(ctx, args[0], dagger.DirInput(args[1], []string{})) + path, err := filepath.Abs(args[1]) + if err != nil { + lg.Error().Err(err).Str("path", args[1]).Msg("cannot get absolute path") + } + + updateDeploymentInput(ctx, args[0], dagger.DirInput(path, []string{})) }, } diff --git a/cmd/dagger/cmd/new.go b/cmd/dagger/cmd/new.go index 764a933e..c20e9811 100644 --- a/cmd/dagger/cmd/new.go +++ b/cmd/dagger/cmd/new.go @@ -102,7 +102,12 @@ func getPlanSource(ctx context.Context) dagger.Input { if planDir != "" { checkFirstSet() - src = dagger.DirInput(planDir, []string{"*.cue", "cue.mod"}) + + path, err := filepath.Abs(planDir) + if err != nil { + lg.Error().Err(err).Str("path", planDir).Msg("cannot get absolute path") + } + src = dagger.DirInput(path, []string{"*.cue", "cue.mod"}) } if planGit != "" {