Implement skipUnlessHYOKEnabled function

Author: helenjw

internal/provider/helper_test.go

@@ -18,6 +18,7 @@ import (
 
 const RunTasksURLEnvName = "RUN_TASKS_URL"
 const RunTasksHMACKeyEnvName = "RUN_TASKS_HMAC"
+const HYOKOrganizationNameEnvName = "HYOK_ORGANIZATION_NAME"
 
 type testClientOptions struct {
 	defaultOrganization          string
@@ -238,6 +239,14 @@ func skipUnlessBeta(t *testing.T) {
 	}
 }
 
+func skipUnlessHYOKEnabled(t *testing.T) {
+	skipIfEnterprise(t)
+
+	if value, ok := os.LookupEnv(HYOKOrganizationNameEnvName); !ok || value == "" {
+		t.Skipf("Skipping tests for HYOK. Set '%s' to enable tests.", HYOKOrganizationNameEnvName)
+	}
+}
+
 // Temporarily skip a test that may be experiencing API errors. This method
 // purposefully errors after the set date to remind contributors to remove this check
 // and verify that the API errors are no longer occurring.

internal/provider/resource_tfe_aws_oidc_configuration_test.go

@@ -10,14 +10,10 @@ import (
 )
 
 func TestAccTFEAWSOIDCConfiguration_basic(t *testing.T) {
-	skipIfEnterprise(t)
+	skipUnlessHYOKEnabled(t)
 
 	orgName := os.Getenv("HYOK_ORGANIZATION_NAME")
 
-	if orgName == "" {
-		t.Skip("Test skipped: HYOK_ORGANIZATION_NAME environment variable is not set")
-	}
-
 	originalRoleARN := "arn:aws:iam::123456789012:role/terraform-provider-tfe-example-1"
 	newRoleARN := "arn:aws:iam::123456789012:role/terraform-provider-tfe-example-2"
 

internal/provider/resource_tfe_azure_oidc_configuration_test.go

@@ -10,14 +10,10 @@ import (
 )
 
 func TestAccTFEAzureOIDCConfiguration_basic(t *testing.T) {
-	skipIfEnterprise(t)
+	skipUnlessHYOKEnabled(t)
 
 	orgName := os.Getenv("HYOK_ORGANIZATION_NAME")
 
-	if orgName == "" {
-		t.Skip("Test skipped: HYOK_ORGANIZATION_NAME environment variable is not set")
-	}
-
 	originalClientID := "client-id-1"
 	updatedClientID := "client-id-2"
 	originalSubscriptionID := "subscription-id-1"

internal/provider/resource_tfe_gcp_oidc_configuration_test.go

@@ -10,14 +10,10 @@ import (
 )
 
 func TestAccTFEGCPOIDCConfiguration_basic(t *testing.T) {
-	skipIfEnterprise(t)
+	skipUnlessHYOKEnabled(t)
 
 	orgName := os.Getenv("HYOK_ORGANIZATION_NAME")
 
-	if orgName == "" {
-		t.Skip("Test skipped: HYOK_ORGANIZATION_NAME environment variable is not set")
-	}
-
 	originalServiceAccountEmail := "[email protected]"
 	updatedServiceAccountEmail := "[email protected]"
 	originalProjectNumber := "123456789012"

internal/provider/resource_tfe_vault_oidc_configuration_test.go

@@ -10,14 +10,10 @@ import (
 )
 
 func TestAccTFEVaultOIDCConfiguration_basic(t *testing.T) {
-	skipIfEnterprise(t)
+	skipUnlessHYOKEnabled(t)
 
 	orgName := os.Getenv("HYOK_ORGANIZATION_NAME")
 
-	if orgName == "" {
-		t.Skip("Test skipped: HYOK_ORGANIZATION_NAME environment variable is not set")
-	}
-
 	originalAddress := "https://vault.example.com"
 	updatedAddress := "https://vault.example2.com"
 	originalRoleName := "role-name-1"