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

moved abs path to DirInput

Browse Source 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-04-02 17:26:19 -07:00
parent 21e0ac21de
commit ce6ce871ab
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dagger/input.go
View File

@ -66,6 +66,12 @@ func (i Input) Compile() (*compiler.Value, error) {
// An input artifact loaded from a local directory // An input artifact loaded from a local directory
func DirInput(path string, include []string) Input { func DirInput(path string, include []string) Input {
// resolve absolute path
path, err := filepath.Abs(path)
if err != nil {
panic(err)
}
return Input{ return Input{
Type: InputTypeDir, Type: InputTypeDir,
Dir: &dirInput{ Dir: &dirInput{
@ -83,13 +89,6 @@ type dirInput struct {
func (dir dirInput) Compile() (*compiler.Value, error) { func (dir dirInput) Compile() (*compiler.Value, error) {
// FIXME: serialize an intermediate struct, instead of generating cue source // FIXME: serialize an intermediate struct, instead of generating cue source
// resolve absolute path
path, err := filepath.Abs(dir.Path)
if err != nil {
return nil, err
}
dir.Path = path
// json.Marshal([]string{}) returns []byte("null"), which wreaks havoc // json.Marshal([]string{}) returns []byte("null"), which wreaks havoc
// in Cue because `null` is not a `[...string]` // in Cue because `null` is not a `[...string]`
includeLLB := []byte("[]") includeLLB := []byte("[]")