de-linting

jbardin · jbardin · commit 1ae87f5e9732 · 2021-08-31T18:08:45.000-04:00
diff --git a/internal/addrs/resource.go b/internal/addrs/resource.go
@@ -194,14 +194,10 @@ func (r AbsResource) absMoveableSigil() {
 	// AbsResource is moveable
 }
 
-type absResourceKey string
-
 func (r AbsResource) UniqueKey() UniqueKey {
 	return absResourceInstanceKey(r.String())
 }
 
-func (rk absResourceKey) uniqueKeySigil() {}
-
 // AbsResourceInstance is an absolute address for a resource instance under a
 // given module path.
 type AbsResourceInstance struct {
diff --git a/internal/backend/remote/backend.go b/internal/backend/remote/backend.go
@@ -888,7 +888,7 @@ func (b *Remote) VerifyWorkspaceTerraformVersion(workspaceName string) tfdiags.D
 
 	// If the workspace has remote operations disabled, the remote Terraform
 	// version is effectively meaningless, so we'll skip version verification.
-	if workspace.Operations == false {
+	if !workspace.Operations {
 		return nil
 	}
 
@@ -963,22 +963,6 @@ func (b *Remote) IsLocalOperations() bool {
 	return b.forceLocal
 }
 
-// Colorize returns the Colorize structure that can be used for colorizing
-// output. This is guaranteed to always return a non-nil value and so useful
-// as a helper to wrap any potentially colored strings.
-//
-// TODO SvH: Rename this back to Colorize as soon as we can pass -no-color.
-func (b *Remote) cliColorize() *colorstring.Colorize {
-	if b.CLIColor != nil {
-		return b.CLIColor
-	}
-
-	return &colorstring.Colorize{
-		Colors:  colorstring.DefaultColors,
-		Disable: true,
-	}
-}
-
 func generalError(msg string, err error) error {
 	var diags tfdiags.Diagnostics
 
diff --git a/internal/backend/remote/backend_apply_test.go b/internal/backend/remote/backend_apply_test.go
@@ -1594,7 +1594,7 @@ func TestRemote_applyVersionCheck(t *testing.T) {
 			}
 
 			// RUN: prepare the apply operation and run it
-			op, configCleanup, done := testOperationApply(t, "./testdata/apply")
+			op, configCleanup, _ := testOperationApply(t, "./testdata/apply")
 			defer configCleanup()
 
 			streams, done := terminal.StreamsForTesting(t)
diff --git a/internal/command/apply.go b/internal/command/apply.go
@@ -45,8 +45,7 @@ func (c *ApplyCommand) Run(rawArgs []string) int {
 
 	// Instantiate the view, even if there are flag errors, so that we render
 	// diagnostics according to the desired view
-	var view views.Apply
-	view = views.NewApply(args.ViewType, c.Destroy, c.View)
+	view := views.NewApply(args.ViewType, c.Destroy, c.View)
 
 	if diags.HasErrors() {
 		view.Diagnostics(diags)
diff --git a/internal/command/apply_test.go b/internal/command/apply_test.go
@@ -1779,6 +1779,7 @@ func TestApply_terraformEnvNonDefault(t *testing.T) {
 			},
 		}
 		if code := newCmd.Run([]string{"test"}); code != 0 {
+			t.Fatal("error creating workspace")
 		}
 	}
 
@@ -1792,6 +1793,7 @@ func TestApply_terraformEnvNonDefault(t *testing.T) {
 			},
 		}
 		if code := selCmd.Run(args); code != 0 {
+			t.Fatal("error switching workspace")
 		}
 	}
 
diff --git a/internal/command/format/diff.go b/internal/command/format/diff.go
@@ -70,7 +70,7 @@ func ResourceChange(
 		buf.WriteString(color.Color(fmt.Sprintf("[bold]  # %s[reset] will be [bold][red]destroyed", dispAddr)))
 		if change.DeposedKey != states.NotDeposed {
 			// Some extra context about this unusual situation.
-			buf.WriteString(color.Color(fmt.Sprint("\n  # (left over from a partially-failed replacement of this instance)")))
+			buf.WriteString(color.Color("\n  # (left over from a partially-failed replacement of this instance)"))
 		}
 	default:
 		// should never happen, since the above is exhaustive
@@ -755,8 +755,6 @@ func (p *blockBodyDiffPrinter) writeNestedAttrDiff(
 			p.buf.WriteString(" -> (known after apply)")
 		}
 	}
-
-	return
 }
 
 func (p *blockBodyDiffPrinter) writeNestedBlockDiffs(name string, blockS *configschema.NestedBlock, old, new cty.Value, blankBefore bool, indent int, path cty.Path) int {
diff --git a/internal/command/jsonplan/values.go b/internal/command/jsonplan/values.go
@@ -274,28 +274,3 @@ func marshalPlanModules(
 
 	return ret, nil
 }
-
-// marshalSensitiveValues returns a map of sensitive attributes, with the value
-// set to true. It returns nil if the value is nil or if there are no sensitive
-// vals.
-func marshalSensitiveValues(value cty.Value) map[string]bool {
-	if value.RawEquals(cty.NilVal) || value.IsNull() {
-		return nil
-	}
-
-	ret := make(map[string]bool)
-
-	it := value.ElementIterator()
-	for it.Next() {
-		k, v := it.Element()
-		s := jsonstate.SensitiveAsBool(v)
-		if !s.RawEquals(cty.False) {
-			ret[k.AsString()] = true
-		}
-	}
-
-	if len(ret) == 0 {
-		return nil
-	}
-	return ret
-}
diff --git a/internal/command/login.go b/internal/command/login.go
@@ -311,13 +311,9 @@ func (c *LoginCommand) outputDefaultTFELoginSuccess(dispHostname string) {
 }
 
 func (c *LoginCommand) outputDefaultTFCLoginSuccess() {
-	c.Ui.Output(
-		fmt.Sprintf(
-			c.Colorize().Color(strings.TrimSpace(`
+	c.Ui.Output(c.Colorize().Color(strings.TrimSpace(`
 [green][bold]Success![reset] [bold]Logged in to Terraform Cloud[reset]
-`)),
-		) + "\n",
-	)
+` + "\n")))
 }
 
 func (c *LoginCommand) logMOTDError(err error) {
diff --git a/internal/command/meta.go b/internal/command/meta.go
@@ -15,8 +15,6 @@ import (
 	"time"
 
 	plugin "github.com/hashicorp/go-plugin"
-	"github.com/hashicorp/hcl/v2"
-	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/hashicorp/terraform-svchost/disco"
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/backend"
@@ -554,43 +552,6 @@ func (m *Meta) extendedFlagSet(n string) *flag.FlagSet {
 	return f
 }
 
-// parseTargetFlags must be called for any commands supporting -target
-// arguments. This method attempts to parse each -target flag into an
-// addrs.Target, storing in the Meta.targets slice.
-//
-// If any flags cannot be parsed, we rewrap the first error diagnostic with a
-// custom title to clarify the source of the error. The normal approach of
-// directly returning the diags from HCL or the addrs package results in
-// confusing incorrect "source" results when presented.
-func (m *Meta) parseTargetFlags() tfdiags.Diagnostics {
-	var diags tfdiags.Diagnostics
-	m.targets = nil
-	for _, tf := range m.targetFlags {
-		traversal, syntaxDiags := hclsyntax.ParseTraversalAbs([]byte(tf), "", hcl.Pos{Line: 1, Column: 1})
-		if syntaxDiags.HasErrors() {
-			diags = diags.Append(tfdiags.Sourceless(
-				tfdiags.Error,
-				fmt.Sprintf("Invalid target %q", tf),
-				syntaxDiags[0].Detail,
-			))
-			continue
-		}
-
-		target, targetDiags := addrs.ParseTarget(traversal)
-		if targetDiags.HasErrors() {
-			diags = diags.Append(tfdiags.Sourceless(
-				tfdiags.Error,
-				fmt.Sprintf("Invalid target %q", tf),
-				targetDiags[0].Description().Detail,
-			))
-			continue
-		}
-
-		m.targets = append(m.targets, target.Subject)
-	}
-	return diags
-}
-
 // process will process any -no-color entries out of the arguments. This
 // will potentially modify the args in-place. It will return the resulting
 // slice, and update the Meta and Ui.
diff --git a/internal/command/meta_backend.go b/internal/command/meta_backend.go
@@ -12,7 +12,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/terraform/internal/backend"
@@ -244,7 +243,7 @@ func (m *Meta) BackendForPlan(settings plans.Backend) (backend.Enhanced, tfdiags
 	schema := b.ConfigSchema()
 	configVal, err := settings.Config.Decode(schema.ImpliedType())
 	if err != nil {
-		diags = diags.Append(errwrap.Wrapf("saved backend configuration is invalid: {{err}}", err))
+		diags = diags.Append(fmt.Errorf("saved backend configuration is invalid: %w", err))
 		return nil, diags
 	}
 
diff --git a/internal/command/refresh.go b/internal/command/refresh.go
@@ -26,8 +26,7 @@ func (c *RefreshCommand) Run(rawArgs []string) int {
 
 	// Instantiate the view, even if there are flag errors, so that we render
 	// diagnostics according to the desired view
-	var view views.Refresh
-	view = views.NewRefresh(args.ViewType, c.View)
+	view := views.NewRefresh(args.ViewType, c.View)
 
 	if diags.HasErrors() {
 		view.Diagnostics(diags)
diff --git a/internal/command/state_meta.go b/internal/command/state_meta.go
@@ -121,7 +121,7 @@ func (c *StateMeta) lookupResourceInstanceAddr(state *states.State, allowMissing
 			}
 		}
 
-		if found == false && !allowMissing {
+		if !found && !allowMissing {
 			diags = diags.Append(tfdiags.Sourceless(
 				tfdiags.Error,
 				"Unknown module",
diff --git a/internal/command/state_mv_test.go b/internal/command/state_mv_test.go
@@ -9,17 +9,11 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/mitchellh/cli"
-	"github.com/mitchellh/colorstring"
 
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/states"
 )
 
-var disabledColorize = &colorstring.Colorize{
-	Colors:  colorstring.DefaultColors,
-	Disable: true,
-}
-
 func TestStateMv(t *testing.T) {
 	state := states.BuildState(func(s *states.SyncState) {
 		s.SetResourceInstanceCurrent(
diff --git a/internal/command/views/add.go b/internal/command/views/add.go
@@ -256,7 +256,7 @@ func (v *addHuman) writeConfigNestedBlock(buf *strings.Builder, name string, sch
 }
 
 func (v *addHuman) writeConfigNestedTypeAttribute(buf *strings.Builder, name string, schema *configschema.Attribute, indent int) error {
-	if schema.Required == false && v.optional == false {
+	if !schema.Required && !v.optional {
 		return nil
 	}
 
@@ -521,7 +521,6 @@ func writeAttrTypeConstraint(buf *strings.Builder, schema *configschema.Attribut
 	} else {
 		buf.WriteString(fmt.Sprintf("%s\n", schema.Type.FriendlyName()))
 	}
-	return
 }
 
 func writeBlockTypeConstraint(buf *strings.Builder, schema *configschema.NestedBlock) {
@@ -530,7 +529,6 @@ func writeBlockTypeConstraint(buf *strings.Builder, schema *configschema.NestedB
 	} else {
 		buf.WriteString(" # OPTIONAL block\n")
 	}
-	return
 }
 
 // copied from command/format/diff
diff --git a/internal/command/views/json/output_test.go b/internal/command/views/json/output_test.go
@@ -74,6 +74,9 @@ func TestOutputsFromMap(t *testing.T) {
 func TestOutputsFromChanges(t *testing.T) {
 	root := addrs.RootModuleInstance
 	num, err := plans.NewDynamicValue(cty.NumberIntVal(1234), cty.Number)
+	if err != nil {
+		t.Fatalf("unexpected error creating dynamic value: %v", err)
+	}
 	str, err := plans.NewDynamicValue(cty.StringVal("1234"), cty.String)
 	if err != nil {
 		t.Fatalf("unexpected error creating dynamic value: %v", err)
diff --git a/internal/command/views/output.go b/internal/command/views/output.go
@@ -105,10 +105,6 @@ func (v *OutputHuman) Diagnostics(diags tfdiags.Diagnostics) {
 // type of an output value is not important.
 type OutputRaw struct {
 	view *View
-
-	// Unit tests may set rawPrint to capture the output from the Output
-	// method, which would normally go to stdout directly.
-	rawPrint func(string)
 }
 
 var _ Output = (*OutputRaw)(nil)
diff --git a/internal/communicator/ssh/communicator.go b/internal/communicator/ssh/communicator.go
@@ -19,7 +19,6 @@ import (
 	"time"
 
 	"github.com/apparentlymart/go-shquot/shquot"
-	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/internal/communicator/remote"
 	"github.com/hashicorp/terraform/internal/provisioners"
 	"github.com/zclconf/go-cty/cty"
@@ -192,7 +191,7 @@ func (c *Communicator) Connect(o provisioners.UIOutput) (err error) {
 	log.Printf("[DEBUG] Connection established. Handshaking for user %v", c.connInfo.User)
 	sshConn, sshChan, req, err := ssh.NewClientConn(c.conn, hostAndPort, c.config.config)
 	if err != nil {
-		err = errwrap.Wrapf(fmt.Sprintf("SSH authentication failed (%s@%s): {{err}}", c.connInfo.User, hostAndPort), err)
+		err = fmt.Errorf("SSH authentication failed (%s@%s): %w", c.connInfo.User, hostAndPort, err)
 
 		// While in theory this should be a fatal error, some hosts may start
 		// the ssh service before it is properly configured, or before user
diff --git a/internal/configs/provider_requirements.go b/internal/configs/provider_requirements.go
@@ -86,6 +86,7 @@ func decodeRequiredProvidersBlock(block *hcl.Block) (*RequiredProviders, hcl.Dia
 			continue
 		}
 
+	LOOP:
 		for _, kv := range kvs {
 			key, keyDiags := kv.Key.Value(nil)
 			if keyDiags.HasErrors() {
@@ -213,7 +214,7 @@ func decodeRequiredProvidersBlock(block *hcl.Block) (*RequiredProviders, hcl.Dia
 					Detail:   `required_providers objects can only contain "version", "source" and "configuration_aliases" attributes. To configure a provider, use a "provider" block.`,
 					Subject:  kv.Key.Range().Ptr(),
 				})
-				break
+				break LOOP
 			}
 
 		}
diff --git a/internal/dag/marshal.go b/internal/dag/marshal.go
@@ -160,7 +160,9 @@ func marshalVertexID(v Vertex) string {
 	case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.Slice, reflect.UnsafePointer:
 		return strconv.Itoa(int(val.Pointer()))
 	case reflect.Interface:
-		return strconv.Itoa(int(val.InterfaceData()[1]))
+		// A vertex shouldn't contain another layer of interface, but handle
+		// this just in case.
+		return fmt.Sprintf("%#v", val.Interface())
 	}
 
 	if v, ok := v.(Hashable); ok {
diff --git a/internal/terraform/context_plan.go b/internal/terraform/context_plan.go
@@ -306,6 +306,7 @@ func (c *Context) prePlanFindAndApplyMoves(config *configs.Config, prevRunState
 					break
 				}
 			}
+			//lint:ignore SA9003 TODO
 			if !matchesTarget {
 				// TODO: Return an error stating that a targeted plan is
 				// only valid if it includes this address that was moved.
diff --git a/internal/terraform/graph_test.go b/internal/terraform/graph_test.go
@@ -6,20 +6,6 @@ import (
 	"github.com/hashicorp/terraform/internal/dag"
 )
 
-// testGraphContains is an assertion helper that tests that a node is
-// contained in the graph.
-func testGraphContains(t *testing.T, g *Graph, name string) {
-	for _, v := range g.Vertices() {
-		if dag.VertexName(v) == name {
-			return
-		}
-	}
-
-	t.Fatalf(
-		"Expected %q in:\n\n%s",
-		name, g.String())
-}
-
 // testGraphnotContains is an assertion helper that tests that a node is
 // NOT contained in the graph.
 func testGraphNotContains(t *testing.T, g *Graph, name string) {
diff --git a/internal/terraform/resource_provider.go b/internal/terraform/resource_provider.go
diff --git a/internal/terraform/resource_provider_mock_test.go b/internal/terraform/resource_provider_mock_test.go
diff --git a/tools/protobuf-compile/protobuf-compile.go b/tools/protobuf-compile/protobuf-compile.go

Original file line number	Diff line number	Diff line change
`@@ -194,14 +194,10 @@ func (r AbsResource) absMoveableSigil() {`
`194`	`194`	`// AbsResource is moveable`
`195`	`195`	`}`
`196`	`196`
`197`		`-type absResourceKey string`
`198`		`-`
`199`	`197`	`func (r AbsResource) UniqueKey() UniqueKey {`
`200`	`198`	`return absResourceInstanceKey(r.String())`
`201`	`199`	`}`
`202`	`200`
`203`		`-func (rk absResourceKey) uniqueKeySigil() {}`
`204`		`-`
`205`	`201`	`// AbsResourceInstance is an absolute address for a resource instance under a`
`206`	`202`	`// given module path.`
`207`	`203`	`type AbsResourceInstance struct {`
Original file line number	Diff line number	Diff line change
`@@ -1594,7 +1594,7 @@ func TestRemote_applyVersionCheck(t *testing.T) {`
`1594`	`1594`	`}`
`1595`	`1595`
`1596`	`1596`	`// RUN: prepare the apply operation and run it`
`1597`		`- op, configCleanup, done := testOperationApply(t, "./testdata/apply")`
	`1597`	`+ op, configCleanup, _ := testOperationApply(t, "./testdata/apply")`
`1598`	`1598`	`defer configCleanup()`
`1599`	`1599`
`1600`	`1600`	`streams, done := terminal.StreamsForTesting(t)`
Original file line number	Diff line number	Diff line change
`@@ -1779,6 +1779,7 @@ func TestApply_terraformEnvNonDefault(t *testing.T) {`
`1779`	`1779`	`},`
`1780`	`1780`	`}`
`1781`	`1781`	`if code := newCmd.Run([]string{"test"}); code != 0 {`
	`1782`	`+ t.Fatal("error creating workspace")`
`1782`	`1783`	`}`
`1783`	`1784`	`}`
`1784`	`1785`
`@@ -1792,6 +1793,7 @@ func TestApply_terraformEnvNonDefault(t *testing.T) {`
`1792`	`1793`	`},`
`1793`	`1794`	`}`
`1794`	`1795`	`if code := selCmd.Run(args); code != 0 {`
	`1796`	`+ t.Fatal("error switching workspace")`
`1795`	`1797`	`}`
`1796`	`1798`	`}`
`1797`	`1799`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func ResourceChange(`
`70`	`70`	`buf.WriteString(color.Color(fmt.Sprintf("[bold] # %s[reset] will be [bold][red]destroyed", dispAddr)))`
`71`	`71`	`if change.DeposedKey != states.NotDeposed {`
`72`	`72`	`// Some extra context about this unusual situation.`
`73`		`- buf.WriteString(color.Color(fmt.Sprint("\n # (left over from a partially-failed replacement of this instance)")))`
	`73`	`+ buf.WriteString(color.Color("\n # (left over from a partially-failed replacement of this instance)"))`
`74`	`74`	`}`
`75`	`75`	`default:`
`76`	`76`	`// should never happen, since the above is exhaustive`
`@@ -755,8 +755,6 @@ func (p *blockBodyDiffPrinter) writeNestedAttrDiff(`
`755`	`755`	`p.buf.WriteString(" -> (known after apply)")`
`756`	`756`	`}`
`757`	`757`	`}`
`758`		`-`
`759`		`- return`
`760`	`758`	`}`
`761`	`759`
`762`	`760`	`func (p blockBodyDiffPrinter) writeNestedBlockDiffs(name string, blockS configschema.NestedBlock, old, new cty.Value, blankBefore bool, indent int, path cty.Path) int {`
Original file line number	Diff line number	Diff line change
`@@ -311,13 +311,9 @@ func (c *LoginCommand) outputDefaultTFELoginSuccess(dispHostname string) {`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`func (c *LoginCommand) outputDefaultTFCLoginSuccess() {`
`314`		`- c.Ui.Output(`
`315`		`- fmt.Sprintf(`
`316`		- c.Colorize().Color(strings.TrimSpace(`
	`314`	+ c.Ui.Output(c.Colorize().Color(strings.TrimSpace(`
`317`	`315`	`[green][bold]Success![reset] [bold]Logged in to Terraform Cloud[reset]`
`318`		-`)),
`319`		`- ) + "\n",`
`320`		`- )`
	`316`	+` + "\n")))
`321`	`317`	`}`
`322`	`318`
`323`	`319`	`func (c *LoginCommand) logMOTDError(err error) {`