Merge pull request #498 from hashicorp/sebasslash/fix-workspace-state

Use partial flag to prevent updating state on api failure `tfe_workspace.vcs_repo`
hashicorp · May 25, 2022 · 257f1b0 · 257f1b0
2 parents 32eaf78 + f13828d
commit 257f1b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 0.32.0 (Unreleased)
 
+BUG FIXES:
+* Prevent overwriting `vcs_repo` attributes in `r/tfe_workspace` when update API call fails ([#498](https://github.com/hashicorp/terraform-provider-tfe/pull/498))
+
 FEATURES:
 * r/team, d/team: Add manage_run_tasks to the tfe_team organization_access attributes ([#486](https://github.com/hashicorp/terraform-provider-tfe/pull/486))
 

diff --git a/tfe/resource_tfe_workspace.go b/tfe/resource_tfe_workspace.go
@@ -468,6 +468,7 @@ func resourceTFEWorkspaceUpdate(d *schema.ResourceData, meta interface{}) error
 		log.Printf("[DEBUG] Update workspace %s", id)
 		_, err := tfeClient.Workspaces.UpdateByID(ctx, id, options)
 		if err != nil {
+			d.Partial(true)
 			return fmt.Errorf(
 				"Error updating workspace %s: %w", id, err)
 		}
@@ -481,6 +482,7 @@ func resourceTFEWorkspaceUpdate(d *schema.ResourceData, meta interface{}) error
 		if !ok {
 			_, err := tfeClient.Workspaces.RemoveVCSConnectionByID(ctx, id)
 			if err != nil {
+				d.Partial(true)
 				return fmt.Errorf("Error removing VCS repo from workspace %s: %w", id, err)
 			}
 		}