diff --git a/backend/cli.go b/backend/cli.go index 40a66e6985..b76b6e1116 100644 --- a/backend/cli.go +++ b/backend/cli.go @@ -22,7 +22,7 @@ import ( type CLI interface { Backend - // CLIIinit is called once with options. The options passed to this + // CLIInit is called once with options. The options passed to this // function may not be modified after calling this since they can be // read/written at any time by the Backend implementation. // diff --git a/backend/init/init.go b/backend/init/init.go index d499968c74..aeadb779fc 100644 --- a/backend/init/init.go +++ b/backend/init/init.go @@ -8,14 +8,14 @@ import ( "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/terraform" - backendatlas "github.com/hashicorp/terraform/backend/atlas" - backendlegacy "github.com/hashicorp/terraform/backend/legacy" - backendlocal "github.com/hashicorp/terraform/backend/local" + backendAtlas "github.com/hashicorp/terraform/backend/atlas" + backendLegacy "github.com/hashicorp/terraform/backend/legacy" + backendLocal "github.com/hashicorp/terraform/backend/local" backendAzure "github.com/hashicorp/terraform/backend/remote-state/azure" - backendconsul "github.com/hashicorp/terraform/backend/remote-state/consul" - backendetcdv3 "github.com/hashicorp/terraform/backend/remote-state/etcdv3" + backendConsul "github.com/hashicorp/terraform/backend/remote-state/consul" + backendEtcdv3 "github.com/hashicorp/terraform/backend/remote-state/etcdv3" backendGCS "github.com/hashicorp/terraform/backend/remote-state/gcs" - backendinmem "github.com/hashicorp/terraform/backend/remote-state/inmem" + backendInmem "github.com/hashicorp/terraform/backend/remote-state/inmem" backendManta "github.com/hashicorp/terraform/backend/remote-state/manta" backendS3 "github.com/hashicorp/terraform/backend/remote-state/s3" backendSwift "github.com/hashicorp/terraform/backend/remote-state/swift" @@ -39,23 +39,23 @@ func init() { // Our hardcoded backends. We don't need to acquire a lock here // since init() code is serial and can't spawn goroutines. backends = map[string]func() backend.Backend{ - "atlas": func() backend.Backend { return &backendatlas.Backend{} }, - "local": func() backend.Backend { return &backendlocal.Local{} }, - "consul": func() backend.Backend { return backendconsul.New() }, - "inmem": func() backend.Backend { return backendinmem.New() }, - "swift": func() backend.Backend { return backendSwift.New() }, - "s3": func() backend.Backend { return backendS3.New() }, + "local": func() backend.Backend { return &backendLocal.Local{} }, + "atlas": func() backend.Backend { return &backendAtlas.Backend{} }, "azure": deprecateBackend(backendAzure.New(), `Warning: "azure" name is deprecated, please use "azurerm"`), "azurerm": func() backend.Backend { return backendAzure.New() }, - "etcdv3": func() backend.Backend { return backendetcdv3.New() }, + "consul": func() backend.Backend { return backendConsul.New() }, + "etcdv3": func() backend.Backend { return backendEtcdv3.New() }, "gcs": func() backend.Backend { return backendGCS.New() }, + "inmem": func() backend.Backend { return backendInmem.New() }, "manta": func() backend.Backend { return backendManta.New() }, + "s3": func() backend.Backend { return backendS3.New() }, + "swift": func() backend.Backend { return backendSwift.New() }, } - // Add the legacy remote backends that haven't yet been convertd to + // Add the legacy remote backends that haven't yet been converted to // the new backend API. - backendlegacy.Init(backends) + backendLegacy.Init(backends) } // Backend returns the initialization factory for the given backend, or diff --git a/builtin/providers/terraform/data_source_state.go b/builtin/providers/terraform/data_source_state.go index 1eefe9e8da..e7bf54f289 100644 --- a/builtin/providers/terraform/data_source_state.go +++ b/builtin/providers/terraform/data_source_state.go @@ -6,7 +6,7 @@ import ( "time" "github.com/hashicorp/terraform/backend" - backendinit "github.com/hashicorp/terraform/backend/init" + backendInit "github.com/hashicorp/terraform/backend/init" "github.com/hashicorp/terraform/config" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" @@ -80,7 +80,7 @@ func dataSourceRemoteStateRead(d *schema.ResourceData, meta interface{}) error { // Create the client to access our remote state log.Printf("[DEBUG] Initializing remote state backend: %s", backendType) - f := backendinit.Backend(backendType) + f := backendInit.Backend(backendType) if f == nil { return fmt.Errorf("Unknown backend type: %s", backendType) } diff --git a/builtin/providers/terraform/data_source_state_test.go b/builtin/providers/terraform/data_source_state_test.go index 9b2040e823..edca009229 100644 --- a/builtin/providers/terraform/data_source_state_test.go +++ b/builtin/providers/terraform/data_source_state_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - backendinit "github.com/hashicorp/terraform/backend/init" + backendInit "github.com/hashicorp/terraform/backend/init" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) @@ -26,8 +26,8 @@ func TestState_basic(t *testing.T) { } func TestState_backends(t *testing.T) { - backendinit.Set("_ds_test", backendinit.Backend("local")) - defer backendinit.Set("_ds_test", nil) + backendInit.Set("_ds_test", backendInit.Backend("local")) + defer backendInit.Set("_ds_test", nil) resource.UnitTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/command/meta_backend.go b/command/meta_backend.go index f5cb034e7e..73d346950d 100644 --- a/command/meta_backend.go +++ b/command/meta_backend.go @@ -21,8 +21,8 @@ import ( "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/mapstructure" - backendinit "github.com/hashicorp/terraform/backend/init" - backendlocal "github.com/hashicorp/terraform/backend/local" + backendInit "github.com/hashicorp/terraform/backend/init" + backendLocal "github.com/hashicorp/terraform/backend/local" ) // BackendOpts are the options used to initialize a backend.Backend. @@ -94,7 +94,7 @@ func (m *Meta) Backend(opts *BackendOpts) (backend.Enhanced, error) { log.Printf("[INFO] command: backend initialized: %T", b) } - // Setup the CLI opts we pass into backends that support it + // Setup the CLI opts we pass into backends that support it. cliOpts := &backend.CLIOpts{ CLI: m.Ui, CLIColor: m.Colorize(), @@ -106,7 +106,7 @@ func (m *Meta) Backend(opts *BackendOpts) (backend.Enhanced, error) { RunningInAutomation: m.RunningInAutomation, } - // Don't validate if we have a plan. Validation is normally harmless here, + // Don't validate if we have a plan. Validation is normally harmless here, // but validation requires interpolation, and `file()` function calls may // not have the original files in the current execution context. cliOpts.Validation = opts.Plan == nil @@ -136,7 +136,7 @@ func (m *Meta) Backend(opts *BackendOpts) (backend.Enhanced, error) { } // Build the local backend - local := &backendlocal.Local{Backend: b} + local := &backendLocal.Local{Backend: b} if err := local.CLIInit(cliOpts); err != nil { // Local backend isn't allowed to fail. It would be a bug. panic(err) @@ -149,7 +149,7 @@ func (m *Meta) Backend(opts *BackendOpts) (backend.Enhanced, error) { // for some checks that require a remote backend. func (m *Meta) IsLocalBackend(b backend.Backend) bool { // Is it a local backend? - bLocal, ok := b.(*backendlocal.Local) + bLocal, ok := b.(*backendLocal.Local) // If it is, does it not have an alternate state backend? if ok { @@ -231,7 +231,7 @@ func (m *Meta) backendConfig(opts *BackendOpts) (*config.Backend, error) { rc, err := config.NewRawConfig(opts.ConfigExtra) if err != nil { return nil, fmt.Errorf( - "Error adding extra configuration file for backend: %s", err) + "Error adding extra backend configuration from CLI: %s", err) } // Merge in the configuration @@ -739,7 +739,7 @@ func (m *Meta) backend_c_R_s( config := terraform.NewResourceConfig(rawC) // Get the backend - f := backendinit.Backend(s.Remote.Type) + f := backendInit.Backend(s.Remote.Type) if f == nil { return nil, fmt.Errorf(strings.TrimSpace(errBackendLegacyUnknown), s.Remote.Type) } @@ -937,8 +937,8 @@ func (m *Meta) backend_C_r_s( // can get us here too. Don't delete our state if the old and new paths // are the same. erase := true - if newLocalB, ok := b.(*backendlocal.Local); ok { - if localB, ok := localB.(*backendlocal.Local); ok { + if newLocalB, ok := b.(*backendLocal.Local); ok { + if localB, ok := localB.(*backendLocal.Local); ok { if newLocalB.StatePath == localB.StatePath { erase = false } @@ -1091,7 +1091,7 @@ func (m *Meta) backend_C_r_S_unchanged( config := terraform.NewResourceConfig(rawC) // Get the backend - f := backendinit.Backend(s.Backend.Type) + f := backendInit.Backend(s.Backend.Type) if f == nil { return nil, fmt.Errorf(strings.TrimSpace(errBackendSavedUnknown), s.Backend.Type) } @@ -1208,7 +1208,7 @@ func (m *Meta) backendInitFromConfig(c *config.Backend) (backend.Backend, error) config := terraform.NewResourceConfig(c.RawConfig) // Get the backend - f := backendinit.Backend(c.Type) + f := backendInit.Backend(c.Type) if f == nil { return nil, fmt.Errorf(strings.TrimSpace(errBackendNewUnknown), c.Type) } @@ -1265,7 +1265,7 @@ func (m *Meta) backendInitFromLegacy(s *terraform.RemoteState) (backend.Backend, config := terraform.NewResourceConfig(rawC) // Get the backend - f := backendinit.Backend(s.Type) + f := backendInit.Backend(s.Type) if f == nil { return nil, fmt.Errorf(strings.TrimSpace(errBackendLegacyUnknown), s.Type) } @@ -1290,7 +1290,7 @@ func (m *Meta) backendInitFromSaved(s *terraform.BackendState) (backend.Backend, config := terraform.NewResourceConfig(rawC) // Get the backend - f := backendinit.Backend(s.Type) + f := backendInit.Backend(s.Type) if f == nil { return nil, fmt.Errorf(strings.TrimSpace(errBackendSavedUnknown), s.Type) } diff --git a/command/meta_backend_test.go b/command/meta_backend_test.go index 8f059693ce..e3e735fdd7 100644 --- a/command/meta_backend_test.go +++ b/command/meta_backend_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/hashicorp/terraform/backend" - backendinit "github.com/hashicorp/terraform/backend/init" - backendlocal "github.com/hashicorp/terraform/backend/local" + backendInit "github.com/hashicorp/terraform/backend/init" + backendLocal "github.com/hashicorp/terraform/backend/local" "github.com/hashicorp/terraform/helper/copy" "github.com/hashicorp/terraform/state" "github.com/hashicorp/terraform/terraform" @@ -994,8 +994,8 @@ func TestMetaBackend_reconfigureChange(t *testing.T) { defer testChdir(t, td)() // Register the single-state backend - backendinit.Set("local-single", backendlocal.TestNewLocalSingle) - defer backendinit.Set("local-single", nil) + backendInit.Set("local-single", backendLocal.TestNewLocalSingle) + defer backendInit.Set("local-single", nil) // Setup the meta m := testMetaBackend(t, nil) @@ -1093,8 +1093,8 @@ func TestMetaBackend_configuredChangeCopy_singleState(t *testing.T) { defer testChdir(t, td)() // Register the single-state backend - backendinit.Set("local-single", backendlocal.TestNewLocalSingle) - defer backendinit.Set("local-single", nil) + backendInit.Set("local-single", backendLocal.TestNewLocalSingle) + defer backendInit.Set("local-single", nil) // Ask input defer testInputMap(t, map[string]string{ @@ -1149,8 +1149,8 @@ func TestMetaBackend_configuredChangeCopy_multiToSingleDefault(t *testing.T) { defer testChdir(t, td)() // Register the single-state backend - backendinit.Set("local-single", backendlocal.TestNewLocalSingle) - defer backendinit.Set("local-single", nil) + backendInit.Set("local-single", backendLocal.TestNewLocalSingle) + defer backendInit.Set("local-single", nil) // Ask input defer testInputMap(t, map[string]string{ @@ -1204,8 +1204,8 @@ func TestMetaBackend_configuredChangeCopy_multiToSingle(t *testing.T) { defer testChdir(t, td)() // Register the single-state backend - backendinit.Set("local-single", backendlocal.TestNewLocalSingle) - defer backendinit.Set("local-single", nil) + backendInit.Set("local-single", backendLocal.TestNewLocalSingle) + defer backendInit.Set("local-single", nil) // Ask input defer testInputMap(t, map[string]string{ @@ -1250,7 +1250,7 @@ func TestMetaBackend_configuredChangeCopy_multiToSingle(t *testing.T) { } // Verify existing workspaces exist - envPath := filepath.Join(backendlocal.DefaultWorkspaceDir, "env2", backendlocal.DefaultStateFilename) + envPath := filepath.Join(backendLocal.DefaultWorkspaceDir, "env2", backendLocal.DefaultStateFilename) if _, err := os.Stat(envPath); err != nil { t.Fatal("env should exist") } @@ -1271,8 +1271,8 @@ func TestMetaBackend_configuredChangeCopy_multiToSingleCurrentEnv(t *testing.T) defer testChdir(t, td)() // Register the single-state backend - backendinit.Set("local-single", backendlocal.TestNewLocalSingle) - defer backendinit.Set("local-single", nil) + backendInit.Set("local-single", backendLocal.TestNewLocalSingle) + defer backendInit.Set("local-single", nil) // Ask input defer testInputMap(t, map[string]string{ @@ -1322,7 +1322,7 @@ func TestMetaBackend_configuredChangeCopy_multiToSingleCurrentEnv(t *testing.T) } // Verify existing workspaces exist - envPath := filepath.Join(backendlocal.DefaultWorkspaceDir, "env2", backendlocal.DefaultStateFilename) + envPath := filepath.Join(backendLocal.DefaultWorkspaceDir, "env2", backendLocal.DefaultStateFilename) if _, err := os.Stat(envPath); err != nil { t.Fatal("env should exist") } @@ -1407,7 +1407,7 @@ func TestMetaBackend_configuredChangeCopy_multiToMulti(t *testing.T) { { // Verify existing workspaces exist - envPath := filepath.Join(backendlocal.DefaultWorkspaceDir, "env2", backendlocal.DefaultStateFilename) + envPath := filepath.Join(backendLocal.DefaultWorkspaceDir, "env2", backendLocal.DefaultStateFilename) if _, err := os.Stat(envPath); err != nil { t.Fatal("env should exist") } @@ -1415,7 +1415,7 @@ func TestMetaBackend_configuredChangeCopy_multiToMulti(t *testing.T) { { // Verify new workspaces exist - envPath := filepath.Join("envdir-new", "env2", backendlocal.DefaultStateFilename) + envPath := filepath.Join("envdir-new", "env2", backendLocal.DefaultStateFilename) if _, err := os.Stat(envPath); err != nil { t.Fatal("env should exist") } @@ -3351,7 +3351,7 @@ func TestMetaBackend_configureWithExtra(t *testing.T) { } // Check the state - s := testStateRead(t, filepath.Join(DefaultDataDir, backendlocal.DefaultStateFilename)) + s := testStateRead(t, filepath.Join(DefaultDataDir, backendLocal.DefaultStateFilename)) if s.Backend.Hash != backendCfg.Hash { t.Fatal("mismatched state and config backend hashes") } @@ -3373,7 +3373,7 @@ func TestMetaBackend_configureWithExtra(t *testing.T) { } // Check the state - s = testStateRead(t, filepath.Join(DefaultDataDir, backendlocal.DefaultStateFilename)) + s = testStateRead(t, filepath.Join(DefaultDataDir, backendLocal.DefaultStateFilename)) if s.Backend.Hash != backendCfg.Hash { t.Fatal("mismatched state and config backend hashes") } @@ -3442,7 +3442,7 @@ func TestMetaBackend_configToExtra(t *testing.T) { } // Check the state - s := testStateRead(t, filepath.Join(DefaultDataDir, backendlocal.DefaultStateFilename)) + s := testStateRead(t, filepath.Join(DefaultDataDir, backendLocal.DefaultStateFilename)) backendHash := s.Backend.Hash // init again but remove the path option from the config @@ -3463,7 +3463,7 @@ func TestMetaBackend_configToExtra(t *testing.T) { t.Fatalf("bad: %s", err) } - s = testStateRead(t, filepath.Join(DefaultDataDir, backendlocal.DefaultStateFilename)) + s = testStateRead(t, filepath.Join(DefaultDataDir, backendLocal.DefaultStateFilename)) if s.Backend.Hash == backendHash { t.Fatal("state.Backend.Hash was not updated") diff --git a/command/state_meta.go b/command/state_meta.go index aa79e9d47e..a1648358bd 100644 --- a/command/state_meta.go +++ b/command/state_meta.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - backendlocal "github.com/hashicorp/terraform/backend/local" + backendLocal "github.com/hashicorp/terraform/backend/local" "github.com/hashicorp/terraform/state" "github.com/hashicorp/terraform/terraform" ) @@ -49,7 +49,7 @@ func (c *StateMeta) State() (state.State, error) { // This should never fail panic(err) } - localB := localRaw.(*backendlocal.Local) + localB := localRaw.(*backendLocal.Local) _, stateOutPath, _ = localB.StatePaths(env) if err != nil { return nil, err