Merge pull request #1569 from hashicorp/TF-23444-terraform-provider-tfe-gh-issue-1568-tfe-workspace-settings-remote-state-consumer-ids-fails-for-not-yet-created-workspaces

Don't ensure workspace ID is in collection when it is unknown

Author: brandonc

internal/provider/resource_tfe_workspace_settings.go

@@ -179,7 +179,7 @@ func (m validateSelfReference) PlanModifySet(_ context.Context, req planmodifier
 	}
 
 	// Check if the workspace ID is in the set
-	if slices.Contains(remoteStateConsumerIDs, workspaceID.ValueString()) {
+	if !workspaceID.IsUnknown() && slices.Contains(remoteStateConsumerIDs, workspaceID.ValueString()) {
 		resp.Diagnostics.AddError("Invalid remote_state_consumer_ids", "workspace_id cannot be in the set of remote_state_consumer_ids")
 	}
 }

internal/provider/resource_tfe_workspace_settings_test.go

@@ -95,6 +95,34 @@ func TestAccTFEWorkspaceSettings(t *testing.T) {
 	})
 }
 
+func TestAccTFEWorkspaceWithSettings(t *testing.T) {
+	tfeClient, err := getClientUsingEnv()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	org, cleanupOrg := createBusinessOrganization(t, tfeClient)
+	t.Cleanup(cleanupOrg)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: testAccMuxedProviders,
+		Steps: []resource.TestStep{
+			// Start with local execution
+			{
+				Config: testAccTFEWorkspaceSettingsUnknownIDRemoteState(org.Name),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"tfe_workspace_settings.foobar", "id"),
+					resource.TestCheckResourceAttrSet(
+						"tfe_workspace_settings.foobar", "workspace_id",
+					),
+				),
+			},
+		},
+	})
+}
+
 func TestAccTFEWorkspaceSettingsRemoteState(t *testing.T) {
 	tfeClient, err := getClientUsingEnv()
 	if err != nil {
@@ -222,7 +250,7 @@ func testAccCheckTFEWorkspaceSettingsDestroy(s *terraform.State) error {
 	return testAccCheckTFEWorkspaceSettingsDestroyProvider(testAccProvider)(s)
 }
 
-func testAccCheckTFEWorkspaceSettingsDestroyProvider(p *schema.Provider) func(s *terraform.State) error {
+func testAccCheckTFEWorkspaceSettingsDestroyProvider(_ *schema.Provider) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		tfeClient, err := getClientUsingEnv()
 		if err != nil {
@@ -256,6 +284,26 @@ func testAccCheckTFEWorkspaceSettingsDestroyProvider(p *schema.Provider) func(s
 	}
 }
 
+func testAccTFEWorkspaceSettingsUnknownIDRemoteState(orgName string) string {
+	return fmt.Sprintf(`
+resource "tfe_workspace" "foobar1" {
+	name = "foobar1"
+	organization = "%s"
+}
+
+resource "tfe_workspace" "foobar2" {
+	name = "foobar2"
+	organization = "%s"
+}
+
+resource "tfe_workspace_settings" "foobar" {
+	workspace_id              = tfe_workspace.foobar1.id
+	global_remote_state       = false
+	remote_state_consumer_ids = [tfe_workspace.foobar2.id]
+}
+`, orgName, orgName)
+}
+
 func testAccTFEWorkspaceSettingsRemoteState(workspaceID, workspaceID2 string) string {
 	return fmt.Sprintf(`
 resource "tfe_workspace_settings" "foobar" {