Merge pull request #1505 from amangale/patch-4

Use HasSuffix to check for suffix

Author: denis256

modules/terraform/workspace.go

@@ -1,8 +1,6 @@
 package terraform
 
 import (
-	"fmt"
-	"regexp"
 	"strings"
 
 	"github.com/gruntwork-io/terratest/modules/testing"
@@ -44,24 +42,13 @@ func WorkspaceSelectOrNewE(t testing.TestingT, options *Options, name string) (s
 func isExistingWorkspace(out string, name string) bool {
 	workspaces := strings.Split(out, "\n")
 	for _, ws := range workspaces {
-		if nameMatchesWorkspace(name, ws) {
+		if strings.HasSuffix(ws, name) {
 			return true
 		}
 	}
 	return false
 }
 
-func nameMatchesWorkspace(name string, workspace string) bool {
-	// Regex for matching workspace should match for strings with optional leading asterisk "*"
-	// following optional white spaces following the workspace name.
-	// E.g. for the given name "terratest", following strings will match:
-	//
-	//    "* terratest"
-	//    "  terratest"
-	match, _ := regexp.MatchString(fmt.Sprintf("^\\*?\\s*%s$", name), workspace)
-	return match
-}
-
 // WorkspaceDelete removes the specified terraform workspace with the given options.
 // It returns the name of the current workspace AFTER deletion, and the returned error (that can be nil).
 // If the workspace to delete is the current one, then it tries to switch to the "default" workspace.

modules/terraform/workspace_test.go

@@ -108,31 +108,6 @@ func TestIsExistingWorkspace(t *testing.T) {
 	}
 }
 
-func TestNameMatchesWorkspace(t *testing.T) {
-	t.Parallel()
-
-	testCases := []struct {
-		name      string
-		workspace string
-		expected  bool
-	}{
-		{"default", "  default", true},
-		{"default", "* default", true},
-		{"default", "", false},
-		{"foo", "  foobar", false},
-		{"foo", "* foobar", false},
-		{"foobar", "  foo", false},
-		{"foobar", "* foo", false},
-		{"foo", "  foo", true},
-		{"foo", "* foo", true},
-	}
-
-	for _, testCase := range testCases {
-		actual := nameMatchesWorkspace(testCase.name, testCase.workspace)
-		assert.Equal(t, testCase.expected, actual, "Name: %q, Workspace: %q", testCase.name, testCase.workspace)
-	}
-}
-
 func TestWorkspaceDeleteE(t *testing.T) {
 	t.Parallel()