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

clarifying tests and using SplitN in implementation

This commit is contained in:
rv-jmaggio 2017-12-18 16:24:34 -05:00
parent 7f8d686074
commit b02a1c8a46
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ func getWorkspaceForKey(key string, b *Backend) string {
return ""
}
parts = strings.Split(parts[1], "/")
parts = strings.SplitN(parts[1], "/", 3)
if len(parts) < 3 {
return ""

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

@ -252,29 +252,26 @@ func TestBackendExtraPaths(t *testing.T) {
func TestKeyEnv(t *testing.T) {
testACC(t)
bucketName := fmt.Sprintf("terraform-remote-s3-test-%x", time.Now().Unix())
keyName0 := "tfstate"
keyName1 := "ws1/tfstate"
keyName2 := "ws1/env1/tfstate"
keyName := "tfstate"
b0 := backend.TestBackendConfig(t, New(), map[string]interface{}{
"bucket": bucketName,
"key": keyName0,
"key": keyName,
"encrypt": true,
"workspace_key_prefix": "",
}).(*Backend)
b1 := backend.TestBackendConfig(t, New(), map[string]interface{}{
"bucket": bucketName,
"key": keyName1,
"key": keyName,
"encrypt": true,
"workspace_key_prefix": "root/userA",
"workspace_key_prefix": "project/env:",
}).(*Backend)
b2 := backend.TestBackendConfig(t, New(), map[string]interface{}{
"bucket": bucketName,
"key": keyName2,
"encrypt": true,
"workspace_key_prefix": "root/userA",
"bucket": bucketName,
"key": keyName,
"encrypt": true,
}).(*Backend)
if err := testGetWorkspaceForKey(b0, "tfstate", ""); err != nil {
@ -285,17 +282,21 @@ func TestKeyEnv(t *testing.T) {
t.Fatal(err)
}
if err := testGetWorkspaceForKey(b1, "root/userA/ws1/tfstate", "ws1"); err != nil {
if err := testGetWorkspaceForKey(b1, "project/env:/ws1/tfstate", "ws1"); err != nil {
t.Fatal(err)
}
if err := testGetWorkspaceForKey(b1, "root/userA/ws2/tfstate", "ws2"); err != nil {
if err := testGetWorkspaceForKey(b1, "project/env:/ws2/tfstate", "ws2"); err != nil {
t.Fatal(err)
}
if err := testGetWorkspaceForKey(b2, "root/userA/ws2/env1/tfstate", "ws2"); err != nil {
if err := testGetWorkspaceForKey(b2, "env:/ws3/tfstate", "ws3"); err != nil {
t.Fatal(err)
}
backend.TestBackend(t, b0, nil)
backend.TestBackend(t, b1, nil)
backend.TestBackend(t, b2, nil)
}
func testGetWorkspaceForKey(b *Backend, key string, expected string) error {