Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hashicorp/terraform
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4986ce6ba84e038b396de855e13c39aed542847c
Choose a base ref
..
head repository: hashicorp/terraform
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b6df060a979cbb6757e4293ddd3ccca8b6dc430
Choose a head ref
Showing with 19 additions and 26 deletions.
  1. +19 −26 command/env_command_test.go
45 changes: 19 additions & 26 deletions command/env_command_test.go
Original file line number Diff line number Diff line change
@@ -9,17 +9,10 @@ import (
"testing"

"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/backend/local"
"github.com/hashicorp/terraform/state"
"github.com/hashicorp/terraform/terraform"
"github.com/mitchellh/cli"

localbackend "github.com/hashicorp/terraform/backend/local"
)

const (
defaultEnvDir = localbackend.DefaultEnvDir
DefaultEnvFile = localbackend.DefaultEnvFile
DefaultEnvName = backend.DefaultStateName
)

func TestEnv_createAndChange(t *testing.T) {
@@ -35,7 +28,7 @@ func TestEnv_createAndChange(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if current != DefaultEnvName {
if current != backend.DefaultStateName {
t.Fatal("current env should be 'default'")
}

@@ -54,7 +47,7 @@ func TestEnv_createAndChange(t *testing.T) {
t.Fatal("current env should be 'test'")
}

args = []string{DefaultEnvName}
args = []string{backend.DefaultStateName}
ui = new(cli.MockUi)
c.Meta = Meta{Ui: ui}
if code := c.Run(args); code != 0 {
@@ -66,7 +59,7 @@ func TestEnv_createAndChange(t *testing.T) {
t.Fatal(err)
}

if current != DefaultEnvName {
if current != backend.DefaultStateName {
t.Fatal("current env should be 'default'")
}

@@ -148,7 +141,7 @@ func TestEnv_createWithState(t *testing.T) {
t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter)
}

newPath := filepath.Join(defaultEnvDir, "test", DefaultStateFilename)
newPath := filepath.Join(local.DefaultEnvDir, "test", DefaultStateFilename)
envState := state.LocalState{Path: newPath}
err = envState.RefreshState()
if err != nil {
@@ -168,15 +161,15 @@ func TestEnv_delete(t *testing.T) {
defer testChdir(t, td)()

// create the env directories
if err := os.MkdirAll(filepath.Join(defaultEnvDir, "test"), 0755); err != nil {
if err := os.MkdirAll(filepath.Join(local.DefaultEnvDir, "test"), 0755); err != nil {
t.Fatal(err)
}

// create the environment file
if err := os.MkdirAll(DefaultDataDir, 0755); err != nil {
t.Fatal(err)
}
if err := ioutil.WriteFile(filepath.Join(DefaultDataDir, DefaultEnvFile), []byte("test"), 0644); err != nil {
if err := ioutil.WriteFile(filepath.Join(DefaultDataDir, local.DefaultEnvFile), []byte("test"), 0644); err != nil {
t.Fatal(err)
}

@@ -203,7 +196,7 @@ func TestEnv_delete(t *testing.T) {
t.Fatal(err)
}

if current != DefaultEnvName {
if current != backend.DefaultStateName {
t.Fatalf("wrong env: %q", current)
}
}
@@ -214,7 +207,7 @@ func TestEnv_deleteWithState(t *testing.T) {
defer testChdir(t, td)()

// create the env directories
if err := os.MkdirAll(filepath.Join(defaultEnvDir, "test"), 0755); err != nil {
if err := os.MkdirAll(filepath.Join(local.DefaultEnvDir, "test"), 0755); err != nil {
t.Fatal(err)
}

@@ -235,7 +228,7 @@ func TestEnv_deleteWithState(t *testing.T) {
},
}

envStatePath := filepath.Join(defaultEnvDir, "test", DefaultStateFilename)
envStatePath := filepath.Join(local.DefaultEnvDir, "test", DefaultStateFilename)
err := (&state.LocalState{Path: envStatePath}).WriteState(originalState)
if err != nil {
t.Fatal(err)
@@ -258,23 +251,23 @@ func TestEnv_deleteWithState(t *testing.T) {
t.Fatalf("failure: %s", ui.ErrorWriter)
}

if _, err := os.Stat(filepath.Join(defaultEnvDir, "test")); !os.IsNotExist(err) {
if _, err := os.Stat(filepath.Join(local.DefaultEnvDir, "test")); !os.IsNotExist(err) {
t.Fatal("env 'test' still exists!")
}
}

func currentEnv() (string, error) {
contents, err := ioutil.ReadFile(filepath.Join(DefaultDataDir, DefaultEnvFile))
contents, err := ioutil.ReadFile(filepath.Join(DefaultDataDir, local.DefaultEnvFile))
if os.IsNotExist(err) {
return DefaultEnvName, nil
return backend.DefaultStateName, nil
}
if err != nil {
return "", err
}

current := strings.TrimSpace(string(contents))
if current == "" {
current = DefaultEnvName
current = backend.DefaultStateName
}

return current, nil
@@ -286,18 +279,18 @@ func envStatePath() (string, error) {
return "", err
}

if currentEnv == DefaultEnvName {
if currentEnv == backend.DefaultStateName {
return DefaultStateFilename, nil
}

return filepath.Join(defaultEnvDir, currentEnv, DefaultStateFilename), nil
return filepath.Join(local.DefaultEnvDir, currentEnv, DefaultStateFilename), nil
}

func listEnvs() ([]string, error) {
entries, err := ioutil.ReadDir(defaultEnvDir)
entries, err := ioutil.ReadDir(local.DefaultEnvDir)
// no error if there's no envs configured
if os.IsNotExist(err) {
return []string{DefaultEnvName}, nil
return []string{backend.DefaultStateName}, nil
}
if err != nil {
return nil, err
@@ -313,7 +306,7 @@ func listEnvs() ([]string, error) {
sort.Strings(envs)

// always start with "default"
envs = append([]string{DefaultEnvName}, envs...)
envs = append([]string{backend.DefaultStateName}, envs...)

return envs, nil
}