Wait for revoked status during acceptance test

Author: helenjw

internal/provider/resource_tfe_hyok_configuration_test.go

@@ -18,7 +18,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 		t.Skip("Test skipped: HYOK_ORGANIZATION_NAME environment variable is not set")
 	}
 
-	hyok := &tfe.HYOKConfiguration{}
+	state := &tfe.HYOKConfiguration{}
 
 	// With AWS OIDC configuration
 	resource.Test(t, resource.TestCase{
@@ -28,7 +28,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			{
 				Config: testAccTFEAWSHYOKConfigurationConfig(orgName, "apple", "arn:aws:kms:us-east-1:123456789012:key/key1", "us-east-1"),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", hyok),
+					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "aws_oidc_configuration_id"),
 					resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "apple"),
@@ -55,7 +55,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			},
 			// Delete - must first revoke configuration to avoid dangling resources
 			{
-				PreConfig: func() { revokeHYOKConfiguration(t, hyok.ID) },
+				PreConfig: func() { revokeHYOKConfiguration(t, state.ID) },
 				Config:    testAccTFEHYOKConfigurationDestroyConfig(orgName),
 			},
 		},
@@ -69,7 +69,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			{
 				Config: testAccTFEVaultHYOKConfigurationConfig(orgName, "peach", "key1"),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", hyok),
+					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "vault_oidc_configuration_id"),
 					resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "peach"),
@@ -94,7 +94,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			},
 			// Delete - must first revoke configuration to avoid dangling resources
 			{
-				PreConfig: func() { revokeHYOKConfiguration(t, hyok.ID) },
+				PreConfig: func() { revokeHYOKConfiguration(t, state.ID) },
 				Config:    testAccTFEHYOKConfigurationDestroyConfig(orgName),
 			},
 		},
@@ -108,7 +108,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			{
 				Config: testAccTFEGCPHYOKConfigurationConfig(orgName, "cucumber", "key1", "global", "key-ring-1"),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", hyok),
+					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "gcp_oidc_configuration_id"),
 					resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "cucumber"),
@@ -127,7 +127,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			{
 				Config: testAccTFEGCPHYOKConfigurationConfig(orgName, "tomato", "key2", "global", "key-ring-2"),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", hyok),
+					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "gcp_oidc_configuration_id"),
 					resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "tomato"),
@@ -138,7 +138,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			},
 			// Delete - must first revoke configuration to avoid dangling resources
 			{
-				PreConfig: func() { revokeHYOKConfiguration(t, hyok.ID) },
+				PreConfig: func() { revokeHYOKConfiguration(t, state.ID) },
 				Config:    testAccTFEHYOKConfigurationDestroyConfig(orgName),
 			},
 		},
@@ -152,7 +152,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			{
 				Config: testAccTFEAzureHYOKConfigurationConfig(orgName, "banana", "https://random.vault.azure.net/keys/key1"),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", hyok),
+					testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
 					resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "azure_oidc_configuration_id"),
 					resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "banana"),
@@ -177,7 +177,7 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
 			},
 			// Delete - must first revoke configuration to avoid dangling resources
 			{
-				PreConfig: func() { revokeHYOKConfiguration(t, hyok.ID) },
+				PreConfig: func() { revokeHYOKConfiguration(t, state.ID) },
 				Config:    testAccTFEHYOKConfigurationDestroyConfig(orgName),
 			},
 		},
@@ -189,6 +189,19 @@ func revokeHYOKConfiguration(t *testing.T, id string) {
 	if err != nil {
 		t.Fatalf("failed to revoke HYOK configuration: %v", err)
 	}
+
+	// Wait for configuration to be in the revoked status
+	_, err = retryFn(10, 1, func() (any, error) {
+		hyok, err := testAccConfiguredClient.Client.HYOKConfigurations.Read(ctx, id, nil)
+		if err != nil {
+			t.Fatalf("failed to read HYOK configuration: %v", err)
+		}
+
+		if hyok.Status != tfe.HYOKConfigurationRevoked {
+			return nil, fmt.Errorf("expected HYOK configuration to be revoked, got %s", hyok.Status)
+		}
+		return nil, nil
+	})
 }
 
 func testAccCheckTFEHYOKConfigurationExists(n string, hyokConfig *tfe.HYOKConfiguration) resource.TestCheckFunc {