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

input: support file/stdin source for text/json/yaml

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-04-15 12:47:30 -07:00
parent 6f57ed1b9d
commit 46ab44a69f
8 changed files with 104 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/dagger/cmd/input/json.go
View File

@ -8,7 +8,7 @@ import (
)
var jsonCmd = &cobra.Command{
Use: "json TARGET VALUE",
Use: "json <TARGET> [-f] <VALUE|PATH>",
Short: "Add a JSON input",
Args: cobra.ExactArgs(2),
PreRun: func(cmd *cobra.Command, args []string) {
@ -22,11 +22,17 @@ var jsonCmd = &cobra.Command{
lg := logger.New()
ctx := lg.WithContext(cmd.Context())
updateDeploymentInput(ctx, args[0], dagger.JSONInput(args[1]))
updateDeploymentInput(
ctx,
args[0],
dagger.JSONInput(readInput(ctx, args[1])),
)
},
}
func init() {
jsonCmd.Flags().BoolP("file", "f", false, "Read value from file")
if err := viper.BindPFlags(jsonCmd.Flags()); err != nil {
panic(err)
}

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

@ -2,11 +2,14 @@ package input
import (
"context"
"io"
"os"
"dagger.io/go/cmd/dagger/cmd/common"
"dagger.io/go/dagger"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// Cmd exposes the top-level command
@ -43,3 +46,35 @@ func updateDeploymentInput(ctx context.Context, target string, input dagger.Inpu
}
lg.Info().Str("deploymentId", st.ID).Str("deploymentName", st.Name).Msg("updated deployment")
}
func readInput(ctx context.Context, source string) string {
lg := log.Ctx(ctx)
if !viper.GetBool("file") {
return source
}
if source == "-" {
// stdin source
data, err := io.ReadAll(os.Stdin)
if err != nil {
lg.
Fatal().
Err(err).
Msg("failed to read input from stdin")
}
return string(data)
}
// file source
data, err := os.ReadFile(source)
if err != nil {
lg.
Fatal().
Err(err).
Str("path", source).
Msg("failed to read input from file")
}
return string(data)
}

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

@ -8,7 +8,7 @@ import (
)
var textCmd = &cobra.Command{
Use: "text TARGET VALUE",
Use: "text <TARGET> [-f] <VALUE|PATH>",
Short: "Add a text input",
Args: cobra.ExactArgs(2),
PreRun: func(cmd *cobra.Command, args []string) {
@ -22,11 +22,17 @@ var textCmd = &cobra.Command{
lg := logger.New()
ctx := lg.WithContext(cmd.Context())
updateDeploymentInput(ctx, args[0], dagger.TextInput(args[1]))
updateDeploymentInput(
ctx,
args[0],
dagger.TextInput(readInput(ctx, args[1])),
)
},
}
func init() {
textCmd.Flags().BoolP("file", "f", false, "Read value from file")
if err := viper.BindPFlags(textCmd.Flags()); err != nil {
panic(err)
}

10
cmd/dagger/cmd/input/yaml.go
View File

@ -8,7 +8,7 @@ import (
)
var yamlCmd = &cobra.Command{
Use: "yaml TARGET VALUE",
Use: "yaml <TARGET> [-f] <VALUE|PATH>",
Short: "Add a YAML input",
Args: cobra.ExactArgs(2),
PreRun: func(cmd *cobra.Command, args []string) {
@ -22,11 +22,17 @@ var yamlCmd = &cobra.Command{
lg := logger.New()
ctx := lg.WithContext(cmd.Context())
updateDeploymentInput(ctx, args[0], dagger.YAMLInput(args[1]))
updateDeploymentInput(
ctx,
args[0],
dagger.YAMLInput(readInput(ctx, args[1])),
)
},
}
func init() {
yamlCmd.Flags().BoolP("file", "f", false, "Read value from file")
if err := viper.BindPFlags(yamlCmd.Flags()); err != nil {
panic(err)
}

38
tests/cli.bats
View File

@ -112,12 +112,14 @@ setup() {
@test "dagger input text" {
"$DAGGER" new --plan-dir "$TESTDIR"/cli/input/simple "input"
# simple 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"'
# nested input
"$DAGGER" input -d "input" text "nested.input" "nested input"
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" nested
@ -125,6 +127,24 @@ setup() {
assert_output '{
"input": "nested input"
}'
# file input
"$DAGGER" input -d "input" text "input" -f "$TESTDIR"/cli/input/simple/testdata/input.txt
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" input
assert_success
assert_output '"from file\n"'
# invalid file
run "$DAGGER" input -d "input" text "input" -f "$TESTDIR"/cli/input/simple/testdata/notexist
assert_failure
# stdin input
echo -n "from stdin" | "$DAGGER" input -d "input" text "input" -f -
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" input
assert_success
assert_output '"from stdin"'
}
@test "dagger input json" {
@ -138,6 +158,15 @@ setup() {
"a": "foo",
"b": 42
}'
"$DAGGER" input -d "input" json "structured" -f "$TESTDIR"/cli/input/simple/testdata/input.json
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" structured
assert_success
assert_output '{
"a": "from file",
"b": 42
}'
}
@test "dagger input yaml" {
@ -151,6 +180,15 @@ setup() {
"a": "foo",
"b": 42
}'
"$DAGGER" input -d "input" yaml "structured" -f "$TESTDIR"/cli/input/simple/testdata/input.yaml
"$DAGGER" up -d "input"
run "$DAGGER" -l error query -d "input" structured
assert_success
assert_output '{
"a": "from file",
"b": 42
}'
}
@test "dagger input dir" {

4
tests/cli/input/simple/testdata/input.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"a": "from file",
"b": 42
}

1
tests/cli/input/simple/testdata/input.txt vendored Normal file
View File

@ -0,0 +1 @@
from file

2
tests/cli/input/simple/testdata/input.yaml vendored Normal file
View File

@ -0,0 +1,2 @@
a: "from file"
b: 42