kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

plan: default cue module to .

Browse Source 
Fixes #699

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi
2021-07-01 19:00:58 +02:00
parent 696b8a4d4c
commit 919d5576d0
4 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cmd/dagger/cmd/new.go
View File

@@ -37,26 +37,27 @@ var newCmd = &cobra.Command{
name := args[0]
module := viper.GetString("module")
if module != "" {
p, err := filepath.Abs(module)
if err != nil {
lg.Fatal().Err(err).Str("path", module).Msg("unable to resolve path")
}
if !strings.HasPrefix(p, workspace.Path) {
lg.Fatal().Err(err).Str("path", module).Msg("module is outside the workspace")
}
p, err = filepath.Rel(workspace.Path, p)
if err != nil {
lg.Fatal().Err(err).Str("path", module).Msg("unable to resolve path")
}
if !strings.HasPrefix(p, ".") {
p = "./" + p
}
module = p
if module == "" {
lg.Fatal().Msg("missing --module")
}
p, err := filepath.Abs(module)
if err != nil {
lg.Fatal().Err(err).Str("path", module).Msg("unable to resolve path")
}
ws, err := workspace.Create(ctx, name, state.CreateOpts{
if !strings.HasPrefix(p, workspace.Path) {
lg.Fatal().Err(err).Str("path", module).Msg("module is outside the workspace")
}
p, err = filepath.Rel(workspace.Path, p)
if err != nil {
lg.Fatal().Err(err).Str("path", module).Msg("unable to resolve path")
}
if !strings.HasPrefix(p, ".") {
p = "./" + p
}
module = p
ws, err := workspace.Create(ctx, name, state.Plan{
Module: module,
Package: viper.GetString("package"),
})
@@ -70,7 +71,7 @@ var newCmd = &cobra.Command{
}
func init() {
newCmd.Flags().StringP("module", "m", "", "references the local path of the cue module to use as a plan, relative to the workspace root")
newCmd.Flags().StringP("module", "m", ".", "references the local path of the cue module to use as a plan, relative to the workspace root")
newCmd.Flags().StringP("package", "p", "", "references the name of the Cue package within the module to use as a plan. Default: defer to cue loader")
if err := viper.BindPFlags(newCmd.Flags()); err != nil {
panic(err)