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

Fix: WriteConfig file extensions check #934

Closed
wants to merge 2 commits into from
Closed

Fix: WriteConfig file extensions check #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0e708a
WriteConfig expected file type based on contentType instead of file e…
greg-szabo Jul 5, 2020
f7fb7db
Lint typo fix
greg-szabo Jul 5, 2020
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
7 changes: 3 additions & 4 deletions viper.go
View file
Open in desktop
Expand Up @@ -1443,11 +1443,10 @@ func (v *Viper) writeConfig(filename string, force bool) error {
jww.INFO.Println("Attempting to write configuration to file.")
var configType string

ext := filepath.Ext(filename)
if ext != "" {
configType = ext[1:]
} else {
if v.configType != "" {
configType = v.configType
} else {
configType = strings.TrimPrefix(filepath.Ext(filename), ".")
}
if configType == "" {
return fmt.Errorf("config type could not be determined for %s", filename)
Expand Down
77 changes: 74 additions & 3 deletions viper_test.go
View file
Open in desktop
Expand Up @@ -1326,6 +1326,32 @@ var hclWriteExpected = []byte(`"foos" = {

"type" = "donut"`)

var hclWriteExpectedFromJSONExample = []byte(`"batters" = {
"batter" = {
"type" = "Regular"
}

"batter" = {
"type" = "Chocolate"
}

"batter" = {
"type" = "Blueberry"
}

"batter" = {
"type" = "Devil's Food"
}
}

"id" = "0001"

"name" = "Cake"

"ppu" = 0.55

"type" = "donut"`)

var jsonWriteExpected = []byte(`{
"batters": {
"batter": [
Expand All @@ -1349,6 +1375,31 @@ var jsonWriteExpected = []byte(`{
"type": "donut"
}`)

var jsonWriteExpectedFromHclExample = []byte(`{
"foos": [
{
"foo": [
{
"key": 1
},
{
"key": 2
},
{
"key": 3
},
{
"key": 4
}
]
}
],
"id": "0001",
"name": "Cake",
"ppu": 0.55,
"type": "donut"
}`)

var propertiesWriteExpected = []byte(`p_id = 0001
p_type = donut
p_name = Cake
Expand All @@ -1372,6 +1423,26 @@ hobbies:
name: steve
`)

var jsonWriteExpectedFromYamlExample = []byte(`{
"age": 35,
"beard": true,
"clothing": {
"jacket": "leather",
"pants": {
"size": "large"
},
"trousers": "denim"
},
"eyes": "brown",
"hacker": true,
"hobbies": [
"skateboarding",
"snowboarding",
"go"
],
"name": "steve"
}`)

func TestWriteConfig(t *testing.T) {
fs := afero.NewMemMapFs()
testCases := map[string]struct {
Expand Down Expand Up @@ -1404,7 +1475,7 @@ func TestWriteConfig(t *testing.T) {
outConfigType: "json",
fileName: "c.hcl",
input: hclExample,
expectedContent: hclWriteExpected,
expectedContent: jsonWriteExpectedFromHclExample,
},
"json with file extension": {
configName: "c",
Expand All @@ -1428,7 +1499,7 @@ func TestWriteConfig(t *testing.T) {
outConfigType: "hcl",
fileName: "c.json",
input: jsonExample,
expectedContent: jsonWriteExpected,
expectedContent: hclWriteExpectedFromJSONExample,
},
"properties with file extension": {
configName: "c",
Expand Down Expand Up @@ -1468,7 +1539,7 @@ func TestWriteConfig(t *testing.T) {
outConfigType: "json",
fileName: "c.yaml",
input: yamlExample,
expectedContent: yamlWriteExpected,
expectedContent: jsonWriteExpectedFromYamlExample,
},
}
for name, tc := range testCases {
Expand Down