* add support for --input-file in dagger compute

* secrets now supports bytes
* error reporting for unhandled content data types in WriteFile

Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
This commit is contained in:
Frederick F. Kautz IV
2021-04-08 23:52:17 -07:00
parent 308ade0a79
commit 0458c0a838
6 changed files with 77 additions and 4 deletions

View File

@@ -3,8 +3,11 @@ package dagger
import (
"encoding/json"
"fmt"
"io/ioutil"
"path/filepath"
"cuelang.org/go/cue"
"dagger.io/go/dagger/compiler"
)
@@ -29,6 +32,7 @@ const (
InputTypeText InputType = "text"
InputTypeJSON InputType = "json"
InputTypeYAML InputType = "yaml"
InputTypeFile InputType = "file"
InputTypeEmpty InputType = ""
)
@@ -41,6 +45,7 @@ type Input struct {
Text *textInput `json:"text,omitempty"`
JSON *jsonInput `json:"json,omitempty"`
YAML *yamlInput `json:"yaml,omitempty"`
File *fileInput `json:"file,omitempty"`
}
func (i Input) Compile() (*compiler.Value, error) {
@@ -57,6 +62,8 @@ func (i Input) Compile() (*compiler.Value, error) {
return i.JSON.Compile()
case InputTypeYAML:
return i.YAML.Compile()
case InputTypeFile:
return i.File.Compile()
case "":
return nil, fmt.Errorf("input has not been set")
default:
@@ -211,3 +218,28 @@ type yamlInput struct {
func (i yamlInput) Compile() (*compiler.Value, error) {
return compiler.DecodeYAML("", []byte(i.Data))
}
func FileInput(data string) Input {
return Input{
Type: InputTypeFile,
File: &fileInput{
Path: data,
},
}
}
type fileInput struct {
Path string `json:"data,omitempty"`
}
func (i fileInput) Compile() (*compiler.Value, error) {
data, err := ioutil.ReadFile(i.Path)
if err != nil {
return nil, err
}
value := compiler.NewValue()
if err := value.FillPath(cue.MakePath(), data); err != nil {
return nil, err
}
return value, nil
}