From f5f600ec63dd44ee64a6867a65c040b34a269c43 Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Thu, 10 Apr 2025 10:25:40 +0100 Subject: [PATCH 01/10] Update ACL based tests to be skipped --- provider/rediscloud_acl_role_test.go | 4 +++- provider/rediscloud_acl_rule_test.go | 7 ++++++- provider/rediscloud_acl_user_test.go | 2 ++ provider/utils_test.go | 9 +++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/provider/rediscloud_acl_role_test.go b/provider/rediscloud_acl_role_test.go index cda31151..72a60055 100644 --- a/provider/rediscloud_acl_role_test.go +++ b/provider/rediscloud_acl_role_test.go @@ -13,7 +13,9 @@ import ( "testing" ) -func TestAccCreateReadUpdateImportDeleteAclRole_Pro(t *testing.T) { +func TestAccResourceRedisCloudAclRole_CRUDI(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_ACL") prefix := acctest.RandomWithPrefix(testResourcePrefix) exampleCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") diff --git a/provider/rediscloud_acl_rule_test.go b/provider/rediscloud_acl_rule_test.go index 902fc49f..be25e7e0 100644 --- a/provider/rediscloud_acl_rule_test.go +++ b/provider/rediscloud_acl_rule_test.go @@ -13,6 +13,9 @@ import ( ) func TestAccRedisCloudAclRule_DataSourceForDefaultRule(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTACC_ACL") + // This rule already exists const testName = "Read-Write" const testRule = "+@all -@dangerous ~*" @@ -37,7 +40,9 @@ func TestAccRedisCloudAclRule_DataSourceForDefaultRule(t *testing.T) { }) } -func TestAccRedisCloudAclRule_CRUDI(t *testing.T) { +func TestAccResourceRedisCloudAclRule_CRUDI(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_ACL") prefix := acctest.RandomWithPrefix(testResourcePrefix) testName := prefix + "-test-rule" diff --git a/provider/rediscloud_acl_user_test.go b/provider/rediscloud_acl_user_test.go index b85cc433..a18c92fc 100644 --- a/provider/rediscloud_acl_user_test.go +++ b/provider/rediscloud_acl_user_test.go @@ -15,6 +15,8 @@ import ( func TestAccResourceRedisCloudAclUser_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_ACL") + prefix := acctest.RandomWithPrefix(testResourcePrefix) exampleCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") exampleSubscriptionName := prefix + "-subscription" diff --git a/provider/utils_test.go b/provider/utils_test.go index be2b2257..3a2a9f3f 100644 --- a/provider/utils_test.go +++ b/provider/utils_test.go @@ -2,6 +2,7 @@ package provider import ( "github.com/stretchr/testify/assert" + "os" "testing" ) @@ -26,3 +27,11 @@ func TestIsTime(t *testing.T) { }) } } + +func testAccRequiresEnvVar(t *testing.T, envVarName string) string { + envVarValue := os.Getenv(envVarName) + if envVarValue == "" || envVarValue == "false" { + t.Skipf("Skipping test because %s is not set.", envVarName) + } + return envVarValue +} From 53ee1e63c753f8b81a64dd9a665122118854e778 Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Thu, 10 Apr 2025 17:46:49 +0100 Subject: [PATCH 02/10] Updates to only execute database related tests --- .github/workflows/terraform_provider.yml | 2 +- ...atasource_rediscloud_cloud_account_test.go | 3 ++ ...source_rediscloud_data_persistence_test.go | 3 ++ ...source_rediscloud_database_modules_test.go | 3 ++ ...asource_rediscloud_essentials_plan_test.go | 10 +++++ ...tasource_rediscloud_payment_method_test.go | 2 + ...datasource_rediscloud_pro_database_test.go | 3 ++ ...source_rediscloud_pro_subscription_test.go | 6 +++ .../datasource_rediscloud_regions_test.go | 9 ++++ ...e_rediscloud_subscription_peerings_test.go | 3 ++ .../rediscloud_active_active_database_test.go | 8 ++++ ..._service_connect_endpoint_accepter_test.go | 2 + ...e_private_service_connect_endpoint_test.go | 2 + ...ive_active_private_service_connect_test.go | 2 + ...iscloud_active_active_subscription_test.go | 2 + ...rediscloud_essentials_subscription_test.go | 4 ++ ..._service_connect_endpoint_accepter_test.go | 2 + ...d_private_service_connect_endpoint_test.go | 2 + ...rediscloud_private_service_connect_test.go | 2 + ...iscloud_transit_gateway_attachment_test.go | 2 + ...active_active_subscription_peering_test.go | 4 ++ ...active_active_subscription_regions_test.go | 3 ++ ...ce_rediscloud_essentials_database_test.go} | 4 +- .../resource_rediscloud_pro_database_test.go | 14 ++++++ ...source_rediscloud_pro_subscription_test.go | 45 +++++++++++++++++++ provider/resource_rediscloud_pro_tls_test.go | 14 ++++++ ...ce_rediscloud_subscription_peering_test.go | 4 ++ 27 files changed, 158 insertions(+), 2 deletions(-) rename provider/{rediscloud_essentials_database_test.go => resource_rediscloud_essentials_database_test.go} (99%) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index b18f5e2e..c02ecd90 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -105,7 +105,7 @@ jobs: - 'provider/**' - '*.go' - '.github/workflows/**' - - run: make testacc + - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloud(Essentials|Pro|ActiveActive)Database.*"' if: steps.filter.outputs.code-changes == 'true' env: REDISCLOUD_ACCESS_KEY: ${{ secrets.REDISCLOUD_ACCESS_KEY_STAGING }} diff --git a/provider/datasource_rediscloud_cloud_account_test.go b/provider/datasource_rediscloud_cloud_account_test.go index 0abb1e53..0e1c0482 100644 --- a/provider/datasource_rediscloud_cloud_account_test.go +++ b/provider/datasource_rediscloud_cloud_account_test.go @@ -10,6 +10,9 @@ import ( ) func TestAccDataSourceRedisCloudCloudAccount_basic(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_CLOUD_ACCOUNT") + name := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") const testCloudAccount = "data.rediscloud_cloud_account.test" diff --git a/provider/datasource_rediscloud_data_persistence_test.go b/provider/datasource_rediscloud_data_persistence_test.go index 7b7caa00..fead34d1 100644 --- a/provider/datasource_rediscloud_data_persistence_test.go +++ b/provider/datasource_rediscloud_data_persistence_test.go @@ -7,6 +7,9 @@ import ( ) func TestAccDataSourceRedisCloudDataPersistence_basic(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_PERSISTENCE") + const dataPersistenceFoo = "data.rediscloud_data_persistence.foo" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/provider/datasource_rediscloud_database_modules_test.go b/provider/datasource_rediscloud_database_modules_test.go index 0816b262..984734c5 100644 --- a/provider/datasource_rediscloud_database_modules_test.go +++ b/provider/datasource_rediscloud_database_modules_test.go @@ -7,6 +7,9 @@ import ( ) func TestAccDataSourceRedisCloudDatabaseModules_basic(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_API_DATA") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: providerFactories, diff --git a/provider/datasource_rediscloud_essentials_plan_test.go b/provider/datasource_rediscloud_essentials_plan_test.go index 6193cc60..ff0f5269 100644 --- a/provider/datasource_rediscloud_essentials_plan_test.go +++ b/provider/datasource_rediscloud_essentials_plan_test.go @@ -8,6 +8,8 @@ import ( func TestAccDataSourceRedisCloudEssentialsPlan_basic(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + const basicPlan = "data.rediscloud_essentials_plan.basic" resource.ParallelTest(t, resource.TestCase{ @@ -48,6 +50,8 @@ func TestAccDataSourceRedisCloudEssentialsPlan_basic(t *testing.T) { func TestAccDataSourceRedisCloudEssentialsPlan_azure(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + const azurePlan = "data.rediscloud_essentials_plan.azure" resource.ParallelTest(t, resource.TestCase{ @@ -88,6 +92,8 @@ func TestAccDataSourceRedisCloudEssentialsPlan_azure(t *testing.T) { func TestAccDataSourceRedisCloudEssentialsPlan_subscriptionId(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + const examplePlan = "data.rediscloud_essentials_plan.example" resource.ParallelTest(t, resource.TestCase{ @@ -130,6 +136,8 @@ func TestAccDataSourceRedisCloudEssentialsPlan_subscriptionId(t *testing.T) { func TestAccDataSourceRedisCloudEssentialsPlan_ambiguous(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: providerFactories, @@ -145,6 +153,8 @@ func TestAccDataSourceRedisCloudEssentialsPlan_ambiguous(t *testing.T) { func TestAccDataSourceRedisCloudEssentialsPlan_impossible(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: providerFactories, diff --git a/provider/datasource_rediscloud_payment_method_test.go b/provider/datasource_rediscloud_payment_method_test.go index 8b300101..2c4a6efc 100644 --- a/provider/datasource_rediscloud_payment_method_test.go +++ b/provider/datasource_rediscloud_payment_method_test.go @@ -8,6 +8,8 @@ import ( func TestAccDataSourceRedisCloudPaymentMethod_basic(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_PAYMENT_METHOD") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: providerFactories, diff --git a/provider/datasource_rediscloud_pro_database_test.go b/provider/datasource_rediscloud_pro_database_test.go index 1105c9d5..1695cf1b 100644 --- a/provider/datasource_rediscloud_pro_database_test.go +++ b/provider/datasource_rediscloud_pro_database_test.go @@ -10,6 +10,9 @@ import ( ) func TestAccDataSourceRedisCloudProDatabase_basic(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") diff --git a/provider/datasource_rediscloud_pro_subscription_test.go b/provider/datasource_rediscloud_pro_subscription_test.go index 1098a475..32c7193f 100644 --- a/provider/datasource_rediscloud_pro_subscription_test.go +++ b/provider/datasource_rediscloud_pro_subscription_test.go @@ -11,6 +11,9 @@ import ( ) func TestAccDataSourceRedisCloudProSubscription_basic(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix("tf-test") const resourceName = "rediscloud_subscription.example" @@ -57,6 +60,9 @@ func TestAccDataSourceRedisCloudProSubscription_basic(t *testing.T) { } func TestAccDataSourceRedisCloudProSubscription_ignoresAA(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) diff --git a/provider/datasource_rediscloud_regions_test.go b/provider/datasource_rediscloud_regions_test.go index 6f0dbb91..298dff2e 100644 --- a/provider/datasource_rediscloud_regions_test.go +++ b/provider/datasource_rediscloud_regions_test.go @@ -7,6 +7,9 @@ import ( ) func TestAccDataSourceRedisCloudRegions_all(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_REGIONS") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: providerFactories, @@ -40,6 +43,9 @@ func TestAccDataSourceRedisCloudRegions_all(t *testing.T) { } func TestAccDataSourceRedisCloudRegions_AWS(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_REGIONS") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: providerFactories, @@ -64,6 +70,9 @@ func TestAccDataSourceRedisCloudRegions_AWS(t *testing.T) { } func TestAccDataSourceRedisCloudRegions_GCP(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_REGIONS") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: providerFactories, diff --git a/provider/datasource_rediscloud_subscription_peerings_test.go b/provider/datasource_rediscloud_subscription_peerings_test.go index 7d32aaf4..3f85057d 100644 --- a/provider/datasource_rediscloud_subscription_peerings_test.go +++ b/provider/datasource_rediscloud_subscription_peerings_test.go @@ -11,6 +11,9 @@ import ( ) func TestAccDataSourceRedisCloudSubscriptionPeerings_basic(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_PEERING") + name := acctest.RandomWithPrefix(testResourcePrefix) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") diff --git a/provider/rediscloud_active_active_database_test.go b/provider/rediscloud_active_active_database_test.go index 739f7f46..54693057 100644 --- a/provider/rediscloud_active_active_database_test.go +++ b/provider/rediscloud_active_active_database_test.go @@ -17,6 +17,8 @@ import ( // Checks CRUDI (CREATE,READ,UPDATE,IMPORT) operations on the database resource. func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + subscriptionName := acctest.RandomWithPrefix(testResourcePrefix) + "-subscription" name := acctest.RandomWithPrefix(testResourcePrefix) + "-database" password := acctest.RandString(20) @@ -201,6 +203,9 @@ func TestAccResourceRedisCloudActiveActiveDatabase_CRUDI(t *testing.T) { } func TestAccResourceRedisCloudActiveActiveDatabase_optionalAttributes(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + // Test that attributes can be optional, either by setting them or not having them set when compared to CRUDI test subscriptionName := acctest.RandomWithPrefix(testResourcePrefix) + "-subscription" name := acctest.RandomWithPrefix(testResourcePrefix) + "-database" @@ -224,6 +229,9 @@ func TestAccResourceRedisCloudActiveActiveDatabase_optionalAttributes(t *testing } func TestAccResourceRedisCloudActiveActiveDatabase_timeUtcRequiresValidInterval(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + name := acctest.RandomWithPrefix(testResourcePrefix) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") password := acctest.RandString(20) diff --git a/provider/rediscloud_active_active_private_service_connect_endpoint_accepter_test.go b/provider/rediscloud_active_active_private_service_connect_endpoint_accepter_test.go index b1f52516..bb8bf324 100644 --- a/provider/rediscloud_active_active_private_service_connect_endpoint_accepter_test.go +++ b/provider/rediscloud_active_active_private_service_connect_endpoint_accepter_test.go @@ -15,6 +15,8 @@ import ( func TestAccResourceRedisCloudActiveActivePrivateServiceConnectEndpointAccepter_Create(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUB_ACTIVE_ACTIVE") + baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-pscea" const resourceName = "rediscloud_active_active_private_service_connect_endpoint_accepter.accepter" diff --git a/provider/rediscloud_active_active_private_service_connect_endpoint_test.go b/provider/rediscloud_active_active_private_service_connect_endpoint_test.go index fce47fc0..363de559 100644 --- a/provider/rediscloud_active_active_private_service_connect_endpoint_test.go +++ b/provider/rediscloud_active_active_private_service_connect_endpoint_test.go @@ -12,6 +12,8 @@ import ( func TestAccResourceRedisCloudActiveActivePrivateServiceConnectEndpoint_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-psce" const resourceName = "rediscloud_active_active_private_service_connect_endpoint.psce" diff --git a/provider/rediscloud_active_active_private_service_connect_test.go b/provider/rediscloud_active_active_private_service_connect_test.go index 9c43901b..6c59ccca 100644 --- a/provider/rediscloud_active_active_private_service_connect_test.go +++ b/provider/rediscloud_active_active_private_service_connect_test.go @@ -10,6 +10,8 @@ import ( func TestAccResourceRedisCloudActiveActivePrivateServiceConnect_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-psc" const resourceName = "rediscloud_active_active_private_service_connect.psc" diff --git a/provider/rediscloud_active_active_subscription_test.go b/provider/rediscloud_active_active_subscription_test.go index 35003f3e..7c20bc64 100644 --- a/provider/rediscloud_active_active_subscription_test.go +++ b/provider/rediscloud_active_active_subscription_test.go @@ -23,6 +23,8 @@ var activeActiveMarketplaceFlag = flag.Bool("activeActiveMarketplace", false, // Checks CRUDI (CREATE,READ,UPDATE,IMPORT) operations on the subscription resource. func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUB_ACTIVE_ACTIVE") + name := acctest.RandomWithPrefix(testResourcePrefix) const resourceName = "rediscloud_active_active_subscription.example" const datasourceName = "data.rediscloud_active_active_subscription.example" diff --git a/provider/rediscloud_essentials_subscription_test.go b/provider/rediscloud_essentials_subscription_test.go index b69cf2a2..efc9de37 100644 --- a/provider/rediscloud_essentials_subscription_test.go +++ b/provider/rediscloud_essentials_subscription_test.go @@ -13,6 +13,8 @@ import ( func TestAccResourceRedisCloudEssentialsSubscription_FreeCRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + subscriptionName := acctest.RandomWithPrefix(testResourcePrefix) subscriptionNameUpdated := subscriptionName + "-updated" @@ -76,6 +78,8 @@ func TestAccResourceRedisCloudEssentialsSubscription_FreeCRUDI(t *testing.T) { func TestAccResourceRedisCloudEssentialsSubscription_PaidCRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + subscriptionName := acctest.RandomWithPrefix(testResourcePrefix) subscriptionNameUpdated := subscriptionName + "-updated" diff --git a/provider/rediscloud_private_service_connect_endpoint_accepter_test.go b/provider/rediscloud_private_service_connect_endpoint_accepter_test.go index 5c70e2f4..e388da0f 100644 --- a/provider/rediscloud_private_service_connect_endpoint_accepter_test.go +++ b/provider/rediscloud_private_service_connect_endpoint_accepter_test.go @@ -15,6 +15,8 @@ import ( func TestAccResourceRedisCloudPrivateServiceConnectEndpointAccepter_Create(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-pscea" const resourceName = "rediscloud_private_service_connect_endpoint_accepter.accepter" diff --git a/provider/rediscloud_private_service_connect_endpoint_test.go b/provider/rediscloud_private_service_connect_endpoint_test.go index 8ae76201..a96ba696 100644 --- a/provider/rediscloud_private_service_connect_endpoint_test.go +++ b/provider/rediscloud_private_service_connect_endpoint_test.go @@ -12,6 +12,8 @@ import ( func TestAccResourceRedisCloudPrivateServiceConnectEndpoint_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-psce" const resourceName = "rediscloud_private_service_connect_endpoint.psce" diff --git a/provider/rediscloud_private_service_connect_test.go b/provider/rediscloud_private_service_connect_test.go index 8fff4bd1..10da11ea 100644 --- a/provider/rediscloud_private_service_connect_test.go +++ b/provider/rediscloud_private_service_connect_test.go @@ -10,6 +10,8 @@ import ( func TestAccResourceRedisCloudPrivateServiceConnect_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-psc" const resourceName = "rediscloud_private_service_connect.psc" diff --git a/provider/rediscloud_transit_gateway_attachment_test.go b/provider/rediscloud_transit_gateway_attachment_test.go index e0395589..9389b72b 100644 --- a/provider/rediscloud_transit_gateway_attachment_test.go +++ b/provider/rediscloud_transit_gateway_attachment_test.go @@ -12,6 +12,8 @@ import ( func TestAccResourceRedisCloudTransitGatewayAttachment_Pro(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_TRANSIT_GATEWAY") + testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") testTgwId := os.Getenv("AWS_TEST_TGW_ID") baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-tgwa" diff --git a/provider/resource_rediscloud_active_active_subscription_peering_test.go b/provider/resource_rediscloud_active_active_subscription_peering_test.go index e4daf52b..74b9c219 100644 --- a/provider/resource_rediscloud_active_active_subscription_peering_test.go +++ b/provider/resource_rediscloud_active_active_subscription_peering_test.go @@ -12,6 +12,8 @@ import ( func TestAccResourceRedisCloudActiveActiveSubscriptionPeering_aws(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_PEERING") + name := acctest.RandomWithPrefix(testResourcePrefix) cidrRange := os.Getenv("AWS_VPC_CIDR") @@ -72,6 +74,8 @@ func TestAccResourceRedisCloudActiveActiveSubscriptionPeering_aws(t *testing.T) func TestAccResourceRedisCloudActiveActiveSubscriptionPeering_gcp(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_PEERING") + name := acctest.RandomWithPrefix(testResourcePrefix) tf := fmt.Sprintf(testAccResourceRedisCloudActiveActiveSubscriptionPeeringGCP, diff --git a/provider/resource_rediscloud_active_active_subscription_regions_test.go b/provider/resource_rediscloud_active_active_subscription_regions_test.go index 02d9dd62..69ef3a27 100644 --- a/provider/resource_rediscloud_active_active_subscription_regions_test.go +++ b/provider/resource_rediscloud_active_active_subscription_regions_test.go @@ -13,6 +13,9 @@ import ( ) func TestAccResourceRedisCloudActiveActiveSubscriptionRegions_CRUDI(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUB_ACTIVE_ACTIVE") + subName := acctest.RandomWithPrefix(testResourcePrefix) + "-regions-test" dbName := acctest.RandomWithPrefix(testResourcePrefix) + "-regions" + "-db" dbPass := acctest.RandString(20) diff --git a/provider/rediscloud_essentials_database_test.go b/provider/resource_rediscloud_essentials_database_test.go similarity index 99% rename from provider/rediscloud_essentials_database_test.go rename to provider/resource_rediscloud_essentials_database_test.go index 960c76f5..564bae91 100644 --- a/provider/rediscloud_essentials_database_test.go +++ b/provider/resource_rediscloud_essentials_database_test.go @@ -8,7 +8,9 @@ import ( "testing" ) -func TestAccRedisCloudEssentialsDatabase_BasicCRUDI(t *testing.T) { +func TestAccResourceRedisCloudEssentialsDatabase_CRUDI(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") subscriptionName := acctest.RandomWithPrefix(testResourcePrefix) databaseName := subscriptionName + "-db" diff --git a/provider/resource_rediscloud_pro_database_test.go b/provider/resource_rediscloud_pro_database_test.go index 79e5c627..e0455b84 100644 --- a/provider/resource_rediscloud_pro_database_test.go +++ b/provider/resource_rediscloud_pro_database_test.go @@ -17,6 +17,8 @@ import ( // Checks CRUDI (CREATE,READ,UPDATE,IMPORT) operations on the database resource. func TestAccResourceRedisCloudProDatabase_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) const resourceName = "rediscloud_subscription_database.example" @@ -156,6 +158,9 @@ func TestAccResourceRedisCloudProDatabase_CRUDI(t *testing.T) { } func TestAccResourceRedisCloudProDatabase_optionalAttributes(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + // Test that attributes can be optional, either by setting them or not having them set when compared to CRUDI test name := acctest.RandomWithPrefix(testResourcePrefix) const resourceName = "rediscloud_subscription_database.example" @@ -179,6 +184,9 @@ func TestAccResourceRedisCloudProDatabase_optionalAttributes(t *testing.T) { } func TestAccResourceRedisCloudProDatabase_timeUtcRequiresValidInterval(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + name := acctest.RandomWithPrefix(testResourcePrefix) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -197,6 +205,9 @@ func TestAccResourceRedisCloudProDatabase_timeUtcRequiresValidInterval(t *testin // Tests the multi-modules feature in a database resource. func TestAccResourceRedisCloudProDatabase_MultiModules(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + name := acctest.RandomWithPrefix(testResourcePrefix) dbName := "db-multi-modules" const resourceName = "rediscloud_subscription_database.example" @@ -226,6 +237,9 @@ func TestAccResourceRedisCloudProDatabase_MultiModules(t *testing.T) { } func TestAccResourceRedisCloudProDatabase_respversion(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + // Test that attributes can be optional, either by setting them or not having them set when compared to CRUDI test name := acctest.RandomWithPrefix(testResourcePrefix) const resourceName = "rediscloud_subscription_database.example" diff --git a/provider/resource_rediscloud_pro_subscription_test.go b/provider/resource_rediscloud_pro_subscription_test.go index 572ba72f..0d41b9dc 100644 --- a/provider/resource_rediscloud_pro_subscription_test.go +++ b/provider/resource_rediscloud_pro_subscription_test.go @@ -27,6 +27,8 @@ var marketplaceFlag = flag.Bool("marketplace", false, // Checks CRUDI (CREATE,READ,UPDATE,IMPORT) operations on the subscription resource. func TestAccResourceRedisCloudProSubscription_CRUDI(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) const resourceName = "rediscloud_subscription.example" testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -130,6 +132,9 @@ func TestAccResourceRedisCloudProSubscription_CRUDI(t *testing.T) { } func TestAccResourceRedisCloudProSubscription_preferredAZsModulesOptional(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) const resourceName = "rediscloud_subscription.example" testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -152,6 +157,8 @@ func TestAccResourceRedisCloudProSubscription_preferredAZsModulesOptional(t *tes func TestAccResourceRedisCloudProSubscription_createUpdateContractPayment(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + if !*contractFlag { t.Skip("The '-contract' parameter wasn't provided in the test command.") } @@ -189,6 +196,8 @@ func TestAccResourceRedisCloudProSubscription_createUpdateContractPayment(t *tes func TestAccResourceRedisCloudProSubscription_createUpdateMarketplacePayment(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + if !*marketplaceFlag { t.Skip("The '-marketplace' parameter wasn't provided in the test command.") } @@ -223,6 +232,9 @@ func TestAccResourceRedisCloudProSubscription_createUpdateMarketplacePayment(t * } func TestAccResourceRedisCloudProSubscription_RedisVersion(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -268,6 +280,9 @@ func TestAccResourceRedisCloudProSubscription_RedisVersion(t *testing.T) { } func TestAccResourceRedisCloudProSubscription_MaintenanceWindows(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) + "-mw" resourceName := "rediscloud_subscription.example" datasourceName := "data.rediscloud_subscription.example" @@ -419,6 +434,9 @@ func TestAccResourceRedisCloudProSubscription_MaintenanceWindows(t *testing.T) { // Checks that modules are allocated correctly into each creation-plan db if there are multiple modules, including "RedisGraph" and the number of databases is one. func TestFlexSubModulesAllocationWhenGraphAndQuantityIsOne(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + numDatabases := 1 planMap := map[string]interface{}{ "average_item_size_in_bytes": 1000, @@ -454,6 +472,9 @@ func TestFlexSubModulesAllocationWhenGraphAndQuantityIsOne(t *testing.T) { // Checks that modules are allocated correctly into each creation-plan db if there are multiple modules, including "RedisGraph" and the number of databases is greater than one. func TestFlexSubModulesAllocationWhenGraphAndQuantityMoreThanOne(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + numDatabases := 5 planMap := map[string]interface{}{ "average_item_size_in_bytes": 0, @@ -488,6 +509,9 @@ func TestFlexSubModulesAllocationWhenGraphAndQuantityMoreThanOne(t *testing.T) { // Checks that modules are allocated correctly into each creation-plan db if the only module is "RedisGraph". func TestFlexSubModulesAllocationWhenOnlyGraphModule(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + numDatabases := 5 planMap := map[string]interface{}{ "average_item_size_in_bytes": 0, @@ -510,6 +534,9 @@ func TestFlexSubModulesAllocationWhenOnlyGraphModule(t *testing.T) { // Checks that modules are allocated correctly into the creation-plan dbs if "RedisGraph" is not included func TestFlexSubModulesAllocationWhenNoGraph(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + numDatabases := 5 planMap := map[string]interface{}{ "average_item_size_in_bytes": 0, @@ -535,6 +562,9 @@ func TestFlexSubModulesAllocationWhenNoGraph(t *testing.T) { } func TestFlexSubNoModulesInCreatePlanDatabases(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + planMap := map[string]interface{}{ "average_item_size_in_bytes": 0, "dataset_size_in_gb": float64(1), @@ -555,6 +585,9 @@ func TestFlexSubNoModulesInCreatePlanDatabases(t *testing.T) { } func TestFlexSubNoAverageItemSizeInBytes(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + planMap := map[string]interface{}{ "average_item_size_in_bytes": 0, // 0 is the value that is returned when the field is not present "dataset_size_in_gb": float64(1), @@ -574,6 +607,9 @@ func TestFlexSubNoAverageItemSizeInBytes(t *testing.T) { } func TestFlexSubRediSearchThroughputMeasurementWhenReplicationIsFalse(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + planMap := map[string]interface{}{ "average_item_size_in_bytes": 0, "dataset_size_in_gb": float64(1), @@ -592,6 +628,9 @@ func TestFlexSubRediSearchThroughputMeasurementWhenReplicationIsFalse(t *testing } func TestFlexSubRediSearchThroughputMeasurementWhenReplicationIsTrue(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + planMap := map[string]interface{}{ "average_item_size_in_bytes": 0, "dataset_size_in_gb": float64(1), @@ -610,6 +649,9 @@ func TestFlexSubRediSearchThroughputMeasurementWhenReplicationIsTrue(t *testing. } func TestFlexSubRedisGraphThroughputMeasurementWhenReplicationIsFalse(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + planMap := map[string]interface{}{ "average_item_size_in_bytes": 0, "dataset_size_in_gb": float64(1), @@ -628,6 +670,9 @@ func TestFlexSubRedisGraphThroughputMeasurementWhenReplicationIsFalse(t *testing } func TestFlexSubRedisGraphThroughputMeasurementWhenReplicationIsTrue(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + planMap := map[string]interface{}{ "average_item_size_in_bytes": 1000, "dataset_size_in_gb": float64(1), diff --git a/provider/resource_rediscloud_pro_tls_test.go b/provider/resource_rediscloud_pro_tls_test.go index b94aad12..ff09fc5e 100644 --- a/provider/resource_rediscloud_pro_tls_test.go +++ b/provider/resource_rediscloud_pro_tls_test.go @@ -20,6 +20,8 @@ var invalidSslCertificate = "I am not a valid certificate" // enable_tls=true, client_ssl_certificate= func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndSslCert(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) const subscriptionName = "rediscloud_subscription.example" @@ -125,6 +127,8 @@ func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndSs // enable_tls=true, client_ssl_certificate="" func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndEmptySslCert(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) const subscriptionName = "rediscloud_subscription.example" @@ -202,6 +206,8 @@ func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndEm // enable_tls=true, client_ssl_certificate= func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndInvalidSslCert(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -225,6 +231,8 @@ func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndIn // enable_tls=false, client_ssl_certificate= func TestAccResourceRedisCloudSubscription_createWithDatabaseAndDisabledTlsAndInvalidCert(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -248,6 +256,8 @@ func TestAccResourceRedisCloudSubscription_createWithDatabaseAndDisabledTlsAndIn // enable_tls=false, client_ssl_certificate="", client_tls_certificates=["something"] func TestAccResourceRedisCloudSubscription_createWithoutEnableTlsAndTlsCert(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -270,6 +280,8 @@ func TestAccResourceRedisCloudSubscription_createWithoutEnableTlsAndTlsCert(t *t func TestAccResourceRedisCloudSubscription_createWithSslCertAndTlsCert(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -293,6 +305,8 @@ func TestAccResourceRedisCloudSubscription_createWithSslCertAndTlsCert(t *testin // enable_tls=true, client_ssl_certificate="", client_tls_certificates=["something"] func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndTlsCert(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) const subscriptionName = "rediscloud_subscription.example" diff --git a/provider/resource_rediscloud_subscription_peering_test.go b/provider/resource_rediscloud_subscription_peering_test.go index 12dbed12..4235a05e 100644 --- a/provider/resource_rediscloud_subscription_peering_test.go +++ b/provider/resource_rediscloud_subscription_peering_test.go @@ -13,6 +13,8 @@ import ( func TestAccResourceRedisCloudSubscriptionPeering_aws(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_PEERING") + name := acctest.RandomWithPrefix(testResourcePrefix) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -75,6 +77,8 @@ func TestAccResourceRedisCloudSubscriptionPeering_aws(t *testing.T) { func TestAccResourceRedisCloudSubscriptionPeering_gcp(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TEST_PEERING") + name := acctest.RandomWithPrefix(testResourcePrefix) tf := fmt.Sprintf(testAccResourceRedisCloudSubscriptionPeeringGCP, From 073190bb906fa8c12cb413008dab8ca2bf7be392 Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Thu, 10 Apr 2025 17:49:35 +0100 Subject: [PATCH 03/10] Updates to only execute database related tests --- .github/workflows/terraform_provider.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index c02ecd90..38688f65 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -118,7 +118,7 @@ jobs: AWS_VPC_ID: ${{ secrets.AWS_VPC_ID }} AWS_TEST_TGW_ID: ${{ secrets.AWS_TEST_TGW_ID_STAGING }} TF_ACC: true - TF_LOG: debug + TF_LOG: info AWS_ACCESS_KEY_ID: ${{ secrets.CLOUD_ACCOUNT_KEY }} AWS_ACCESS_SECRET_KEY: ${{ secrets.CLOUD_ACCOUNT_SECRET }} AWS_CONSOLE_USERNAME: ${{ secrets.CLOUD_ACCOUNT_USERNAME }} From f5aec6dec3e1741f8105ba6491f2b270e9866523 Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Fri, 11 Apr 2025 14:34:06 +0100 Subject: [PATCH 04/10] Update to test to execute in steps --- .github/workflows/terraform_provider.yml | 136 ++++++++++++------ ...atasource_rediscloud_cloud_account_test.go | 2 +- ...source_rediscloud_data_persistence_test.go | 2 +- ...source_rediscloud_database_modules_test.go | 2 +- ...asource_rediscloud_essentials_plan_test.go | 10 +- ...tasource_rediscloud_payment_method_test.go | 2 +- ...source_rediscloud_pro_subscription_test.go | 4 +- .../datasource_rediscloud_regions_test.go | 6 +- ...e_rediscloud_subscription_peerings_test.go | 2 +- provider/rediscloud_acl_role_test.go | 2 +- provider/rediscloud_acl_rule_test.go | 6 +- provider/rediscloud_acl_user_test.go | 2 +- ..._service_connect_endpoint_accepter_test.go | 2 +- ...e_private_service_connect_endpoint_test.go | 2 +- ...ive_active_private_service_connect_test.go | 2 +- ...iscloud_active_active_subscription_test.go | 6 +- ...rediscloud_essentials_subscription_test.go | 4 +- ..._service_connect_endpoint_accepter_test.go | 2 +- ...d_private_service_connect_endpoint_test.go | 2 +- ...rediscloud_private_service_connect_test.go | 2 +- ...iscloud_transit_gateway_attachment_test.go | 2 +- .../resource_rediscloud_cloud_account_test.go | 2 + ...source_rediscloud_pro_subscription_test.go | 12 +- provider/resource_rediscloud_pro_tls_test.go | 24 ++-- ...ce_rediscloud_subscription_peering_test.go | 4 +- 25 files changed, 146 insertions(+), 96 deletions(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index 38688f65..b117d3ca 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -11,9 +11,29 @@ on: - develop env: TERRAFORM_VERSION: "1.2.6" + REDISCLOUD_ACCESS_KEY: ${{ secrets.REDISCLOUD_ACCESS_KEY_STAGING }} + REDISCLOUD_SECRET_KEY: ${{ secrets.REDISCLOUD_SECRET_KEY_STAGING }} + REDISCLOUD_URL: \{\{ secrets\.REDISCLOUD\_URL\_STAGING \}\} +AWS\_TEST\_CLOUD\_ACCOUNT\_NAME\: "{{ secrets.AWS_TEST_CLOUD_ACCOUNT_NAME_STAGING }}" + AWS_PEERING_REGION: ${{ secrets.AWS_PEERING_REGION }} + AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }} + AWS_VPC_CIDR: ${{ secrets.AWS_VPC_CIDR }} + AWS_VPC_ID: ${{ secrets.AWS_VPC_ID }} + AWS_TEST_TGW_ID: ${{ secrets.AWS_TEST_TGW_ID_STAGING }} + TF_ACC: true + TF_LOG: info + AWS_ACCESS_KEY_ID: ${{ secrets.CLOUD_ACCOUNT_KEY }} + AWS_ACCESS_SECRET_KEY: ${{ secrets.CLOUD_ACCOUNT_SECRET }} + AWS_CONSOLE_USERNAME: ${{ secrets.CLOUD_ACCOUNT_USERNAME }} + AWS_CONSOLE_PASSWORD: ${{ secrets.CLOUD_ACCOUNT_PASS }} + AWS_SIGNIN_URL: ${{ secrets.CLOUD_ACCOUNT_URL }} + GCP_VPC_PROJECT: ${{ secrets.GCP_VPC_PROJECT }} + GCP_VPC_ID: ${{ secrets.GCP_VPC_ID }} + GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }} + GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }} concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: \{\{ github\.workflow \}\}\-{{ github.ref }} cancel-in-progress: true jobs: @@ -52,13 +72,13 @@ jobs: timeout-minutes: 2 with: path: terraform-providers-schema - key: ${{ runner.os }}-terraform-providers-schema-${{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }} + key: \{\{ runner\.os \}\}\-terraform\-providers\-schema\-{{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }} - if: steps.cache-terraform-providers-schema.outputs.cache-hit != 'true' || steps.cache-terraform-providers-schema.outcome == 'failure' uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 timeout-minutes: 2 with: path: terraform-plugin-dir - key: ${{ runner.os }}-terraform-plugin-dir-${{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }} + key: \{\{ runner\.os \}\}\-terraform\-plugin\-dir\-{{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }} - if: steps.cache-terraform-providers-schema.outputs.cache-hit != 'true' || steps.cache-terraform-providers-schema.outcome == 'failure' uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2 with: @@ -86,8 +106,52 @@ jobs: mkdir terraform-providers-schema terraform providers schema -json > terraform-providers-schema/schema.json - go_test: - name: go test + go_test_databases: + name: go test Databases + needs: [go_build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 + with: + go-version-file: go.mod + - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloud(Essentials|Pro|ActiveActive)Database_.*"' + + go_test_subscriptions: + name: go test Subscriptions + needs: [go_build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 + with: + go-version-file: go.mod + - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloud(Essentials|Pro|ActiveActive)Subscription_.*"' + + go_test_subscriptions_tls: + name: go test Subscriptions TLS + needs: [go_build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 + with: + go-version-file: go.mod + - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloudSubscriptionTls_.*"' + + go_test_essentials_plan: + name: go test Essentials Plan + needs: [go_build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 + with: + go-version-file: go.mod + - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloudEssentialsPlan_.*"' + + go_test_other: + name: go test Other needs: [go_build] runs-on: ubuntu-latest steps: @@ -95,48 +159,29 @@ jobs: - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: go-version-file: go.mod - - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 - id: filter + - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloud(DataPersistence|DatabaseModules|Regions|Acl).*"' + + go_test_cloud_account: + name: go test Cloud Account + needs: [go_build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - filters: | - code-changes: - - 'go.mod' - - 'go.sum' - - 'provider/**' - - '*.go' - - '.github/workflows/**' - - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloud(Essentials|Pro|ActiveActive)Database.*"' - if: steps.filter.outputs.code-changes == 'true' - env: - REDISCLOUD_ACCESS_KEY: ${{ secrets.REDISCLOUD_ACCESS_KEY_STAGING }} - REDISCLOUD_SECRET_KEY: ${{ secrets.REDISCLOUD_SECRET_KEY_STAGING }} - REDISCLOUD_URL: ${{ secrets.REDISCLOUD_URL_STAGING }} - AWS_TEST_CLOUD_ACCOUNT_NAME: "${{ secrets.AWS_TEST_CLOUD_ACCOUNT_NAME_STAGING }}" - AWS_PEERING_REGION: ${{ secrets.AWS_PEERING_REGION }} - AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }} - AWS_VPC_CIDR: ${{ secrets.AWS_VPC_CIDR }} - AWS_VPC_ID: ${{ secrets.AWS_VPC_ID }} - AWS_TEST_TGW_ID: ${{ secrets.AWS_TEST_TGW_ID_STAGING }} - TF_ACC: true - TF_LOG: info - AWS_ACCESS_KEY_ID: ${{ secrets.CLOUD_ACCOUNT_KEY }} - AWS_ACCESS_SECRET_KEY: ${{ secrets.CLOUD_ACCOUNT_SECRET }} - AWS_CONSOLE_USERNAME: ${{ secrets.CLOUD_ACCOUNT_USERNAME }} - AWS_CONSOLE_PASSWORD: ${{ secrets.CLOUD_ACCOUNT_PASS }} - AWS_SIGNIN_URL: ${{ secrets.CLOUD_ACCOUNT_URL }} - GCP_VPC_PROJECT: ${{ secrets.GCP_VPC_PROJECT }} - GCP_VPC_ID: ${{ secrets.GCP_VPC_ID }} - GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }} - GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }} - - name: Generate code coverage report - if: steps.filter.outputs.code-changes == 'true' && (success() || failure()) - run: make generate_coverage - - name: Upload code coverage report - if: steps.filter.outputs.code-changes == 'true' && (success() || failure()) - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + go-version-file: go.mod + - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloud(CloudAccount).*"' + + go_test_transit_payment: + name: go test Transit Gateway & Payment + needs: [go_build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - name: coverage.html - path: bin/coverage.html + go-version-file: go.mod + - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloud(TransitGatewayAttachment|PaymentMethod).*"' tfproviderlint: name: tfproviderlint @@ -148,4 +193,3 @@ jobs: with: go-version-file: go.mod - run: make tfproviderlint - diff --git a/provider/datasource_rediscloud_cloud_account_test.go b/provider/datasource_rediscloud_cloud_account_test.go index 0e1c0482..40037e57 100644 --- a/provider/datasource_rediscloud_cloud_account_test.go +++ b/provider/datasource_rediscloud_cloud_account_test.go @@ -11,7 +11,7 @@ import ( func TestAccDataSourceRedisCloudCloudAccount_basic(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_CLOUD_ACCOUNT") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") diff --git a/provider/datasource_rediscloud_data_persistence_test.go b/provider/datasource_rediscloud_data_persistence_test.go index fead34d1..a01c85c1 100644 --- a/provider/datasource_rediscloud_data_persistence_test.go +++ b/provider/datasource_rediscloud_data_persistence_test.go @@ -8,7 +8,7 @@ import ( func TestAccDataSourceRedisCloudDataPersistence_basic(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_PERSISTENCE") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") const dataPersistenceFoo = "data.rediscloud_data_persistence.foo" resource.ParallelTest(t, resource.TestCase{ diff --git a/provider/datasource_rediscloud_database_modules_test.go b/provider/datasource_rediscloud_database_modules_test.go index 984734c5..db1d82a9 100644 --- a/provider/datasource_rediscloud_database_modules_test.go +++ b/provider/datasource_rediscloud_database_modules_test.go @@ -8,7 +8,7 @@ import ( func TestAccDataSourceRedisCloudDatabaseModules_basic(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_API_DATA") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/provider/datasource_rediscloud_essentials_plan_test.go b/provider/datasource_rediscloud_essentials_plan_test.go index ff0f5269..499feba4 100644 --- a/provider/datasource_rediscloud_essentials_plan_test.go +++ b/provider/datasource_rediscloud_essentials_plan_test.go @@ -8,7 +8,7 @@ import ( func TestAccDataSourceRedisCloudEssentialsPlan_basic(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") const basicPlan = "data.rediscloud_essentials_plan.basic" @@ -50,7 +50,7 @@ func TestAccDataSourceRedisCloudEssentialsPlan_basic(t *testing.T) { func TestAccDataSourceRedisCloudEssentialsPlan_azure(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") const azurePlan = "data.rediscloud_essentials_plan.azure" @@ -92,7 +92,7 @@ func TestAccDataSourceRedisCloudEssentialsPlan_azure(t *testing.T) { func TestAccDataSourceRedisCloudEssentialsPlan_subscriptionId(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") const examplePlan = "data.rediscloud_essentials_plan.example" @@ -136,7 +136,7 @@ func TestAccDataSourceRedisCloudEssentialsPlan_subscriptionId(t *testing.T) { func TestAccDataSourceRedisCloudEssentialsPlan_ambiguous(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -153,7 +153,7 @@ func TestAccDataSourceRedisCloudEssentialsPlan_ambiguous(t *testing.T) { func TestAccDataSourceRedisCloudEssentialsPlan_impossible(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_ESSENTIALS") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/provider/datasource_rediscloud_payment_method_test.go b/provider/datasource_rediscloud_payment_method_test.go index 2c4a6efc..b8249b00 100644 --- a/provider/datasource_rediscloud_payment_method_test.go +++ b/provider/datasource_rediscloud_payment_method_test.go @@ -8,7 +8,7 @@ import ( func TestAccDataSourceRedisCloudPaymentMethod_basic(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_PAYMENT_METHOD") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/provider/datasource_rediscloud_pro_subscription_test.go b/provider/datasource_rediscloud_pro_subscription_test.go index 32c7193f..f9ba9ffd 100644 --- a/provider/datasource_rediscloud_pro_subscription_test.go +++ b/provider/datasource_rediscloud_pro_subscription_test.go @@ -12,7 +12,7 @@ import ( func TestAccDataSourceRedisCloudProSubscription_basic(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix("tf-test") @@ -61,7 +61,7 @@ func TestAccDataSourceRedisCloudProSubscription_basic(t *testing.T) { func TestAccDataSourceRedisCloudProSubscription_ignoresAA(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) diff --git a/provider/datasource_rediscloud_regions_test.go b/provider/datasource_rediscloud_regions_test.go index 298dff2e..d9736f4b 100644 --- a/provider/datasource_rediscloud_regions_test.go +++ b/provider/datasource_rediscloud_regions_test.go @@ -8,7 +8,7 @@ import ( func TestAccDataSourceRedisCloudRegions_all(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_REGIONS") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -44,7 +44,7 @@ func TestAccDataSourceRedisCloudRegions_all(t *testing.T) { func TestAccDataSourceRedisCloudRegions_AWS(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_REGIONS") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -71,7 +71,7 @@ func TestAccDataSourceRedisCloudRegions_AWS(t *testing.T) { func TestAccDataSourceRedisCloudRegions_GCP(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_REGIONS") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/provider/datasource_rediscloud_subscription_peerings_test.go b/provider/datasource_rediscloud_subscription_peerings_test.go index 3f85057d..99786533 100644 --- a/provider/datasource_rediscloud_subscription_peerings_test.go +++ b/provider/datasource_rediscloud_subscription_peerings_test.go @@ -12,7 +12,7 @@ import ( func TestAccDataSourceRedisCloudSubscriptionPeerings_basic(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_PEERING") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) diff --git a/provider/rediscloud_acl_role_test.go b/provider/rediscloud_acl_role_test.go index 72a60055..4753bf30 100644 --- a/provider/rediscloud_acl_role_test.go +++ b/provider/rediscloud_acl_role_test.go @@ -15,7 +15,7 @@ import ( func TestAccResourceRedisCloudAclRole_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_ACL") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") prefix := acctest.RandomWithPrefix(testResourcePrefix) exampleCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") diff --git a/provider/rediscloud_acl_rule_test.go b/provider/rediscloud_acl_rule_test.go index be25e7e0..2d5dbeca 100644 --- a/provider/rediscloud_acl_rule_test.go +++ b/provider/rediscloud_acl_rule_test.go @@ -12,9 +12,9 @@ import ( "testing" ) -func TestAccRedisCloudAclRule_DataSourceForDefaultRule(t *testing.T) { +func TestAccDataSourceRedisCloudAclRule_ForDefaultRule(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TESTACC_ACL") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") // This rule already exists const testName = "Read-Write" @@ -42,7 +42,7 @@ func TestAccRedisCloudAclRule_DataSourceForDefaultRule(t *testing.T) { func TestAccResourceRedisCloudAclRule_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_ACL") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") prefix := acctest.RandomWithPrefix(testResourcePrefix) testName := prefix + "-test-rule" diff --git a/provider/rediscloud_acl_user_test.go b/provider/rediscloud_acl_user_test.go index a18c92fc..33c6f584 100644 --- a/provider/rediscloud_acl_user_test.go +++ b/provider/rediscloud_acl_user_test.go @@ -15,7 +15,7 @@ import ( func TestAccResourceRedisCloudAclUser_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_ACL") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") prefix := acctest.RandomWithPrefix(testResourcePrefix) exampleCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") diff --git a/provider/rediscloud_active_active_private_service_connect_endpoint_accepter_test.go b/provider/rediscloud_active_active_private_service_connect_endpoint_accepter_test.go index bb8bf324..82a3b9f1 100644 --- a/provider/rediscloud_active_active_private_service_connect_endpoint_accepter_test.go +++ b/provider/rediscloud_active_active_private_service_connect_endpoint_accepter_test.go @@ -15,7 +15,7 @@ import ( func TestAccResourceRedisCloudActiveActivePrivateServiceConnectEndpointAccepter_Create(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUB_ACTIVE_ACTIVE") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-pscea" diff --git a/provider/rediscloud_active_active_private_service_connect_endpoint_test.go b/provider/rediscloud_active_active_private_service_connect_endpoint_test.go index 363de559..21163a50 100644 --- a/provider/rediscloud_active_active_private_service_connect_endpoint_test.go +++ b/provider/rediscloud_active_active_private_service_connect_endpoint_test.go @@ -12,7 +12,7 @@ import ( func TestAccResourceRedisCloudActiveActivePrivateServiceConnectEndpoint_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-psce" diff --git a/provider/rediscloud_active_active_private_service_connect_test.go b/provider/rediscloud_active_active_private_service_connect_test.go index 6c59ccca..b19a0994 100644 --- a/provider/rediscloud_active_active_private_service_connect_test.go +++ b/provider/rediscloud_active_active_private_service_connect_test.go @@ -10,7 +10,7 @@ import ( func TestAccResourceRedisCloudActiveActivePrivateServiceConnect_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-psc" diff --git a/provider/rediscloud_active_active_subscription_test.go b/provider/rediscloud_active_active_subscription_test.go index 7c20bc64..06d63faf 100644 --- a/provider/rediscloud_active_active_subscription_test.go +++ b/provider/rediscloud_active_active_subscription_test.go @@ -23,7 +23,7 @@ var activeActiveMarketplaceFlag = flag.Bool("activeActiveMarketplace", false, // Checks CRUDI (CREATE,READ,UPDATE,IMPORT) operations on the subscription resource. func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUB_ACTIVE_ACTIVE") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) const resourceName = "rediscloud_active_active_subscription.example" @@ -222,6 +222,8 @@ func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) { func TestAccResourceRedisCloudActiveActiveSubscription_createUpdateContractPayment(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + if !*activeActiveContractFlag { t.Skip("The '-activeActiveContract' parameter wasn't provided in the test command.") } @@ -260,6 +262,8 @@ func TestAccResourceRedisCloudActiveActiveSubscription_createUpdateContractPayme func TestAccResourceRedisCloudActiveActiveSubscription_createUpdateMarketplacePayment(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + if !*activeActiveMarketplaceFlag { t.Skip("The '-activeActiveMarketplace' parameter wasn't provided in the test command.") } diff --git a/provider/rediscloud_essentials_subscription_test.go b/provider/rediscloud_essentials_subscription_test.go index efc9de37..5c4dad4c 100644 --- a/provider/rediscloud_essentials_subscription_test.go +++ b/provider/rediscloud_essentials_subscription_test.go @@ -13,7 +13,7 @@ import ( func TestAccResourceRedisCloudEssentialsSubscription_FreeCRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") subscriptionName := acctest.RandomWithPrefix(testResourcePrefix) subscriptionNameUpdated := subscriptionName + "-updated" @@ -78,7 +78,7 @@ func TestAccResourceRedisCloudEssentialsSubscription_FreeCRUDI(t *testing.T) { func TestAccResourceRedisCloudEssentialsSubscription_PaidCRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") subscriptionName := acctest.RandomWithPrefix(testResourcePrefix) subscriptionNameUpdated := subscriptionName + "-updated" diff --git a/provider/rediscloud_private_service_connect_endpoint_accepter_test.go b/provider/rediscloud_private_service_connect_endpoint_accepter_test.go index e388da0f..5680269e 100644 --- a/provider/rediscloud_private_service_connect_endpoint_accepter_test.go +++ b/provider/rediscloud_private_service_connect_endpoint_accepter_test.go @@ -15,7 +15,7 @@ import ( func TestAccResourceRedisCloudPrivateServiceConnectEndpointAccepter_Create(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-pscea" diff --git a/provider/rediscloud_private_service_connect_endpoint_test.go b/provider/rediscloud_private_service_connect_endpoint_test.go index a96ba696..46351f96 100644 --- a/provider/rediscloud_private_service_connect_endpoint_test.go +++ b/provider/rediscloud_private_service_connect_endpoint_test.go @@ -12,7 +12,7 @@ import ( func TestAccResourceRedisCloudPrivateServiceConnectEndpoint_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-psce" diff --git a/provider/rediscloud_private_service_connect_test.go b/provider/rediscloud_private_service_connect_test.go index 10da11ea..1b8ab305 100644 --- a/provider/rediscloud_private_service_connect_test.go +++ b/provider/rediscloud_private_service_connect_test.go @@ -10,7 +10,7 @@ import ( func TestAccResourceRedisCloudPrivateServiceConnect_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_CONNECT_ENDPOINT") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") baseName := acctest.RandomWithPrefix(testResourcePrefix) + "-pro-psc" diff --git a/provider/rediscloud_transit_gateway_attachment_test.go b/provider/rediscloud_transit_gateway_attachment_test.go index 9389b72b..777860ff 100644 --- a/provider/rediscloud_transit_gateway_attachment_test.go +++ b/provider/rediscloud_transit_gateway_attachment_test.go @@ -12,7 +12,7 @@ import ( func TestAccResourceRedisCloudTransitGatewayAttachment_Pro(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_TRANSIT_GATEWAY") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") testTgwId := os.Getenv("AWS_TEST_TGW_ID") diff --git a/provider/resource_rediscloud_cloud_account_test.go b/provider/resource_rediscloud_cloud_account_test.go index f91b2fb8..2f7e2499 100644 --- a/provider/resource_rediscloud_cloud_account_test.go +++ b/provider/resource_rediscloud_cloud_account_test.go @@ -15,6 +15,8 @@ import ( func TestAccResourceRedisCloudCloudAccount_basic(t *testing.T) { + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + if testing.Short() { t.Skip("Required environment variables currently not available under CI") } diff --git a/provider/resource_rediscloud_pro_subscription_test.go b/provider/resource_rediscloud_pro_subscription_test.go index 0d41b9dc..6d839cc1 100644 --- a/provider/resource_rediscloud_pro_subscription_test.go +++ b/provider/resource_rediscloud_pro_subscription_test.go @@ -27,7 +27,7 @@ var marketplaceFlag = flag.Bool("marketplace", false, // Checks CRUDI (CREATE,READ,UPDATE,IMPORT) operations on the subscription resource. func TestAccResourceRedisCloudProSubscription_CRUDI(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) const resourceName = "rediscloud_subscription.example" @@ -133,7 +133,7 @@ func TestAccResourceRedisCloudProSubscription_CRUDI(t *testing.T) { func TestAccResourceRedisCloudProSubscription_preferredAZsModulesOptional(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) const resourceName = "rediscloud_subscription.example" @@ -157,7 +157,7 @@ func TestAccResourceRedisCloudProSubscription_preferredAZsModulesOptional(t *tes func TestAccResourceRedisCloudProSubscription_createUpdateContractPayment(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") if !*contractFlag { t.Skip("The '-contract' parameter wasn't provided in the test command.") @@ -196,7 +196,7 @@ func TestAccResourceRedisCloudProSubscription_createUpdateContractPayment(t *tes func TestAccResourceRedisCloudProSubscription_createUpdateMarketplacePayment(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") if !*marketplaceFlag { t.Skip("The '-marketplace' parameter wasn't provided in the test command.") @@ -233,7 +233,7 @@ func TestAccResourceRedisCloudProSubscription_createUpdateMarketplacePayment(t * func TestAccResourceRedisCloudProSubscription_RedisVersion(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) testCloudAccountName := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME") @@ -281,7 +281,7 @@ func TestAccResourceRedisCloudProSubscription_RedisVersion(t *testing.T) { func TestAccResourceRedisCloudProSubscription_MaintenanceWindows(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) + "-mw" resourceName := "rediscloud_subscription.example" diff --git a/provider/resource_rediscloud_pro_tls_test.go b/provider/resource_rediscloud_pro_tls_test.go index ff09fc5e..a0d44766 100644 --- a/provider/resource_rediscloud_pro_tls_test.go +++ b/provider/resource_rediscloud_pro_tls_test.go @@ -18,9 +18,9 @@ var sslCertificate = "-----BEGIN CERTIFICATE-----\\nMIIFYzCCA0ugAwIBAgIUSy/xBxWL var invalidSslCertificate = "I am not a valid certificate" // enable_tls=true, client_ssl_certificate= -func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndSslCert(t *testing.T) { +func TestAccResourceRedisCloudSubscriptionTls_createWithDatabaseWithEnabledTlsAndSslCert(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) @@ -125,9 +125,9 @@ func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndSs } // enable_tls=true, client_ssl_certificate="" -func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndEmptySslCert(t *testing.T) { +func TestAccResourceRedisCloudSubscriptionTls_createWithDatabaseWithEnabledTlsAndEmptySslCert(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) @@ -204,9 +204,9 @@ func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndEm } // enable_tls=true, client_ssl_certificate= -func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndInvalidSslCert(t *testing.T) { +func TestAccResourceRedisCloudSubscriptionTls_createWithDatabaseWithEnabledTlsAndInvalidSslCert(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) @@ -254,9 +254,9 @@ func TestAccResourceRedisCloudSubscription_createWithDatabaseAndDisabledTlsAndIn } // enable_tls=false, client_ssl_certificate="", client_tls_certificates=["something"] -func TestAccResourceRedisCloudSubscription_createWithoutEnableTlsAndTlsCert(t *testing.T) { +func TestAccResourceRedisCloudSubscriptionTls_createWithoutEnableTlsAndTlsCert(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) @@ -278,9 +278,9 @@ func TestAccResourceRedisCloudSubscription_createWithoutEnableTlsAndTlsCert(t *t }) } -func TestAccResourceRedisCloudSubscription_createWithSslCertAndTlsCert(t *testing.T) { +func TestAccResourceRedisCloudSubscriptionTls_createWithSslCertAndTlsCert(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) @@ -303,9 +303,9 @@ func TestAccResourceRedisCloudSubscription_createWithSslCertAndTlsCert(t *testin } // enable_tls=true, client_ssl_certificate="", client_tls_certificates=["something"] -func TestAccResourceRedisCloudSubscription_createWithDatabaseWithEnabledTlsAndTlsCert(t *testing.T) { +func TestAccResourceRedisCloudSubscriptionTls_createWithDatabaseWithEnabledTlsAndTlsCert(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) password := acctest.RandString(20) diff --git a/provider/resource_rediscloud_subscription_peering_test.go b/provider/resource_rediscloud_subscription_peering_test.go index 4235a05e..28c68db0 100644 --- a/provider/resource_rediscloud_subscription_peering_test.go +++ b/provider/resource_rediscloud_subscription_peering_test.go @@ -13,7 +13,7 @@ import ( func TestAccResourceRedisCloudSubscriptionPeering_aws(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_PEERING") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) @@ -77,7 +77,7 @@ func TestAccResourceRedisCloudSubscriptionPeering_aws(t *testing.T) { func TestAccResourceRedisCloudSubscriptionPeering_gcp(t *testing.T) { - testAccRequiresEnvVar(t, "EXECUTE_TEST_PEERING") + testAccRequiresEnvVar(t, "EXECUTE_TESTS") name := acctest.RandomWithPrefix(testResourcePrefix) From 913a3d8ea7e0825d059898330235fc637d30694e Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Fri, 11 Apr 2025 14:37:11 +0100 Subject: [PATCH 05/10] Corrects env values --- .github/workflows/terraform_provider.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index b117d3ca..2bd8176a 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -13,15 +13,15 @@ env: TERRAFORM_VERSION: "1.2.6" REDISCLOUD_ACCESS_KEY: ${{ secrets.REDISCLOUD_ACCESS_KEY_STAGING }} REDISCLOUD_SECRET_KEY: ${{ secrets.REDISCLOUD_SECRET_KEY_STAGING }} - REDISCLOUD_URL: \{\{ secrets\.REDISCLOUD\_URL\_STAGING \}\} -AWS\_TEST\_CLOUD\_ACCOUNT\_NAME\: "{{ secrets.AWS_TEST_CLOUD_ACCOUNT_NAME_STAGING }}" + REDISCLOUD_URL: ${{ secrets.REDISCLOUD_URL_STAGING }} + AWS_TEST_CLOUD_ACCOUNT_NAME: "${{ secrets.AWS_TEST_CLOUD_ACCOUNT_NAME_STAGING }}" AWS_PEERING_REGION: ${{ secrets.AWS_PEERING_REGION }} AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }} AWS_VPC_CIDR: ${{ secrets.AWS_VPC_CIDR }} AWS_VPC_ID: ${{ secrets.AWS_VPC_ID }} AWS_TEST_TGW_ID: ${{ secrets.AWS_TEST_TGW_ID_STAGING }} TF_ACC: true - TF_LOG: info + TF_LOG: debug AWS_ACCESS_KEY_ID: ${{ secrets.CLOUD_ACCOUNT_KEY }} AWS_ACCESS_SECRET_KEY: ${{ secrets.CLOUD_ACCOUNT_SECRET }} AWS_CONSOLE_USERNAME: ${{ secrets.CLOUD_ACCOUNT_USERNAME }} From eb132c6c9bc1ee05db5563307d8d3d8d11580edf Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Fri, 11 Apr 2025 14:41:08 +0100 Subject: [PATCH 06/10] Corrects env values --- .github/workflows/terraform_provider.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index 2bd8176a..18a8d13d 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -72,13 +72,13 @@ jobs: timeout-minutes: 2 with: path: terraform-providers-schema - key: \{\{ runner\.os \}\}\-terraform\-providers\-schema\-{{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }} + key: ${{ runner.os }}-terraform-providers-schema-${{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }} - if: steps.cache-terraform-providers-schema.outputs.cache-hit != 'true' || steps.cache-terraform-providers-schema.outcome == 'failure' uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 timeout-minutes: 2 with: path: terraform-plugin-dir - key: \{\{ runner\.os \}\}\-terraform\-plugin\-dir\-{{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }} + key: ${{ runner.os }}-terraform-plugin-dir-${{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }} - if: steps.cache-terraform-providers-schema.outputs.cache-hit != 'true' || steps.cache-terraform-providers-schema.outcome == 'failure' uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2 with: From bf4b2df96ae12cfa9bea36a2f67c93ba4d3d42ff Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Fri, 11 Apr 2025 14:45:40 +0100 Subject: [PATCH 07/10] Update order of execution --- .github/workflows/terraform_provider.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index 18a8d13d..2f916aa1 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -119,7 +119,7 @@ jobs: go_test_subscriptions: name: go test Subscriptions - needs: [go_build] + needs: [go_test_databases] runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -130,7 +130,7 @@ jobs: go_test_subscriptions_tls: name: go test Subscriptions TLS - needs: [go_build] + needs: [go_test_subscriptions] runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -141,7 +141,7 @@ jobs: go_test_essentials_plan: name: go test Essentials Plan - needs: [go_build] + needs: [go_test_subscriptions_tls] runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -152,7 +152,7 @@ jobs: go_test_other: name: go test Other - needs: [go_build] + needs: [go_test_essentials_plan] runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -163,7 +163,7 @@ jobs: go_test_cloud_account: name: go test Cloud Account - needs: [go_build] + needs: [go_test_other] runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -174,7 +174,7 @@ jobs: go_test_transit_payment: name: go test Transit Gateway & Payment - needs: [go_build] + needs: [go_test_cloud_account] runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 From 2a6533724b335880ec5713667edfb8a34524e763 Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Fri, 11 Apr 2025 14:49:00 +0100 Subject: [PATCH 08/10] sets tf_log to info --- .github/workflows/terraform_provider.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index 2f916aa1..22e06bcf 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -21,7 +21,7 @@ env: AWS_VPC_ID: ${{ secrets.AWS_VPC_ID }} AWS_TEST_TGW_ID: ${{ secrets.AWS_TEST_TGW_ID_STAGING }} TF_ACC: true - TF_LOG: debug + TF_LOG: info AWS_ACCESS_KEY_ID: ${{ secrets.CLOUD_ACCOUNT_KEY }} AWS_ACCESS_SECRET_KEY: ${{ secrets.CLOUD_ACCOUNT_SECRET }} AWS_CONSOLE_USERNAME: ${{ secrets.CLOUD_ACCOUNT_USERNAME }} From 6fa4051f460475b9816705c3d21812d0397d26d8 Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Fri, 11 Apr 2025 15:48:49 +0100 Subject: [PATCH 09/10] Updates to address test lint errors --- .../datasource_rediscloud_acl_rule_test.go | 42 +++++++++++++++++++ ...o => resource_rediscloud_acl_rule_test.go} | 28 ------------- provider/resource_rediscloud_pro_tls_test.go | 2 +- 3 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 provider/datasource_rediscloud_acl_rule_test.go rename provider/{rediscloud_acl_rule_test.go => resource_rediscloud_acl_rule_test.go} (85%) diff --git a/provider/datasource_rediscloud_acl_rule_test.go b/provider/datasource_rediscloud_acl_rule_test.go new file mode 100644 index 00000000..418e6bdc --- /dev/null +++ b/provider/datasource_rediscloud_acl_rule_test.go @@ -0,0 +1,42 @@ +package provider + +import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "regexp" + "testing" +) + +func TestAccDataSourceRedisCloudAclRule_ForDefaultRule(t *testing.T) { + + testAccRequiresEnvVar(t, "EXECUTE_TESTS") + + // This rule already exists + const testName = "Read-Write" + const testRule = "+@all -@dangerous ~*" + getRuleTerraform := fmt.Sprintf(getDefaultDatasourceAclRuleDataSource, testName) + + const AclRuleTest = "data.rediscloud_acl_rule.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + ProviderFactories: providerFactories, + CheckDestroy: nil, // test doesn't create a resource, so don't need to check anything + Steps: []resource.TestStep{ + { + Config: getRuleTerraform, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestMatchResourceAttr( + AclRuleTest, "id", regexp.MustCompile("^\\d*$")), + resource.TestCheckResourceAttr(AclRuleTest, "name", testName), + resource.TestCheckResourceAttr(AclRuleTest, "rule", testRule), + ), + }, + }, + }) +} + +const getDefaultDatasourceAclRuleDataSource = ` +data "rediscloud_acl_rule" "test" { + name = "%s" +} +` diff --git a/provider/rediscloud_acl_rule_test.go b/provider/resource_rediscloud_acl_rule_test.go similarity index 85% rename from provider/rediscloud_acl_rule_test.go rename to provider/resource_rediscloud_acl_rule_test.go index 2d5dbeca..4e654aa3 100644 --- a/provider/rediscloud_acl_rule_test.go +++ b/provider/resource_rediscloud_acl_rule_test.go @@ -12,34 +12,6 @@ import ( "testing" ) -func TestAccDataSourceRedisCloudAclRule_ForDefaultRule(t *testing.T) { - - testAccRequiresEnvVar(t, "EXECUTE_TESTS") - - // This rule already exists - const testName = "Read-Write" - const testRule = "+@all -@dangerous ~*" - getRuleTerraform := fmt.Sprintf(getDefaultAclRuleDataSource, testName) - - const AclRuleTest = "data.rediscloud_acl_rule.test" - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - ProviderFactories: providerFactories, - CheckDestroy: nil, // test doesn't create a resource, so don't need to check anything - Steps: []resource.TestStep{ - { - Config: getRuleTerraform, - Check: resource.ComposeAggregateTestCheckFunc( - resource.TestMatchResourceAttr( - AclRuleTest, "id", regexp.MustCompile("^\\d*$")), - resource.TestCheckResourceAttr(AclRuleTest, "name", testName), - resource.TestCheckResourceAttr(AclRuleTest, "rule", testRule), - ), - }, - }, - }) -} - func TestAccResourceRedisCloudAclRule_CRUDI(t *testing.T) { testAccRequiresEnvVar(t, "EXECUTE_TESTS") diff --git a/provider/resource_rediscloud_pro_tls_test.go b/provider/resource_rediscloud_pro_tls_test.go index a0d44766..2c0b86ac 100644 --- a/provider/resource_rediscloud_pro_tls_test.go +++ b/provider/resource_rediscloud_pro_tls_test.go @@ -229,7 +229,7 @@ func TestAccResourceRedisCloudSubscriptionTls_createWithDatabaseWithEnabledTlsAn } // enable_tls=false, client_ssl_certificate= -func TestAccResourceRedisCloudSubscription_createWithDatabaseAndDisabledTlsAndInvalidCert(t *testing.T) { +func TestAccResourceRedisCloudSubscriptionTls_createWithDatabaseAndDisabledTlsAndInvalidCert(t *testing.T) { testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION") From 0cb06765452fe93eedc8d91a61efa4389a6b6a64 Mon Sep 17 00:00:00 2001 From: Trent Rosenbaum Date: Tue, 15 Apr 2025 10:40:22 +0100 Subject: [PATCH 10/10] Disbales TestAccResourceRedisCloudCloudAccount_basic and renames go_test_other --- .github/workflows/terraform_provider.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/terraform_provider.yml b/.github/workflows/terraform_provider.yml index 22e06bcf..1a5d9dbe 100644 --- a/.github/workflows/terraform_provider.yml +++ b/.github/workflows/terraform_provider.yml @@ -150,7 +150,7 @@ jobs: go-version-file: go.mod - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloudEssentialsPlan_.*"' - go_test_other: + go_test_persistence_modules_regions_acl: name: go test Other needs: [go_test_essentials_plan] runs-on: ubuntu-latest @@ -163,14 +163,14 @@ jobs: go_test_cloud_account: name: go test Cloud Account - needs: [go_test_other] + needs: [go_test_persistence_modules_regions_acl] runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: go-version-file: go.mod - - run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAcc(DataSource|Resource)RedisCloud(CloudAccount).*"' + - run: EXECUTE_TESTS=true make testacc TESTARGS='-test.short -run="TestAcc(DataSource|Resource)RedisCloud(CloudAccount).*"' go_test_transit_payment: name: go test Transit Gateway & Payment