Code cleanup

This commit is contained in:
Dane Everitt 2020-10-11 15:27:27 -07:00
parent 3463c223e8
commit 7f4771068f
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53

View File

@ -390,32 +390,26 @@ func (f *ConfigurationFile) parseYamlFile(path string) error {
// scanning a file and performing a replacement. You should attempt to use anything other // scanning a file and performing a replacement. You should attempt to use anything other
// than this function where possible. // than this function where possible.
func (f *ConfigurationFile) parseTextFile(path string) error { func (f *ConfigurationFile) parseTextFile(path string) error {
// read file
input, err := ioutil.ReadFile(path) input, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
return err return errors.WithStack(err)
} }
// split file into lines to parse one by one.
lines := strings.Split(string(input), "\n") lines := strings.Split(string(input), "\n")
for i, line := range lines { for i, line := range lines {
for _, replace := range f.Replace { for _, replace := range f.Replace {
// skip if line doesn't have the prefix // If this line doesn't match what we expect for the replacement, move on to the next
// line. Otherwise, update the line to have the replacement value.
if !strings.HasPrefix(line, replace.Match) { if !strings.HasPrefix(line, replace.Match) {
continue continue
} }
// replace line if it has the prefix
lines[i] = replace.ReplaceWith.String() lines[i] = replace.ReplaceWith.String()
} }
} }
// join all the file lines with new lines between if err := ioutil.WriteFile(path, []byte(strings.Join(lines, "\n")), 0644); err != nil {
output := strings.Join(lines, "\n") return errors.WithStack(err)
err = ioutil.WriteFile(path, []byte(output), 0644)
if err != nil {
return err
} }
return nil return nil