Removing create and update options for hyok_enabled. Updating test cases.

Author: iuri-slywitch-hashicorp

internal/provider/data_source_organization_test.go

@@ -103,7 +103,6 @@ func TestAccTFEOrganizationDataSource_readEnforceHYOK(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.tfe_organization.test", "name", orgName),
 					resource.TestCheckResourceAttrSet("data.tfe_organization.test", "enforce_hyok"),
-					resource.TestCheckResourceAttr("data.tfe_organization.test", "enforce_hyok", "true"),
 				),
 			},
 		},

internal/provider/data_source_workspace_test.go

@@ -300,7 +300,6 @@ func TestAccTFEWorkspaceDataSource_readHYOKEnabled(t *testing.T) {
 					resource.TestCheckResourceAttr("data.tfe_workspace.test", "organization", orgName),
 					resource.TestCheckResourceAttr("data.tfe_workspace.test", "name", workspaceName),
 					resource.TestCheckResourceAttrSet("data.tfe_workspace.test", "hyok_enabled"),
-					resource.TestCheckResourceAttr("data.tfe_workspace.test", "hyok_enabled", "true"),
 				),
 			},
 		},

internal/provider/resource_tfe_workspace.go

@@ -523,10 +523,6 @@ func resourceTFEWorkspaceCreate(d *schema.ResourceData, meta interface{}) error
 		options.Tags = append(options.Tags, &tfe.Tag{Name: name})
 	}
 
-	if v, ok := d.GetOkExists("hyok_enabled"); ok {
-		options.HYOKEnabled = tfe.Bool(v.(bool))
-	}
-
 	log.Printf("[DEBUG] Create workspace %s for organization: %s", name, organization)
 	workspace, err := config.Client.Workspaces.Create(ctx, organization, options)
 	if err != nil {
@@ -760,12 +756,6 @@ func resourceTFEWorkspaceUpdate(d *schema.ResourceData, meta interface{}) error
 			}
 		}
 
-		if d.HasChange("hyok_enabled") {
-			if v, ok := d.GetOkExists("enforce_hyok"); ok {
-				options.HYOKEnabled = tfe.Bool(v.(bool))
-			}
-		}
-
 		// NOTE: since agent_pool_id and execution_mode are both deprecated on
 		// tfe_workspace and we want tfe_workspace_settings to be authoritative,
 		// we must not set the overwrites values to false in the checks below.

internal/provider/resource_tfe_workspace_test.go

@@ -2955,65 +2955,19 @@ func TestAccTFEWorkspace_HYOKEnabled(t *testing.T) {
 		t.Skip("HYOK_ORGANIZATION_NAME environment variable must be set to run this test")
 	}
 
-	// Testing workspace hyok enabled going from false to true.
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
 		ProtoV6ProviderFactories: testAccMuxedProviders,
 		CheckDestroy:             testAccCheckTFEWorkspaceDestroy,
 		Steps: []resource.TestStep{
-			// Create workspace with hyok_enabled set to false
 			{
-				Config: testAccTFEWorkspaceHYOKEnabledConfig(orgName, false),
+				Config: testAccTFEWorkspaceConfig(orgName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("tfe_workspace.foobar", "organization", orgName),
+					resource.TestCheckResourceAttrSet("tfe_workspace.foobar", "hyok_enabled"),
 					resource.TestCheckResourceAttr("tfe_workspace.foobar", "hyok_enabled", "false"),
 				),
 			},
-			// Import
-			{
-				ResourceName:      "tfe_workspace.foobar",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			// Update hyok_enabled to true
-			{
-				Config: testAccTFEWorkspaceHYOKEnabledConfig(orgName, true),
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr("tfe_workspace.foobar", "organization", orgName),
-					resource.TestCheckResourceAttr("tfe_workspace.foobar", "hyok_enabled", "true"),
-				),
-			},
-		},
-	})
-
-	// Testing workspace hyok enabled going from true to false.
-	resource.Test(t, resource.TestCase{
-		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV6ProviderFactories: testAccMuxedProviders,
-		CheckDestroy:             testAccCheckTFEWorkspaceDestroy,
-		Steps: []resource.TestStep{
-			// Create workspace with hyok_enabled set to true
-			{
-				Config: testAccTFEWorkspaceHYOKEnabledConfig(orgName, true),
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr("tfe_workspace.foobar", "organization", orgName),
-					resource.TestCheckResourceAttr("tfe_workspace.foobar", "hyok_enabled", "true"),
-				),
-			},
-			// Import
-			{
-				ResourceName:      "tfe_workspace.foobar",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			// Update hyok_enabled to false, however hyok_enabled cannot be disabled once enabled.
-			{
-				Config: testAccTFEWorkspaceHYOKEnabledConfig(orgName, false),
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr("tfe_workspace.foobar", "organization", orgName),
-					resource.TestCheckResourceAttr("tfe_workspace.foobar", "hyok_enabled", "true"),
-				),
-			},
 		},
 	})
 }
@@ -4228,12 +4182,11 @@ resource "tfe_workspace" "foobar" {
 }`, rInt)
 }
 
-func testAccTFEWorkspaceHYOKEnabledConfig(orgName string, hyokEnabled bool) string {
+func testAccTFEWorkspaceConfig(orgName string) string {
 	return fmt.Sprintf(`
 resource "tfe_workspace" "foobar" {
   organization = "%s"
   name         = "tfe-provider-test-workspace-hyok-enabled"
-  hyok_enabled = %t
 }
-`, orgName, hyokEnabled)
+`, orgName)
 }