Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lang: Improve cli input handling for files/directories and metadata.yaml #683

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

lang: Improve cli input handling for files/directories and metadata.yaml #683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb287a
lang: Allow 'mgmt lang run metadata.yaml'
frebib Nov 24, 2020
5d32044
lang: Correctly handle stat(2) errors on directories/files
frebib Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 27 additions & 13 deletions lang/inputs/inputs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
package inputs

import (
"errors"
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
"strings"

Expand Down Expand Up @@ -160,7 +162,8 @@ func inputStdin(s string, fs engine.Fs) (*ParsedInput, error) {
// inputMetadata checks to see if we have a metadata file path.
func inputMetadata(s string, fs engine.Fs) (*ParsedInput, error) {
// we've got a metadata.yaml file
if !strings.HasSuffix(s, "/"+interfaces.MetadataFilename) {
if !(s == interfaces.MetadataFilename ||
strings.HasSuffix(s, "/"+interfaces.MetadataFilename)) {
return nil, nil // not us, but no error
}
var err error
Expand Down Expand Up @@ -204,6 +207,7 @@ func inputMetadata(s string, fs engine.Fs) (*ParsedInput, error) {
// real files/ directory
if metadata.Files != "" { // TODO: nil pointer instead?
filesDir := basePath + metadata.Files
// TODO: handle files that throw stat(2) errors
if _, err := fs.Stat(filesDir); err == nil {
files = append(files, filesDir)
}
Expand Down Expand Up @@ -273,25 +277,31 @@ func inputMcl(s string, fs engine.Fs) (*ParsedInput, error) {

// inputDirectory checks if we're given the path to a directory.
func inputDirectory(s string, fs engine.Fs) (*ParsedInput, error) {
if !strings.HasSuffix(s, "/") {
return nil, nil // not us, but no error
}
var err error
if s, err = absify(s); err != nil { // s is now absolute
return nil, err
}
// does dir exist?
fi, err := fs.Stat(s)
if err != nil {
return nil, errwrap.Wrapf(err, "dir: `%s` does not exist", s)
if errors.Is(err, os.ErrNotExist) {
return nil, nil // not us, but no error
}

return nil, errwrap.Wrapf(err, "could not stat dir `%s`", s)
}
if !fi.IsDir() {
return nil, errwrap.Wrapf(err, "dir: `%s` is not a dir", s)
}

if s, err = absify(s); err != nil { // s is now absolute
return nil, err
}

// try looking for a metadata file in the root
md := s + interfaces.MetadataFilename // absolute file
if _, err := fs.Stat(md); err == nil {
md := path.Join(s, interfaces.MetadataFilename) // absolute file
_, err = fs.Stat(md)
// only return errors if they're not ENOENT, e.g. EPERM, EACCES
// ignore ENOENT errors and assume that the file is deliberately absent
if err != nil && !errors.Is(err, os.ErrNotExist) {
return nil, err
} else if err == nil {
if x, err := inputMetadata(md, fs); err != nil { // recurse
return nil, err
} else if x != nil {
Expand All @@ -300,8 +310,12 @@ func inputDirectory(s string, fs engine.Fs) (*ParsedInput, error) {
}

// try looking for a main.mcl file in the root
mf := s + interfaces.MainFilename // absolute file
if _, err := fs.Stat(mf); err == nil {
mf := path.Join(s, interfaces.MainFilename) // absolute file
_, err = fs.Stat(mf)
// same error handling as above. ignore ENOENT and handle all others
if err != nil && !errors.Is(err, os.ErrNotExist) {
return nil, err
} else if err == nil {
if x, err := inputMcl(mf, fs); err != nil { // recurse
return nil, err
} else if x != nil {
Expand Down