From d749420a25041e18635c050cdadcbfe37275bbc8 Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Sun, 9 Sep 2018 10:18:08 -0700 Subject: [PATCH] Fix drift caused from gofmt when running make dev and go 1.11. A fresh checkout of `origin/master` does not build atm using the `dev` target because `master` has not been formatted using `gofmt` from Go 1.11 (tis has been the case for a while if you've been running devel). None of the drift in question is especially new but now that Go 1.11 has been released and gofmt's formatting guidelines have been updated, it would be *really* nice if the code in `master` reflected the current tooling in order to avoid having to fight this drift locally. * 8mo: https://github.com/hashicorp/terraform/blame/master/backend/remote-state/s3/backend_test.go#L260-L261 * 6mo: https://github.com/hashicorp/terraform/blame/master/builtin/provisioners/chef/linux_provisioner_test.go#L124 * 1yr: https://github.com/hashicorp/terraform/blame/7cfeffe36b0be61ca812d33995e184e02a76c0dc/command/init.go#L75-L76 * 12d: https://github.com/hashicorp/terraform/blame/7cfeffe36b0be61ca812d33995e184e02a76c0dc/command/meta_backend_test.go#L1437 * 2yr: https://github.com/hashicorp/terraform/blame/7cfeffe36b0be61ca812d33995e184e02a76c0dc/helper/schema/resource_timeout_test.go#L26 * 4yr: https://github.com/hashicorp/terraform/blame/7cfeffe36b0be61ca812d33995e184e02a76c0dc/helper/schema/schema_test.go#L2059 * 1yr: https://github.com/hashicorp/terraform/blame/7cfeffe36b0be61ca812d33995e184e02a76c0dc/plugin/discovery/get_test.go#L151 --- backend/remote-state/s3/backend_test.go | 4 ++-- builtin/provisioners/chef/linux_provisioner_test.go | 4 ++-- command/init.go | 4 ++-- command/meta_backend_test.go | 2 +- helper/schema/resource_timeout_test.go | 8 ++++---- helper/schema/schema_test.go | 2 +- plugin/discovery/get_test.go | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/remote-state/s3/backend_test.go b/backend/remote-state/s3/backend_test.go index e296cdc425..ae6ca34756 100644 --- a/backend/remote-state/s3/backend_test.go +++ b/backend/remote-state/s3/backend_test.go @@ -257,8 +257,8 @@ func TestBackendPrefixInWorkspace(t *testing.T) { bucketName := fmt.Sprintf("terraform-remote-s3-test-%x", time.Now().Unix()) b := backend.TestBackendConfig(t, New(), map[string]interface{}{ - "bucket": bucketName, - "key": "test-env.tfstate", + "bucket": bucketName, + "key": "test-env.tfstate", "workspace_key_prefix": "env", }).(*Backend) diff --git a/builtin/provisioners/chef/linux_provisioner_test.go b/builtin/provisioners/chef/linux_provisioner_test.go index aa5b93d1dc..d6fa7ab8d4 100644 --- a/builtin/provisioners/chef/linux_provisioner_test.go +++ b/builtin/provisioners/chef/linux_provisioner_test.go @@ -121,7 +121,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) { Commands: map[string]bool{ "curl -LO https://omnitruck.chef.io/install.sh": true, "bash ./install.sh -v \"11.18.6\" -c stable": true, - "rm -f install.sh": true, + "rm -f install.sh": true, }, }, @@ -140,7 +140,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) { Commands: map[string]bool{ "curl -LO https://omnitruck.chef.io/install.sh": true, "bash ./install.sh -v \"11.18.6\" -c current": true, - "rm -f install.sh": true, + "rm -f install.sh": true, }, }, } diff --git a/command/init.go b/command/init.go index c831566d9e..ecc4590919 100644 --- a/command/init.go +++ b/command/init.go @@ -72,8 +72,8 @@ func (c *InitCommand) Run(args []string) int { // set providerInstaller if we don't have a test version already if c.providerInstaller == nil { c.providerInstaller = &discovery.ProviderInstaller{ - Dir: c.pluginDir(), - Cache: c.pluginCache(), + Dir: c.pluginDir(), + Cache: c.pluginCache(), PluginProtocolVersion: plugin.Handshake.ProtocolVersion, SkipVerify: !flagVerifyPlugins, Ui: c.Ui, diff --git a/command/meta_backend_test.go b/command/meta_backend_test.go index 701403a05b..871ba5ce52 100644 --- a/command/meta_backend_test.go +++ b/command/meta_backend_test.go @@ -1434,7 +1434,7 @@ func TestMetaBackend_configuredChangeCopy_multiToNoDefaultWithDefault(t *testing // Ask input defer testInputMap(t, map[string]string{ "backend-migrate-multistate-to-multistate": "yes", - "new-state-name": "env1", + "new-state-name": "env1", })() // Setup the meta diff --git a/helper/schema/resource_timeout_test.go b/helper/schema/resource_timeout_test.go index ad036600b5..bef98071b7 100644 --- a/helper/schema/resource_timeout_test.go +++ b/helper/schema/resource_timeout_test.go @@ -23,28 +23,28 @@ func TestResourceTimeout_ConfigDecode_badkey(t *testing.T) { ShouldErr bool }{ { - Name: "Source does not define 'delete' key", + Name: "Source does not define 'delete' key", ResourceDefaultTimeout: timeoutForValues(10, 0, 5, 0, 0), Config: expectedConfigForValues(2, 0, 0, 1, 0), Expected: timeoutForValues(10, 0, 5, 0, 0), ShouldErr: true, }, { - Name: "Config overrides create", + Name: "Config overrides create", ResourceDefaultTimeout: timeoutForValues(10, 0, 5, 0, 0), Config: expectedConfigForValues(2, 0, 7, 0, 0), Expected: timeoutForValues(2, 0, 7, 0, 0), ShouldErr: false, }, { - Name: "Config overrides create, default provided. Should still have zero values", + Name: "Config overrides create, default provided. Should still have zero values", ResourceDefaultTimeout: timeoutForValues(10, 0, 5, 0, 3), Config: expectedConfigForValues(2, 0, 7, 0, 0), Expected: timeoutForValues(2, 0, 7, 0, 3), ShouldErr: false, }, { - Name: "Use something besides 'minutes'", + Name: "Use something besides 'minutes'", ResourceDefaultTimeout: timeoutForValues(10, 0, 5, 0, 3), Config: []map[string]interface{}{ map[string]interface{}{ diff --git a/helper/schema/schema_test.go b/helper/schema/schema_test.go index 820352aeaa..6863482a48 100644 --- a/helper/schema/schema_test.go +++ b/helper/schema/schema_test.go @@ -2056,7 +2056,7 @@ func TestSchemaMap_Diff(t *testing.T) { State: &terraform.InstanceState{ Attributes: map[string]string{ - "block_device.#": "2", + "block_device.#": "2", "block_device.616397234.delete_on_termination": "true", "block_device.616397234.device_name": "/dev/sda1", "block_device.2801811477.delete_on_termination": "true", diff --git a/plugin/discovery/get_test.go b/plugin/discovery/get_test.go index 65b2497aa6..1f123e1422 100644 --- a/plugin/discovery/get_test.go +++ b/plugin/discovery/get_test.go @@ -148,7 +148,7 @@ func TestProviderInstallerGet(t *testing.T) { // attempt to use an incompatible protocol version i := &ProviderInstaller{ - Dir: tmpDir, + Dir: tmpDir, PluginProtocolVersion: 5, SkipVerify: true, Ui: cli.NewMockUi(), @@ -159,7 +159,7 @@ func TestProviderInstallerGet(t *testing.T) { } i = &ProviderInstaller{ - Dir: tmpDir, + Dir: tmpDir, PluginProtocolVersion: 3, SkipVerify: true, Ui: cli.NewMockUi(), @@ -231,7 +231,7 @@ func TestProviderInstallerPurgeUnused(t *testing.T) { f.Close() i := &ProviderInstaller{ - Dir: tmpDir, + Dir: tmpDir, PluginProtocolVersion: 3, SkipVerify: true, Ui: cli.NewMockUi(),