Merge pull request #452 from ekinanp/fix-451

MikaelSmith · web-flow · commit c584c6519f99 · 2019-08-15T08:53:17.000-07:00
Make sure analytics config dir exists before writing analytics.yaml
diff --git a/analytics/config.go b/analytics/config.go
@@ -70,6 +70,11 @@ func GetConfig() (Config, error) {
 		// This should never happen
 		return config, fmt.Errorf("could not marshal the analytics config: %v", err)
 	}
+	// Make sure that the ~/.puppetlabs/wash directory exists. Otherwise, ioutil.WriteFile
+	// will return an error.
+	if err := os.MkdirAll(filepath.Dir(analyticsConfigFile), 0750); err != nil {
+		return config, err
+	}
 	return config, ioutil.WriteFile(analyticsConfigFile, bytes, 0644)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,11 @@ func GetConfig() (Config, error) {`
`70`	`70`	`// This should never happen`
`71`	`71`	`return config, fmt.Errorf("could not marshal the analytics config: %v", err)`
`72`	`72`	`}`
	`73`	`+ // Make sure that the ~/.puppetlabs/wash directory exists. Otherwise, ioutil.WriteFile`
	`74`	`+ // will return an error.`
	`75`	`+ if err := os.MkdirAll(filepath.Dir(analyticsConfigFile), 0750); err != nil {`
	`76`	`+ return config, err`
	`77`	`+ }`
`73`	`78`	`return config, ioutil.WriteFile(analyticsConfigFile, bytes, 0644)`
`74`	`79`	`}`
`75`	`80`