fix: fixing tests and flags

Author: burythehammer

provider/rediscloud_active_active_subscription_test.go

@@ -24,7 +24,7 @@ var activeActiveMarketplaceFlag = flag.Bool("activeActiveMarketplace", false,
 // Also checks active-active subscription regions.
 func TestAccResourceRedisCloudActiveActiveSubscription_CRUDI(t *testing.T) {
 
-	//testAccRequiresEnvVar(t, "EXECUTE_TESTS")
+	testAccRequiresEnvVar(t, "EXECUTE_TESTS")
 
 	name := acctest.RandomWithPrefix(testResourcePrefix)
 	const resourceName = "rediscloud_active_active_subscription.example"

provider/rediscloud_essentials_subscription_test.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"github.com/RedisLabs/rediscloud-go-api/redis"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
@@ -12,6 +13,9 @@ import (
 	"testing"
 )
 
+var essentialsMarketplaceFlag = flag.Bool("essentialsMarketplace", false,
+	"Add this flag '-essentialsMarketplace' to run tests for marketplace associated accounts")
+
 func TestAccResourceRedisCloudEssentialsSubscription_Free_CRUDI(t *testing.T) {
 
 	testAccRequiresEnvVar(t, "EXECUTE_TESTS")
@@ -212,7 +216,11 @@ func TestAccResourceRedisCloudEssentialsSubscription_Paid_NoPaymentType_CRUDI(t
 func TestAccResourceRedisCloudEssentialsSubscription_Paid_Marketplace_CRUDI(t *testing.T) {
 	// Only the qa environment has access to the marketplace, so this test will normally fail.
 	// Leaving this in the test suite for manual runs
-	testAccRequiresEnvVar(t, "EXECUTE_QA_TESTS")
+	testAccRequiresEnvVar(t, "EXECUTE_TESTS")
+
+	if !*essentialsMarketplaceFlag {
+		t.Skip("The '-essentialsMarketplace' parameter wasn't provided in the test command.")
+	}
 
 	subscriptionName := acctest.RandomWithPrefix(testResourcePrefix)
 	subscriptionNameUpdated := subscriptionName + "-updated"
@@ -233,16 +241,16 @@ func TestAccResourceRedisCloudEssentialsSubscription_Paid_Marketplace_CRUDI(t *t
 					resource.TestCheckResourceAttr(resourceName, "name", subscriptionName),
 					resource.TestCheckResourceAttr(resourceName, "status", "active"),
 					resource.TestCheckResourceAttrSet(resourceName, "plan_id"),
-					resource.TestCheckResourceAttr(resourceName, "payment_method", "credit-card"),
-					resource.TestCheckResourceAttrSet(resourceName, "payment_method_id"),
+					resource.TestCheckNoResourceAttr(datasourceName, "payment_method_id"),
+					//resource.TestCheckResourceAttr(resourceName, "payment_method", "marketplace"), // empty from API?
 					resource.TestCheckResourceAttrSet(resourceName, "creation_date"),
 
 					// Test the datasource
 					resource.TestCheckResourceAttrSet(datasourceName, "id"),
 					resource.TestCheckResourceAttr(datasourceName, "name", subscriptionName),
 					resource.TestCheckResourceAttr(datasourceName, "status", "active"),
 					resource.TestCheckResourceAttrSet(datasourceName, "plan_id"),
-					resource.TestCheckResourceAttrSet(datasourceName, "payment_method_id"),
+					resource.TestCheckNoResourceAttr(datasourceName, "payment_method_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "creation_date"),
 				),
 			},