test: fix and improve acceptance tests (#390)

EnterpriseDB · Nov 8, 2023 · f897b77 · f897b77
1 parent 400e7f9
commit f897b77
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/pkg/provider/resource_cluster.go b/pkg/provider/resource_cluster.go
@@ -206,6 +206,7 @@ func (c *clusterResource) Schema(ctx context.Context, req resource.SchemaRequest
 					},
 					"name": schema.StringAttribute{
 						MarkdownDescription: "Name.",
+						Optional:            true,
 						Computed:            true,
 						PlanModifiers:       []planmodifier.String{stringplanmodifier.UseStateForUnknown()},
 					},

diff --git a/pkg/provider/resource_cluster_test.go b/pkg/provider/resource_cluster_test.go
@@ -50,6 +50,7 @@ func TestAccResourceCluster_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("biganimal_cluster.acctest_cluster", "backup_retention_period", "10d"),
 					resource.TestCheckResourceAttr("biganimal_cluster.acctest_cluster", "cluster_architecture.id", "ha"),
 					resource.TestCheckResourceAttr("biganimal_cluster.acctest_cluster", "cluster_architecture.nodes", "2"),
+					resource.TestCheckResourceAttr("biganimal_cluster.acctest_cluster", "cluster_architecture.name", "Primary/Standby High Availability"),
 				),
 			},
 		},
@@ -103,6 +104,7 @@ func clusterResourceConfig(cluster_name, projectID, provider, region string) str
   pg_version            = "15"
   private_networking    = false
   read_only_connections = false
+  superuser_access      = true
 }`, cluster_name, projectID, provider, region)
 }
 
@@ -118,6 +120,7 @@ func clusterResourceConfigForUpdate(cluster_name, projectID, provider, region st
   cluster_architecture {
     id    = "ha"
     nodes = 2
+    name = "Primary/Standby High Availability"
   }
   csp_auth = true
 
@@ -153,5 +156,6 @@ func clusterResourceConfigForUpdate(cluster_name, projectID, provider, region st
   pg_version            = "15"
   private_networking    = false
   read_only_connections = false
+  superuser_access      = true
 }`, cluster_name, projectID, provider, region)
 }
diff --git a/pkg/provider/resource_pgd_test.go b/pkg/provider/resource_pgd_test.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
@@ -12,10 +13,13 @@ func TestAccResourcePGD_basic(t *testing.T) {
 	var (
 		acc_env_vars_checklist = []string{
 			"BA_TF_ACC_VAR_pgd_project_id",
-			"BA_TF_ACC_VAR_pgd_name",
+			"BA_TF_ACC_VAR_pgd_region_dg1",
+			"BA_TF_ACC_VAR_pgd_provider_dg1",
 		}
-		accPGDName   = os.Getenv("BA_TF_ACC_VAR_pgd_name")
-		accProjectID = os.Getenv("BA_TF_ACC_VAR_pgd_project_id")
+		accPgdClusterName = fmt.Sprintf("acctest_pgd_cluster_basic_%v", time.Now().Unix())
+		accProjectID      = os.Getenv("BA_TF_ACC_VAR_pgd_project_id")
+		accRegionDg1      = os.Getenv("BA_TF_ACC_VAR_pgd_region_dg1")
+		accProviderDg1    = os.Getenv("BA_TF_ACC_VAR_pgd_provider_dg1")
 	)
 
 	resource.Test(t, resource.TestCase{
@@ -26,18 +30,18 @@ func TestAccResourcePGD_basic(t *testing.T) {
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: pgdResourceConfig(accPGDName, accProjectID),
+				Config: pgdResourceConfig(accPgdClusterName, accProjectID, accProviderDg1, accRegionDg1),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("biganimal_pgd.acctest_pgd", "project_id", accProjectID),
-					resource.TestCheckResourceAttr("biganimal_pgd.acctest_pgd", "cluster_name", accPGDName),
+					resource.TestCheckResourceAttr("biganimal_pgd.acctest_pgd", "cluster_name", accPgdClusterName),
 					resource.TestCheckResourceAttrSet("biganimal_pgd.acctest_pgd", "cluster_id"),
 				),
 			},
 		},
 	})
 }
 
-func pgdResourceConfig(cluster_name, projectID string) string {
+func pgdResourceConfig(cluster_name, projectID, providerDg1, regionDg1 string) string {
 	return fmt.Sprintf(`resource "biganimal_pgd" "acctest_pgd" {
 	cluster_name = "%s"
 	project_id   = "%s"
@@ -86,10 +90,10 @@ func pgdResourceConfig(cluster_name, projectID string) string {
       }
       private_networking = false
       cloud_provider = {
-        cloud_provider_id = "azure"
+        cloud_provider_id = "%s"
       }
       region = {
-        region_id = "northeurope"
+        region_id = "%s"
       }
       maintenance_window = {
         is_enabled = true
@@ -98,5 +102,5 @@ func pgdResourceConfig(cluster_name, projectID string) string {
       }
     },
   ]
-  }`, cluster_name, projectID)
+  }`, cluster_name, projectID, providerDg1, regionDg1)
 }