Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

internal/config: support waypoint.hcl.json for HCL-flavored JSON syntax #867

Merged
merged 2 commits into from
Dec 1, 2020
Merged

internal/config: support waypoint.hcl.json for HCL-flavored JSON syntax #867

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1bd330
internal/config: support waypoint.hcl.json for HCL-flavored JSON syntax
mitchellh Dec 1, 2020
6ad34b7
internal: runners need to use configpkg.FindPath
mitchellh Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/config/path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,22 @@ func FindPath(start, filename string) (string, error) {
}

for {
// Look for HCL syntax
path := filepath.Join(start, filename)
if _, err := os.Stat(path); err == nil {
return path, nil
} else if !os.IsNotExist(err) {
return "", err
}

// Look for JSON
path += ".json"
if _, err := os.Stat(path); err == nil {
return path, nil
} else if !os.IsNotExist(err) {
return "", err
}

next := filepath.Dir(start)
if next == start {
return "", nil
Expand Down