Updates after running `make fmt` with Go v1.11.1
This commit is contained in:
parent
02e135bac8
commit
48ef7ecfa6
|
@ -1,12 +1,11 @@
|
|||
package local
|
||||
|
||||
import (
|
||||
"log"
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
"github.com/hashicorp/errwrap"
|
||||
|
||||
"github.com/hashicorp/terraform/backend"
|
||||
"github.com/hashicorp/terraform/command/clistate"
|
||||
"github.com/hashicorp/terraform/configs/configload"
|
||||
|
|
|
@ -130,4 +130,4 @@ func testTempDir(t *testing.T) string {
|
|||
func testStateFile(t *testing.T, path string, s *states.State) {
|
||||
stateFile := statemgr.NewFilesystem(path)
|
||||
stateFile.WriteState(s)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -254,8 +254,8 @@ func TestBackendPrefixInWorkspace(t *testing.T) {
|
|||
bucketName := fmt.Sprintf("terraform-remote-s3-test-%x", time.Now().Unix())
|
||||
|
||||
b := backend.TestBackendConfig(t, New(), backend.TestWrapConfig(map[string]interface{}{
|
||||
"bucket": bucketName,
|
||||
"key": "test-env.tfstate",
|
||||
"bucket": bucketName,
|
||||
"key": "test-env.tfstate",
|
||||
"workspace_key_prefix": "env",
|
||||
})).(*Backend)
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ import (
|
|||
)
|
||||
|
||||
func TestObjectValueIDOrName(t *testing.T) {
|
||||
tests := []struct{
|
||||
tests := []struct {
|
||||
obj cty.Value
|
||||
id [2]string
|
||||
name [2]string
|
||||
|
@ -34,7 +34,7 @@ func TestObjectValueIDOrName(t *testing.T) {
|
|||
},
|
||||
{
|
||||
cty.ObjectVal(map[string]cty.Value{
|
||||
"id": cty.StringVal("foo-123"),
|
||||
"id": cty.StringVal("foo-123"),
|
||||
}),
|
||||
[...]string{"id", "foo-123"},
|
||||
[...]string{"", ""},
|
||||
|
@ -95,7 +95,7 @@ func TestObjectValueIDOrName(t *testing.T) {
|
|||
// in this formatter, this is the place to add a new test case.
|
||||
{
|
||||
cty.ObjectVal(map[string]cty.Value{
|
||||
"id": cty.True,
|
||||
"id": cty.True,
|
||||
}),
|
||||
[...]string{"", ""},
|
||||
[...]string{"", ""},
|
||||
|
@ -103,7 +103,7 @@ func TestObjectValueIDOrName(t *testing.T) {
|
|||
},
|
||||
{
|
||||
cty.ObjectVal(map[string]cty.Value{
|
||||
"id": cty.NullVal(cty.String),
|
||||
"id": cty.NullVal(cty.String),
|
||||
}),
|
||||
[...]string{"", ""},
|
||||
[...]string{"", ""},
|
||||
|
@ -111,7 +111,7 @@ func TestObjectValueIDOrName(t *testing.T) {
|
|||
},
|
||||
{
|
||||
cty.ObjectVal(map[string]cty.Value{
|
||||
"id": cty.UnknownVal(cty.String),
|
||||
"id": cty.UnknownVal(cty.String),
|
||||
}),
|
||||
[...]string{"", ""},
|
||||
[...]string{"", ""},
|
||||
|
@ -172,9 +172,9 @@ func TestObjectValueIDOrName(t *testing.T) {
|
|||
[...]string{"", ""},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(fmt.Sprintf("%#v", test.obj), func (t *testing.T) {
|
||||
t.Run(fmt.Sprintf("%#v", test.obj), func(t *testing.T) {
|
||||
obj := test.obj
|
||||
gotIDKey, gotIDVal := ObjectValueID(obj)
|
||||
gotNameKey, gotNameVal := ObjectValueName(obj)
|
||||
|
|
|
@ -5,13 +5,13 @@ import (
|
|||
"net"
|
||||
"time"
|
||||
|
||||
"google.golang.org/grpc/test/bufconn"
|
||||
"github.com/hashicorp/terraform/helper/plugin"
|
||||
tfplugin "github.com/hashicorp/terraform/plugin"
|
||||
"github.com/hashicorp/terraform/plugin/proto"
|
||||
"github.com/hashicorp/terraform/providers"
|
||||
"github.com/hashicorp/terraform/terraform"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/test/bufconn"
|
||||
)
|
||||
|
||||
// GRPCTestProvider takes a legacy ResourceProvider, wraps it in the new GRPC
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package resource
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"bufio"
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"sort"
|
||||
|
|
|
@ -297,7 +297,7 @@ func WholeContainingBody(severity Severity, summary, detail string) Diagnostic {
|
|||
|
||||
type wholeBodyDiagnostic struct {
|
||||
diagnosticBase
|
||||
subject *SourceRange // populated only after ElaborateFromConfigBody
|
||||
subject *SourceRange // populated only after ElaborateFromConfigBody
|
||||
}
|
||||
|
||||
func (d *wholeBodyDiagnostic) ElaborateFromConfigBody(body hcl.Body) Diagnostic {
|
||||
|
|
Loading…
Reference in New Issue