ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unecessary conditions for module manifest read and write functions

This commit is contained in:
Steve Burns 2020-01-17 12:14:17 -07:00
parent 43b855743b
commit 26305a83a3
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/modsdir/manifest.go
View File

@ -82,11 +82,9 @@ func ReadManifestSnapshot(r io.Reader) (Manifest, error) {
}
}
// Ensure Windows is using the proper modules directory format after
// reading the modules manifest
if string(filepath.Separator) != "/" {
record.Dir = filepath.FromSlash(record.Dir)
}
// Ensure Windows is using the proper modules path format after
// reading the modules manifest Dir records
record.Dir = filepath.FromSlash(record.Dir)
if _, exists := new[record.Key]; exists {
// This should never happen in any valid file, so we'll catch it
@ -124,10 +122,8 @@ func (m Manifest) WriteSnapshot(w io.Writer) error {
}
// Ensure Dir is written in a format that can be read by Linux and
// Windows nodes
if string(filepath.Separator) != "/" {
record.Dir = filepath.ToSlash(record.Dir)
}
// Windows nodes for remote and apply compatibility
record.Dir = filepath.ToSlash(record.Dir)
write.Records = append(write.Records, record)
}