bool vals are assessed for inclusion

Author: drewmullen

internal/provider/resource_tfe_workspace.go

@@ -374,10 +374,7 @@ func resourceTFEWorkspaceCreate(d *schema.ResourceData, meta interface{}) error
 	options := tfe.WorkspaceCreateOptions{
 		Name:                       tfe.String(name),
 		AllowDestroyPlan:           tfe.Bool(d.Get("allow_destroy_plan").(bool)),
-		AutoApply:                  tfe.Bool(d.Get("auto_apply").(bool)),
 		AutoApplyRunTrigger:        tfe.Bool(d.Get("auto_apply_run_trigger").(bool)),
-		Description:                tfe.String(d.Get("description").(string)),
-		AssessmentsEnabled:         tfe.Bool(d.Get("assessments_enabled").(bool)),
 		FileTriggersEnabled:        tfe.Bool(d.Get("file_triggers_enabled").(bool)),
 		QueueAllRuns:               tfe.Bool(d.Get("queue_all_runs").(bool)),
 		SpeculativeEnabled:         tfe.Bool(d.Get("speculative_enabled").(bool)),
@@ -391,6 +388,18 @@ func resourceTFEWorkspaceCreate(d *schema.ResourceData, meta interface{}) error
 		options.GlobalRemoteState = tfe.Bool(globalRemoteState.(bool))
 	}
 
+	if v, ok := d.GetOkExists("auto_apply"); ok {
+		options.AutoApply = tfe.Bool(v.(bool))
+	}
+
+	if v, ok := d.GetOkExists("assessments_enabled"); ok {
+		options.AssessmentsEnabled = tfe.Bool(v.(bool))
+	}
+
+	if v, ok := d.GetOk("description"); ok {
+		options.Description = tfe.String(v.(string))
+	}
+
 	if v, ok := d.GetOk("agent_pool_id"); ok && v.(string) != "" {
 		options.AgentPoolID = tfe.String(v.(string))
 		options.SettingOverwrites = &tfe.WorkspaceSettingOverwritesOptions{
@@ -726,13 +735,13 @@ func resourceTFEWorkspaceUpdate(d *schema.ResourceData, meta interface{}) error
 		}
 
 		if d.HasChange("assessments_enabled") {
-			if v, ok := d.GetOk("assessments_enabled"); ok {
+			if v, ok := d.GetOkExists("assessments_enabled"); ok {
 				options.AssessmentsEnabled = tfe.Bool(v.(bool))
 			}
 		}
 
 		if d.HasChange("auto_apply") {
-			if v, ok := d.GetOk("auto_apply"); ok {
+			if v, ok := d.GetOkExists("auto_apply"); ok {
 				options.AutoApply = tfe.Bool(v.(bool))
 			}
 		}

internal/provider/resource_tfe_workspace_test.go

@@ -55,7 +55,7 @@ func TestAccTFEWorkspace_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"tfe_workspace.foobar", "queue_all_runs", "true"),
 					resource.TestCheckResourceAttr(
-						"tfe_workspace.foobar", "speculative_enabled", "true"),
+						"tfe_workspace.foobar", "speculative_enabled", "false"),
 					resource.TestCheckResourceAttr(
 						"tfe_workspace.foobar", "assessments_enabled", "false"),
 					resource.TestCheckResourceAttr(