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

Merge pull request #1019 from grouville/fix/edit-dir

Browse Source 
Fix/dagger edit: wrong dir Path leads to infinite loop
This commit is contained in:
Andrea Luzzardi 2021-09-27 12:23:26 -07:00 committed by GitHub
commit 6a663c5c0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ var dirCmd = &cobra.Command{
// Check that directory exists // Check that directory exists
if _, err := os.Stat(p); os.IsNotExist(err) { if _, err := os.Stat(p); os.IsNotExist(err) {
lg.Fatal().Err(err).Str("path", args[1]).Msg("dir doesn't exists") lg.Fatal().Err(err).Str("path", args[1]).Msg("dir doesn't exist")
} }
project := common.CurrentProject(ctx) project := common.CurrentProject(ctx)

5
state/input.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"path" "path"
"path/filepath" "path/filepath"
"strings" "strings"
@ -113,6 +114,10 @@ func (dir dirInput) Compile(_ string, state *State) (*compiler.Value, error) {
if !strings.HasPrefix(p, state.Project) { if !strings.HasPrefix(p, state.Project) {
return nil, fmt.Errorf("%q is outside the project", dir.Path) return nil, fmt.Errorf("%q is outside the project", dir.Path)
} }
// Check that directory exists
if _, err := os.Stat(p); os.IsNotExist(err) {
return nil, fmt.Errorf("%q dir doesn't exist", dir.Path)
}
llb := fmt.Sprintf( llb := fmt.Sprintf(
`#up: [{do:"local",dir:"%s", include:%s, exclude:%s}]`, `#up: [{do:"local",dir:"%s", include:%s, exclude:%s}]`,

2
tests/cli.bats
View File

@ -320,7 +320,7 @@ setup() {
run "$DAGGER" input dir src xxx -e "input" run "$DAGGER" input dir src xxx -e "input"
assert_failure assert_failure
assert_output --partial "dir doesn't exists" assert_output --partial "dir doesn't exist"
} }
@test "dagger input dir: ignore .dagger" { @test "dagger input dir: ignore .dagger" {