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

input: support yaml and json inputs

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-04-15 12:22:32 -07:00
parent 493406afe7
commit 6f57ed1b9d
9 changed files with 129 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/dagger/cmd/input/json.go Normal file
View File

@ -0,0 +1,33 @@
package input
import (
"dagger.io/go/cmd/dagger/logger"
"dagger.io/go/dagger"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
var jsonCmd = &cobra.Command{
Use: "json TARGET VALUE",
Short: "Add a JSON input",
Args: cobra.ExactArgs(2),
PreRun: func(cmd *cobra.Command, args []string) {
// Fix Viper bug for duplicate flags:
// https://github.com/spf13/viper/issues/233
if err := viper.BindPFlags(cmd.Flags()); err != nil {
panic(err)
}
},
Run: func(cmd *cobra.Command, args []string) {
lg := logger.New()
ctx := lg.WithContext(cmd.Context())
updateDeploymentInput(ctx, args[0], dagger.JSONInput(args[1]))
},
}
func init() {
if err := viper.BindPFlags(jsonCmd.Flags()); err != nil {
panic(err)
}
}

2
cmd/dagger/cmd/input/root.go
View File

@ -22,6 +22,8 @@ func init() {
containerCmd,
secretCmd,
textCmd,
jsonCmd,
yamlCmd,
)
}

2
cmd/dagger/cmd/input/text.go
View File

@ -9,7 +9,7 @@ import (
var textCmd = &cobra.Command{
Use: "text TARGET VALUE",
Short: "Add an input text",
Short: "Add a text input",
Args: cobra.ExactArgs(2),
PreRun: func(cmd *cobra.Command, args []string) {
// Fix Viper bug for duplicate flags:

33
cmd/dagger/cmd/input/yaml.go Normal file
View File

@ -0,0 +1,33 @@
package input
import (
"dagger.io/go/cmd/dagger/logger"
"dagger.io/go/dagger"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
var yamlCmd = &cobra.Command{
Use: "yaml TARGET VALUE",
Short: "Add a YAML input",
Args: cobra.ExactArgs(2),
PreRun: func(cmd *cobra.Command, args []string) {
// Fix Viper bug for duplicate flags:
// https://github.com/spf13/viper/issues/233
if err := viper.BindPFlags(cmd.Flags()); err != nil {
panic(err)
}
},
Run: func(cmd *cobra.Command, args []string) {
lg := logger.New()
ctx := lg.WithContext(cmd.Context())
updateDeploymentInput(ctx, args[0], dagger.YAMLInput(args[1]))
},
}
func init() {
if err := viper.BindPFlags(yamlCmd.Flags()); err != nil {
panic(err)
}
}

4
cmd/dagger/cmd/root.go
View File

@ -4,7 +4,7 @@ import (
"os"
"strings"
inputCmd "dagger.io/go/cmd/dagger/cmd/input"
"dagger.io/go/cmd/dagger/cmd/input"
"dagger.io/go/cmd/dagger/cmd/output"
"dagger.io/go/cmd/dagger/cmd/plan"
"dagger.io/go/cmd/dagger/logger"
@ -37,7 +37,7 @@ func init() {
loginCmd,
logoutCmd,
plan.Cmd,
inputCmd.Cmd,
input.Cmd,
output.Cmd,
)

59
tests/cli.bats
View File

@ -109,21 +109,55 @@ setup() {
assert_output --partial '"foo": "value"'
}
@test "dagger input" {
"$DAGGER" new --plan-dir "$TESTDIR"/cli/input "input"
@test "dagger input text" {
"$DAGGER" new --plan-dir "$TESTDIR"/cli/input/simple "input"
# missing input
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input"
"$DAGGER" input -d "input" text "input" "my input"
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" input
assert_success
assert_output '"my input"'
"$DAGGER" input -d "input" text "nested.input" "nested input"
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" nested
assert_success
assert_output '{
"foo": "bar"
"input": "nested input"
}'
}
# input dir
"$DAGGER" input -d "input" dir "source" "$TESTDIR"/cli/input/testdata
"$DAGGER" "${DAGGER_BINARY_ARGS[@]}" up -d "input"
"$DAGGER" up -d "input"
@test "dagger input json" {
"$DAGGER" new --plan-dir "$TESTDIR"/cli/input/simple "input"
"$DAGGER" input -d "input" json "structured" '{"a": "foo", "b": 42}'
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" structured
assert_success
assert_output '{
"a": "foo",
"b": 42
}'
}
@test "dagger input yaml" {
"$DAGGER" new --plan-dir "$TESTDIR"/cli/input/simple "input"
"$DAGGER" input -d "input" yaml "structured" '{"a": "foo", "b": 42}'
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" structured
assert_success
assert_output '{
"a": "foo",
"b": 42
}'
}
@test "dagger input dir" {
"$DAGGER" new --plan-dir "$TESTDIR"/cli/input/artifact "input"
"$DAGGER" input -d "input" dir "source" "$TESTDIR"/cli/input/artifact/testdata
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input"
assert_success
assert_output '{
@ -131,8 +165,11 @@ setup() {
"foo": "bar",
"source": {}
}'
}
@test "dagger input git" {
"$DAGGER" new --plan-dir "$TESTDIR"/cli/input/artifact "input"
# input git
"$DAGGER" input -d "input" git "source" https://github.com/samalba/dagger-test-simple.git
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input"

0
tests/cli/input/main.cue → tests/cli/input/artifact/main.cue
View File

0
tests/cli/input/testdata/testfile → tests/cli/input/artifact/testdata/testfile vendored
View File

10
tests/cli/input/simple/main.cue Normal file
View File

@ -0,0 +1,10 @@
package testing
input: string
nested: input: string
structured: {
a: string
b: int
}