Fixes older tfe, ws_settings always unsets execution_mode

brandonc · brandonc · commit 88c1610dd415 · 2023-12-22T11:23:19.000-07:00
diff --git a/internal/provider/resource_tfe_workspace_settings.go b/internal/provider/resource_tfe_workspace_settings.go
@@ -166,9 +166,11 @@ func (m unknownIfExecutionModeUnset) PlanModifyString(ctx context.Context, req p
 		if configured.ExecutionMode.IsNull() && overwritesState[0].ExecutionMode.ValueBool() {
 			resp.PlanValue = types.StringUnknown()
 		}
-	} else if req.Path.Equal(path.Root("execution_mode")) {
+	} else if configured.ExecutionMode.IsNull() && req.Path.Equal(path.Root("execution_mode")) {
 		// TFE does not support overwrites so default the execution mode to "remote"
 		resp.PlanValue = types.StringValue("remote")
+	} else if configured.AgentPoolID.IsNull() && req.Path.Equal(path.Root("agent_pool_id")) {
+		resp.PlanValue = types.StringNull()
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,11 @@ func (m unknownIfExecutionModeUnset) PlanModifyString(ctx context.Context, req p`
`166`	`166`	`if configured.ExecutionMode.IsNull() && overwritesState[0].ExecutionMode.ValueBool() {`
`167`	`167`	`resp.PlanValue = types.StringUnknown()`
`168`	`168`	`}`
`169`		`- } else if req.Path.Equal(path.Root("execution_mode")) {`
	`169`	`+ } else if configured.ExecutionMode.IsNull() && req.Path.Equal(path.Root("execution_mode")) {`
`170`	`170`	`// TFE does not support overwrites so default the execution mode to "remote"`
`171`	`171`	`resp.PlanValue = types.StringValue("remote")`
	`172`	`+ } else if configured.AgentPoolID.IsNull() && req.Path.Equal(path.Root("agent_pool_id")) {`
	`173`	`+ resp.PlanValue = types.StringNull()`
`172`	`174`	`}`
`173`	`175`	`}`
`174`	`176`