Merge pull request #138 from terraform-providers/nicsnet/bugfix-clean…

…up-trigger-prefixes-for-workspaces Reset trigger prefixes for workspace resources when removed from the config
hashicorp · Mar 4, 2020 · d6a785b · d6a785b
2 parents 05f467a + 487bec8
commit d6a785b
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
-## 0.15.0 (Unreleased)
+## 0.14.1 (Unreleased)
+BUG FIXES:
+
+* t/tfe_workspace: Issues with updating `working_directory` ([[#137](https://github.com/terraform-providers/terraform-provider-tfe/pull/137)]) 
+  and `trigger_prefixes` ([[#138](https://github.com/terraform-providers/terraform-provider-tfe/pull/138)]) when removed from the configuration. 
+  Special note: if you have workspaces which are configured through the TFE provider, but have set the working directory or trigger prefixes manually, through the UI, you'll need to update your configuration.
+
 ## 0.14.0 (February 20, 2020)
 
 FEATURES:

diff --git a/tfe/resource_tfe_workspace.go b/tfe/resource_tfe_workspace.go
@@ -330,6 +330,9 @@ func resourceTFEWorkspaceUpdate(d *schema.ResourceData, meta interface{}) error
 			for _, tp := range tps.([]interface{}) {
 				options.TriggerPrefixes = append(options.TriggerPrefixes, tp.(string))
 			}
+		} else {
+			// Reset trigger prefixes when none are present in the config.
+			options.TriggerPrefixes = []string{}
 		}
 
 		if workingDir, ok := d.GetOk("working_directory"); ok {

diff --git a/tfe/resource_tfe_workspace_test.go b/tfe/resource_tfe_workspace_test.go
@@ -353,6 +353,42 @@ func TestAccTFEWorkspace_updateFileTriggers(t *testing.T) {
 	})
 }
 
+func TestAccTFEWorkspace_updateTriggerPrefixes(t *testing.T) {
+	workspace := &tfe.Workspace{}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckTFEWorkspaceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccTFEWorkspace_triggerPrefixes,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTFEWorkspaceExists(
+						"tfe_workspace.foobar", workspace),
+					resource.TestCheckResourceAttr(
+						"tfe_workspace.foobar", "trigger_prefixes.#", "2"),
+					resource.TestCheckResourceAttr(
+						"tfe_workspace.foobar", "trigger_prefixes.0", "/modules"),
+					resource.TestCheckResourceAttr(
+						"tfe_workspace.foobar", "trigger_prefixes.1", "/shared"),
+				),
+			},
+
+			{
+				Config: testAccTFEWorkspace_updateEmptyTriggerPrefixes,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTFEWorkspaceExists(
+						"tfe_workspace.foobar", workspace),
+					testAccCheckTFEWorkspaceAttributes(workspace),
+					resource.TestCheckResourceAttr(
+						"tfe_workspace.foobar", "trigger_prefixes.#", "0"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccTFEWorkspace_sshKey(t *testing.T) {
 	workspace := &tfe.Workspace{}
 
@@ -479,6 +515,10 @@ func testAccCheckTFEWorkspaceAttributes(
 			return fmt.Errorf("Bad working directory: %s", workspace.WorkingDirectory)
 		}
 
+		if len(workspace.TriggerPrefixes) != 0 {
+			return fmt.Errorf("Bad trigger prefixes: %s", workspace.TriggerPrefixes)
+		}
+
 		return nil
 	}
 }
@@ -695,6 +735,7 @@ resource "tfe_workspace" "foobar" {
   terraform_version     = "0.11.1"
   trigger_prefixes      = ["/modules", "/shared"]
   working_directory     = "terraform/test"
+  operations            = false
 }`
 
 const testAccTFEWorkspace_updateAddWorkingDirectory = `
@@ -758,3 +799,26 @@ resource "tfe_workspace" "foobar" {
   organization = "${tfe_organization.foobar.id}"
   auto_apply   = true
 }`
+
+const testAccTFEWorkspace_triggerPrefixes = `
+resource "tfe_organization" "foobar" {
+  name  = "tst-terraform"
+  email = "admin@company.com"
+}
+
+resource "tfe_workspace" "foobar" {
+  name                  = "workspace"
+  organization          = "${tfe_organization.foobar.id}"
+  trigger_prefixes      = ["/modules", "/shared"]
+}`
+
+const testAccTFEWorkspace_updateEmptyTriggerPrefixes = `
+resource "tfe_organization" "foobar" {
+  name  = "tst-terraform"
+  email = "admin@company.com"
+}
+resource "tfe_workspace" "foobar" {
+  name                  = "workspace-test"
+  organization          = "${tfe_organization.foobar.id}"
+  auto_apply            = true
+}`