diff --git a/acceptance_tests/empty.sh b/acceptance_tests/empty.sh index 69cd8172..812caa68 100755 --- a/acceptance_tests/empty.sh +++ b/acceptance_tests/empty.sh @@ -7,8 +7,11 @@ setUp() { EOL } +# hack - for some reason in github actions, it +# golang thinks yq has stdin pipeinto it (ModeNamedPipe is set, ModeCharDevice is not) +# explicitly add an expression so it doesnt try to read 'test.yml' as one... testEmptyEval() { - X=$(./yq e test.yml -v) + X=$(./yq e "." test.yml) expected=$(cat test.yml) assertEquals 0 $? assertEquals "$expected" "$X" @@ -16,7 +19,7 @@ testEmptyEval() { testEmptyEvalNoNewLine() { echo -n "#comment" >test.yml - X=$(./yq e test.yml) + X=$(./yq e "." test.yml) expected=$(cat test.yml) assertEquals 0 $? assertEquals "$expected" "$X" diff --git a/cmd/evaluate_all_command.go b/cmd/evaluate_all_command.go index 1dd6bc20..88570907 100644 --- a/cmd/evaluate_all_command.go +++ b/cmd/evaluate_all_command.go @@ -56,6 +56,21 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) { pipingStdIn := (stat.Mode() & os.ModeCharDevice) == 0 yqlib.GetLogger().Debug("pipingStdIn: %v", pipingStdIn) + yqlib.GetLogger().Debug("stat.Mode(): %v", stat.Mode()) + yqlib.GetLogger().Debug("ModeDir: %v", stat.Mode()&os.ModeDir) + yqlib.GetLogger().Debug("ModeAppend: %v", stat.Mode()&os.ModeAppend) + yqlib.GetLogger().Debug("ModeExclusive: %v", stat.Mode()&os.ModeExclusive) + yqlib.GetLogger().Debug("ModeTemporary: %v", stat.Mode()&os.ModeTemporary) + yqlib.GetLogger().Debug("ModeSymlink: %v", stat.Mode()&os.ModeSymlink) + yqlib.GetLogger().Debug("ModeDevice: %v", stat.Mode()&os.ModeDevice) + yqlib.GetLogger().Debug("ModeNamedPipe: %v", stat.Mode()&os.ModeNamedPipe) + yqlib.GetLogger().Debug("ModeSocket: %v", stat.Mode()&os.ModeSocket) + yqlib.GetLogger().Debug("ModeSetuid: %v", stat.Mode()&os.ModeSetuid) + yqlib.GetLogger().Debug("ModeSetgid: %v", stat.Mode()&os.ModeSetgid) + yqlib.GetLogger().Debug("ModeCharDevice: %v", stat.Mode()&os.ModeCharDevice) + yqlib.GetLogger().Debug("ModeSticky: %v", stat.Mode()&os.ModeSticky) + yqlib.GetLogger().Debug("ModeIrregular: %v", stat.Mode()&os.ModeIrregular) + out := cmd.OutOrStdout() if writeInplace { diff --git a/cmd/evalute_sequence_command.go b/cmd/evalute_sequence_command.go index 6cfe5b51..3b5f263a 100644 --- a/cmd/evalute_sequence_command.go +++ b/cmd/evalute_sequence_command.go @@ -67,8 +67,9 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) { stat, _ := os.Stdin.Stat() pipingStdIn := (stat.Mode() & os.ModeCharDevice) == 0 - yqlib.GetLogger().Debug("stat.Mode(): %v", stat.Mode()) yqlib.GetLogger().Debug("pipingStdIn: %v", pipingStdIn) + + yqlib.GetLogger().Debug("stat.Mode(): %v", stat.Mode()) yqlib.GetLogger().Debug("ModeDir: %v", stat.Mode()&os.ModeDir) yqlib.GetLogger().Debug("ModeAppend: %v", stat.Mode()&os.ModeAppend) yqlib.GetLogger().Debug("ModeExclusive: %v", stat.Mode()&os.ModeExclusive) diff --git a/pkg/yqlib/expression_parser.go b/pkg/yqlib/expression_parser.go index 7306e1e8..ae8da663 100644 --- a/pkg/yqlib/expression_parser.go +++ b/pkg/yqlib/expression_parser.go @@ -25,6 +25,7 @@ func NewExpressionParser() ExpressionParser { } func (p *expressionParserImpl) ParseExpression(expression string) (*ExpressionNode, error) { + log.Debug("Parsing expression: [%v]", expression) tokens, err := p.pathTokeniser.Tokenise(expression) if err != nil { return nil, err