add 012 upgrade option #6
Conversation
megan07
force-pushed
the
megan_add_upgrade012
branch
from
a669b57
to
9379608
Compare
lib/upgrade012/fmtverbs.go
Outdated
| ) | ||
|
|
||
| //todo list of them? | ||
| const fmtVerbCompatibilityDelimiter = "@@_@@ TFMT" |
There was a problem hiding this comment.
fmtVerbCompatibilityDelimiter is unused (from deadcode)
lib/upgrade012/upgrade.go
Outdated
|
|
||
| if err != nil { | ||
| if stdout != nil { | ||
| fmt.Println(stdout) |
There was a problem hiding this comment.
Error return value of fmt.Println is not checked (from errcheck)
cli/cmds.go
Outdated
| return err | ||
| } | ||
|
|
||
| br.Writer.Write([]byte(fb)) |
There was a problem hiding this comment.
Error return value of br.Writer.Write is not checked (from errcheck)
lib/upgrade012/fmtverbs.go
Outdated
|
|
||
| // handle bare %s | ||
| // figure out why the * doesn't match both later | ||
| b = string(regexp.MustCompile(`(?m:^%[sdfgtqv]$)`).ReplaceAllString(b, `#@@_@@ TFMT:$0`)) |
There was a problem hiding this comment.
unnecessary conversion (from unconvert)
lib/upgrade012/upgrade.go
Outdated
| // strip it here | ||
| fb := strings.TrimSuffix(string(raw), "\n") | ||
|
|
||
| return string(fb), nil |
There was a problem hiding this comment.
unnecessary conversion (from unconvert)
cli/cmds.go
Outdated
| _, err = br.Writer.Write([]byte(fb)) | ||
|
|
||
| if err == nil && fb != b { |
There was a problem hiding this comment.
These two lines could be merged:
if _, err = br.Writer.Write([]byte(fb)); err == nil && fb != b {
cli/cmds.go
Outdated
| // nolint staticcheck | ||
| fmt.Fprintf(os.Stderr, c.Sprintf("<%s>%s</>: <cyan>%d</> lines & formatted <yellow>%d</>/<yellow>%d</> blocks!\n", fc, br.FileName, br.LineCount, blocksFormatted, br.BlockCount)) | ||
| } | ||
| if err != nil { |
There was a problem hiding this comment.
I think this should be after br.DoTheThing(filename)?
| if err != nil { | ||
| return err | ||
| } | ||
| return nil |
There was a problem hiding this comment.
could we add the new check for the diff function here were it does an os.exit(-1) if there are any blocks with error?
./terrafmt upgrade012 path/to/test_files.goBecause
terraform 0.12upgradeneeds to be run on a directory and doesn't have astdinoption, it will write the blocks to a buffer, create a temp directory, write the buffer to a temp file there, runterraform 0.12upgradeon the temp directory, read the temp file back to the format block before it writes it to the real file.I didn't implement the
fmtcompatoption into this. I didn't entirely understand the use case, but I can add it in if you need me to.