Allow FileTriggersEnabled to be set to false when Git tags are present

hashicorp · Jul 18, 2022 · a9a5f59 · a9a5f59
1 parent f6825bf
commit a9a5f59
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/workspace.go b/workspace.go
@@ -1080,8 +1080,8 @@ func (o WorkspaceCreateOptions) valid() error {
 		o.TriggerPrefixes != nil && len(o.TriggerPrefixes) > 0 {
 		return ErrUnsupportedBothTagsRegexAndTriggerPrefixes
 	}
-	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil &&
-		o.FileTriggersEnabled != nil && *o.FileTriggersEnabled {
+	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil && *o.VCSRepo.TagsRegex != "" &&
+		o.FileTriggersEnabled != nil && *o.FileTriggersEnabled == true {
 		return ErrUnsupportedBothTagsRegexAndFileTriggersEnabled
 	}
 
@@ -1111,8 +1111,8 @@ func (o WorkspaceUpdateOptions) valid() error {
 		o.TriggerPrefixes != nil && len(o.TriggerPrefixes) > 0 {
 		return ErrUnsupportedBothTagsRegexAndTriggerPrefixes
 	}
-	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil &&
-		o.FileTriggersEnabled != nil && *o.FileTriggersEnabled {
+	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil && *o.VCSRepo.TagsRegex != "" &&
+		o.FileTriggersEnabled != nil && *o.FileTriggersEnabled == true {
 		return ErrUnsupportedBothTagsRegexAndFileTriggersEnabled
 	}
 

diff --git a/workspace_integration_test.go b/workspace_integration_test.go
@@ -413,6 +413,18 @@ func TestWorkspacesCreate(t *testing.T) {
 		assert.EqualError(t, err, ErrUnsupportedBothTagsRegexAndFileTriggersEnabled.Error())
 	})
 
+	t.Run("when options include both non-empty tags-regex and file-triggers-enabled as false an error is not returned", func(t *testing.T) {
+		options := WorkspaceCreateOptions{
+			Name:                String("foobar"),
+			FileTriggersEnabled: Bool(false),
+			VCSRepo:             &VCSRepoOptions{TagsRegex: String("foobar")},
+		}
+		w, err := client.Workspaces.Create(ctx, orgTest.Name, options)
+
+		require.NotNil(t, w)
+		require.NoError(t, err)
+	})
+
 	t.Run("when options include trigger-patterns populated and empty trigger-paths workspace is created", func(t *testing.T) {
 		// Remove the below organization creation and use the one from the outer scope once the feature flag is removed
 		orgTest, orgTestCleanup := createOrganizationWithOptions(t, client, OrganizationCreateOptions{
@@ -888,6 +900,18 @@ func TestWorkspacesUpdate(t *testing.T) {
 		assert.EqualError(t, err, ErrUnsupportedBothTagsRegexAndFileTriggersEnabled.Error())
 	})
 
+	t.Run("when options include both non-empty tags-regex and file-triggers-enabled an error is returned", func(t *testing.T) {
+		options := WorkspaceUpdateOptions{
+			Name:                String("foobar"),
+			FileTriggersEnabled: Bool(true),
+			VCSRepo:             &VCSRepoOptions{TagsRegex: String("foobar")},
+		}
+		w, err := client.Workspaces.Update(ctx, orgTest.Name, wTest.Name, options)
+
+		assert.Nil(t, w)
+		assert.EqualError(t, err, ErrUnsupportedBothTagsRegexAndFileTriggersEnabled.Error())
+	})
+
 	t.Run("when options include both tags-regex and trigger-prefixes an error is returned", func(t *testing.T) {
 		options := WorkspaceUpdateOptions{
 			Name:                String("foobar"),