fixup: commented code, long lines

spikecurtis · spikecurtis · commit 8052b505b8cb · 2022-06-10T17:29:09.000-07:00
Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -71,9 +71,6 @@ func (e executor) execParseJSON(ctx context.Context, args, env []string, v inter
 	cmd.Stderr = stdErr
 	err := cmd.Run()
 	if err != nil {
-		// if noStateRegex.MatchString(err.Error()) {
-		//	return nil, os.ErrNotExist
-		//}
 		errString, _ := io.ReadAll(stdErr)
 		return xerrors.Errorf("%s: %w", errString, err)
 	}
@@ -93,7 +90,10 @@ func (e executor) checkMinVersion(ctx context.Context) error {
 		return err
 	}
 	if !v.GreaterThanOrEqual(minimumTerraformVersion) {
-		return xerrors.Errorf("terraform version %q is too old. required >= %q", v.String(), minimumTerraformVersion.String())
+		return xerrors.Errorf(
+			"terraform version %q is too old. required >= %q",
+			v.String(),
+			minimumTerraformVersion.String())
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,6 @@ func (e executor) execParseJSON(ctx context.Context, args, env []string, v inter`
`71`	`71`	`cmd.Stderr = stdErr`
`72`	`72`	`err := cmd.Run()`
`73`	`73`	`if err != nil {`
`74`		`- // if noStateRegex.MatchString(err.Error()) {`
`75`		`- // return nil, os.ErrNotExist`
`76`		`- //}`
`77`	`74`	`errString, _ := io.ReadAll(stdErr)`
`78`	`75`	`return xerrors.Errorf("%s: %w", errString, err)`
`79`	`76`	`}`
`@@ -93,7 +90,10 @@ func (e executor) checkMinVersion(ctx context.Context) error {`
`93`	`90`	`return err`
`94`	`91`	`}`
`95`	`92`	`if !v.GreaterThanOrEqual(minimumTerraformVersion) {`
`96`		`- return xerrors.Errorf("terraform version %q is too old. required >= %q", v.String(), minimumTerraformVersion.String())`
	`93`	`+ return xerrors.Errorf(`
	`94`	`+ "terraform version %q is too old. required >= %q",`
	`95`	`+ v.String(),`
	`96`	`+ minimumTerraformVersion.String())`
`97`	`97`	`}`
`98`	`98`	`return nil`
`99`	`99`	`}`