Add ENABLE_HYOK environment variable to turn on and off HYOK tests

Author: helenjw

docs/testing.md

@@ -49,6 +49,7 @@ these values with the environment variables specified below:
 1. `RUN_TASKS_HMAC` - The optional HMAC Key that should be used for Run Task operations. The default is no key.
 1. `GITHUB_APP_INSTALLATION_ID` - GitHub App installation internal id in the format `ghain-xxxxxxx`. Required for running any tests that use GitHub App VCS (workspace, policy sets, registry module).
 1. `GITHUB_APP_INSTALLATION_NAME` - GitHub App installation name. Required for running tfe_github_app_installation data source test.
+1. `ENABLE_HYOK` - Set `ENABLE_HYOK=1` to enable HYOK-related tests.
 1. `HYOK_ORGANIZATION_NAME` - Name of an organization entitled to use HYOK. Required to run tests for HYOK resources and data sources.
 
 **Note:** In order to run integration tests for **Paid** features you will need a token `TFE_TOKEN` with HCP Terraform or Terraform Enterprise administrator privileges, otherwise the attempt to upgrade an organization's feature set will fail.

internal/provider/helper_test.go

@@ -18,7 +18,7 @@ import (
 
 const RunTasksURLEnvName = "RUN_TASKS_URL"
 const RunTasksHMACKeyEnvName = "RUN_TASKS_HMAC"
-const HYOKOrganizationNameEnvName = "HYOK_ORGANIZATION_NAME"
+const EnableHYOKEnvName = "ENABLE_HYOK"
 
 type testClientOptions struct {
 	defaultOrganization          string
@@ -242,8 +242,8 @@ 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)
+	if value, ok := os.LookupEnv(EnableHYOKEnvName); !ok || value == "" {
+		t.Skipf("Skipping tests for HYOK. Set '%s' to enable tests.", EnableHYOKEnvName)
 	}
 }
 

internal/provider/resource_tfe_aws_oidc_configuration_test.go

@@ -13,6 +13,9 @@ func TestAccTFEAWSOIDCConfiguration_basic(t *testing.T) {
 	skipUnlessHYOKEnabled(t)
 
 	orgName := os.Getenv("HYOK_ORGANIZATION_NAME")
+	if orgName == "" {
+		t.Skip("Skipping test. Set HYOK_ORGANIZATION_NAME environment to enable test.")
+	}
 
 	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

@@ -13,6 +13,9 @@ func TestAccTFEAzureOIDCConfiguration_basic(t *testing.T) {
 	skipUnlessHYOKEnabled(t)
 
 	orgName := os.Getenv("HYOK_ORGANIZATION_NAME")
+	if orgName == "" {
+		t.Skip("Skipping test. Set HYOK_ORGANIZATION_NAME environment to enable test.")
+	}
 
 	originalClientID := "client-id-1"
 	updatedClientID := "client-id-2"

internal/provider/resource_tfe_gcp_oidc_configuration_test.go

@@ -13,6 +13,9 @@ func TestAccTFEGCPOIDCConfiguration_basic(t *testing.T) {
 	skipUnlessHYOKEnabled(t)
 
 	orgName := os.Getenv("HYOK_ORGANIZATION_NAME")
+	if orgName == "" {
+		t.Skip("Skipping test. Set HYOK_ORGANIZATION_NAME environment to enable test.")
+	}
 
 	originalServiceAccountEmail := "[email protected]"
 	updatedServiceAccountEmail := "[email protected]"

internal/provider/resource_tfe_vault_oidc_configuration_test.go

@@ -13,6 +13,9 @@ func TestAccTFEVaultOIDCConfiguration_basic(t *testing.T) {
 	skipUnlessHYOKEnabled(t)
 
 	orgName := os.Getenv("HYOK_ORGANIZATION_NAME")
+	if orgName == "" {
+		t.Skip("Skipping test. Set HYOK_ORGANIZATION_NAME environment to enable test.")
+	}
 
 	originalAddress := "https://vault.example.com"
 	updatedAddress := "https://vault.example2.com"