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

Deal with ambiguous filenames #176

Merged
merged 2 commits into from
Mar 9, 2019
Merged

Deal with ambiguous filenames #176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a40bb01
Default to parsing as YAML unless the file is definitely JSON
stilvoid Mar 7, 2019
f1c0621
Merge branch 'master' into detect-yaml-templates
PaulMaddox Mar 9, 2019
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
8 changes: 4 additions & 4 deletions goformation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ func OpenWithOptions(filename string, options *intrinsics.ProcessorOptions) (*cl
return nil, err
}

if strings.HasSuffix(filename, ".yaml") || strings.HasSuffix(filename, ".yml") {
return ParseYAMLWithOptions(data, options)
if strings.HasSuffix(filename, ".json") {
// This is definitely JSON
return ParseJSONWithOptions(data, options)
}

return ParseJSONWithOptions(data, options)

return ParseYAMLWithOptions(data, options)
}

// ParseYAML an AWS CloudFormation template (expects a []byte of valid YAML)
Expand Down