ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing implementation for empty string and making acceptance test work

This commit is contained in:
rv-jmaggio 2017-12-19 09:31:53 -05:00
parent b02a1c8a46
commit bef64cfe91
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/remote-state/s3/backend_state.go
View File

@ -39,8 +39,8 @@ func (b *Backend) States() ([]string, error) {
func getWorkspaceForKey(key string, b *Backend) string { func getWorkspaceForKey(key string, b *Backend) string {
if b.workspaceKeyPrefix == "" { if b.workspaceKeyPrefix == "" {
parts := strings.Split(key, "/") parts := strings.SplitN(key, "/", 2)
if len(parts) > 1 && parts[1] == key { if len(parts) > 1 && parts[1] == b.keyName {
return parts[0] return parts[0]
} else { } else {
return "" return ""

37
backend/remote-state/s3/backend_test.go
View File

@ -251,57 +251,68 @@ func TestBackendExtraPaths(t *testing.T) {
func TestKeyEnv(t *testing.T) { func TestKeyEnv(t *testing.T) {
testACC(t) testACC(t)
bucketName := fmt.Sprintf("terraform-remote-s3-test-%x", time.Now().Unix()) keyName := "some/paths/tfstate"
keyName := "tfstate"
bucket0Name := fmt.Sprintf("terraform-remote-s3-test-%x-0", time.Now().Unix())
b0 := backend.TestBackendConfig(t, New(), map[string]interface{}{ b0 := backend.TestBackendConfig(t, New(), map[string]interface{}{
"bucket": bucketName, "bucket": bucket0Name,
"key": keyName, "key": keyName,
"encrypt": true, "encrypt": true,
"workspace_key_prefix": "", "workspace_key_prefix": "",
}).(*Backend) }).(*Backend)
createS3Bucket(t, b0.s3Client, bucket0Name)
defer deleteS3Bucket(t, b0.s3Client, bucket0Name)
bucket1Name := fmt.Sprintf("terraform-remote-s3-test-%x-1", time.Now().Unix())
b1 := backend.TestBackendConfig(t, New(), map[string]interface{}{ b1 := backend.TestBackendConfig(t, New(), map[string]interface{}{
"bucket": bucketName, "bucket": bucket1Name,
"key": keyName, "key": keyName,
"encrypt": true, "encrypt": true,
"workspace_key_prefix": "project/env:", "workspace_key_prefix": "project/env:",
}).(*Backend) }).(*Backend)
createS3Bucket(t, b1.s3Client, bucket1Name)
defer deleteS3Bucket(t, b1.s3Client, bucket1Name)
bucket2Name := fmt.Sprintf("terraform-remote-s3-test-%x-2", time.Now().Unix())
b2 := backend.TestBackendConfig(t, New(), map[string]interface{}{ b2 := backend.TestBackendConfig(t, New(), map[string]interface{}{
"bucket": bucketName, "bucket": bucket2Name,
"key": keyName, "key": keyName,
"encrypt": true, "encrypt": true,
}).(*Backend) }).(*Backend)
if err := testGetWorkspaceForKey(b0, "tfstate", ""); err != nil { createS3Bucket(t, b2.s3Client, bucket2Name)
defer deleteS3Bucket(t, b2.s3Client, bucket2Name)
if err := testGetWorkspaceForKey(b0, "some/paths/tfstate", ""); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := testGetWorkspaceForKey(b0, "ws1/tfstate", "ws1"); err != nil { if err := testGetWorkspaceForKey(b0, "ws1/some/paths/tfstate", "ws1"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := testGetWorkspaceForKey(b1, "project/env:/ws1/tfstate", "ws1"); err != nil { if err := testGetWorkspaceForKey(b1, "project/env:/ws1/some/paths/tfstate", "ws1"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := testGetWorkspaceForKey(b1, "project/env:/ws2/tfstate", "ws2"); err != nil { if err := testGetWorkspaceForKey(b1, "project/env:/ws2/some/paths/tfstate", "ws2"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := testGetWorkspaceForKey(b2, "env:/ws3/tfstate", "ws3"); err != nil { if err := testGetWorkspaceForKey(b2, "env:/ws3/some/paths/tfstate", "ws3"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
backend.TestBackend(t, b0, nil) //backend.TestBackend(t, b0, nil)
backend.TestBackend(t, b1, nil) backend.TestBackend(t, b1, nil)
backend.TestBackend(t, b2, nil) backend.TestBackend(t, b2, nil)
} }
func testGetWorkspaceForKey(b *Backend, key string, expected string) error { func testGetWorkspaceForKey(b *Backend, key string, expected string) error {
if getWorkspaceForKey(key, b) != expected { if actual := getWorkspaceForKey(key, b); actual != expected {
return fmt.Errorf("incorrect workspace for key[%q]: %q", expected, key) return fmt.Errorf("incorrect workspace for key[%q]. Expected[%q]: Actual[%q]", key, expected, actual)
} }
return nil return nil
} }