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

cmd/new: added support for plan-git option

Browse Source 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-04-01 16:45:58 -07:00
parent 530e6dc876
commit fb9aae38ef
2 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package cmd
import ( import (
"context" "context"
"net/url"
"os" "os"
"path/filepath" "path/filepath"
@ -94,20 +95,48 @@ func getNewDeploymentName(ctx context.Context) string {
return currentDir return currentDir
} }
// FIXME: Implement options: --plan-*
func getPlanSource(ctx context.Context) dagger.Input { func getPlanSource(ctx context.Context) dagger.Input {
lg := log.Ctx(ctx) lg := log.Ctx(ctx)
planDir := viper.GetString("plan-dir") src := dagger.Input{}
if planDir == "" { checkFirstSet := func() {
var err error if src.Type != dagger.InputTypeEmpty {
planDir, err = os.Getwd() lg.Fatal().Msg("only one of those options can be set: --plan-dir, --plan-git, --plan-package, --plan-file")
if err != nil {
lg.Fatal().Err(err).Msg("cannot get current working directory")
} }
} }
return dagger.DirInput(planDir, []string{"*.cue", "cue.mod"}) planDir := viper.GetString("plan-dir")
planGit := viper.GetString("plan-git")
if planDir != "" {
checkFirstSet()
src = dagger.DirInput(planDir, []string{"*.cue", "cue.mod"})
}
if planGit != "" {
checkFirstSet()
u, err := url.Parse(planGit)
if err != nil {
lg.Fatal().Err(err).Str("url", planGit).Msg("cannot get current working directory")
}
ref := u.Fragment // eg. #main
u.Fragment = ""
remote := u.String()
src = dagger.GitInput(remote, ref, "")
}
if src.Type == dagger.InputTypeEmpty {
var err error
wd, err := os.Getwd()
if err != nil {
lg.Fatal().Err(err).Msg("cannot get current working directory")
}
return dagger.DirInput(wd, []string{"*.cue", "cue.mod"})
}
return src
} }
func init() { func init() {

12
dagger/input.go
View File

@ -28,6 +28,7 @@ const (
InputTypeText InputType = "text" InputTypeText InputType = "text"
InputTypeJSON InputType = "json" InputTypeJSON InputType = "json"
InputTypeYAML InputType = "yaml" InputTypeYAML InputType = "yaml"
InputTypeEmpty InputType = ""
) )
type Input struct { type Input struct {
@ -111,7 +112,16 @@ func GitInput(remote, ref, dir string) Input {
} }
func (git gitInput) Compile() (*compiler.Value, error) { func (git gitInput) Compile() (*compiler.Value, error) {
panic("NOT IMPLEMENTED") ref := "HEAD"
if git.Ref != "" {
ref = git.Ref
}
return compiler.Compile("", fmt.Sprintf(
`#compute: [{do:"fetch-git", remote:"%s", ref:"%s"}]`,
git.Remote,
ref,
))
} }
// An input artifact loaded from a docker container // An input artifact loaded from a docker container