Skip to content

Commit

Permalink
Fix to tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Lorna-Kelly committed Nov 7, 2024
1 parent 79cf137 commit c4135f8
Show file tree
Hide file tree
Showing 3 changed files with 128 additions and 103 deletions.
61 changes: 38 additions & 23 deletions ibm/service/database/resource_ibm_database_edb_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,23 +105,33 @@ func TestAccIBMDatabaseInstanceEDBReadReplicaPromotion(t *testing.T) {
CheckDestroy: testAccCheckIBMDatabaseInstanceDestroy,
Steps: []resource.TestStep{
{
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstanceEDBMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstanceEDBMinimal_ReadReplica(databaseResourceGroup, serviceName, sourceInstanceCRN)),
Config: testAccCheckIBMDatabaseInstanceEDBMinimal(databaseResourceGroup, serviceName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(sourceResource, &sourceInstanceCRN),
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(sourceResource, "name", serviceName),
resource.TestCheckResourceAttr(sourceResource, "service", "databases-for-enterprisedb"),
resource.TestCheckResourceAttr(sourceResource, "plan", "standard"),
resource.TestCheckResourceAttr(sourceResource, "location", acc.Region()),
),
},
{
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstanceEDBMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstanceEDBMinimal_ReadReplica(databaseResourceGroup, serviceName)),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "name", readReplicaName),
resource.TestCheckResourceAttr(replicaReplicaResource, "remote_leader_id", sourceInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "service", "databases-for-enterprisedb"),
resource.TestCheckResourceAttr(replicaReplicaResource, "plan", "standard"),
resource.TestCheckResourceAttr(replicaReplicaResource, "location", acc.Region()),
),
},
{
Config: testAccCheckIBMDatabaseInstanceEDBReadReplicaPromotion(databaseResourceGroup, serviceName),
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstanceEDBMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstanceEDBReadReplicaPromote(databaseResourceGroup, readReplicaName)),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(sourceResource, &sourceInstanceCRN),
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "name", readReplicaName),
resource.TestCheckResourceAttr(replicaReplicaResource, "service", "databases-for-enterprisedb"),
Expand All @@ -148,7 +158,7 @@ func testAccCheckIBMDatabaseInstanceEDBMinimal(databaseResourceGroup string, nam
service = "databases-for-enterprisedb"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
service_endpoints = "public-and-private"
group {
group_id = "member"
host_flavor {
Expand All @@ -159,7 +169,7 @@ func testAccCheckIBMDatabaseInstanceEDBMinimal(databaseResourceGroup string, nam
}
}
}
`, databaseResourceGroup, name, acc.Region())
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstanceEDBBasic(databaseResourceGroup string, name string) string {
Expand Down Expand Up @@ -285,18 +295,17 @@ func testAccCheckIBMDatabaseInstanceEDBReduced(databaseResourceGroup string, nam
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstanceEDBMinimal_ReadReplica(databaseResourceGroup string, name string, sourceInstanceCRN string) string {

func testAccCheckIBMDatabaseInstanceEDBMinimal_ReadReplica(databaseResourceGroup string, name string) string {
return fmt.Sprintf(`
resource "ibm_database" "%[2]s-replica" {
depends_on = [ibm_database.%[2]s]
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s-replica"
service = "databases-for-enterprisedb"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
remote_leader_id = "%[4]s"
remote_leader_id = ibm_database.%[2]s.id
group {
group_id = "member"
host_flavor {
Expand All @@ -307,24 +316,30 @@ func testAccCheckIBMDatabaseInstanceEDBMinimal_ReadReplica(databaseResourceGroup
}
}
}
`, databaseResourceGroup, name, acc.Region(), sourceInstanceCRN)
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstanceEDBReadReplicaPromotion(databaseResourceGroup string, name string) string {
func testAccCheckIBMDatabaseInstanceEDBReadReplicaPromote(databaseResourceGroup string, readReplicaName string) string {
return fmt.Sprintf(`
data "ibm_resource_group" "test_acc" {
is_default = true
# name = "%[1]s"
}
resource "ibm_database" "%[2]s-replica" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s-replica"
resource "ibm_database" "%[2]s" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s"
service = "databases-for-enterprisedb"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
remote_leader_id = ""
skip_initial_backup = true
group {
group_id = "member"
host_flavor {
id = "b3c.4x16.encrypted"
}
disk {
allocation_mb = 20480
}
}
}
`, databaseResourceGroup, name, acc.Region())
`, databaseResourceGroup, readReplicaName, acc.Region())
}
87 changes: 46 additions & 41 deletions ibm/service/database/resource_ibm_database_mysql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,31 @@ func TestAccIBMDatabaseInstanceMySQLReadReplicaPromotion(t *testing.T) {
CheckDestroy: testAccCheckIBMDatabaseInstanceDestroy,
Steps: []resource.TestStep{
{
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstanceMySQLMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstanceMySQLMinimal_ReadReplica(databaseResourceGroup, serviceName, sourceInstanceCRN)),
Config: testAccCheckIBMDatabaseInstanceMySQLMinimal(databaseResourceGroup, serviceName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(sourceResource, &sourceInstanceCRN),
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(sourceResource, "name", serviceName),
resource.TestCheckResourceAttr(sourceResource, "service", "databases-for-mysql"),
resource.TestCheckResourceAttr(sourceResource, "plan", "standard"),
resource.TestCheckResourceAttr(sourceResource, "location", acc.Region()),
),
},
{
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstanceMySQLMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstanceMySQLMinimal_ReadReplica(databaseResourceGroup, serviceName)),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "name", readReplicaName),
resource.TestCheckResourceAttr(replicaReplicaResource, "remote_leader_id", sourceInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "service", "databases-for-mysql"),
resource.TestCheckResourceAttr(replicaReplicaResource, "plan", "standard"),
resource.TestCheckResourceAttr(replicaReplicaResource, "location", acc.Region()),
),
},
{
Config: testAccCheckIBMDatabaseInstanceMySQLReadReplicaPromotion(databaseResourceGroup, serviceName),
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstanceMySQLMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstanceMySQLReadReplicaPromote(databaseResourceGroup, readReplicaName)),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "name", readReplicaName),
Expand Down Expand Up @@ -125,9 +134,38 @@ func testAccCheckIBMDatabaseInstanceMySQLMinimal(databaseResourceGroup string, n
service = "databases-for-mysql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
service_endpoints = "public-and-private"
}
`, databaseResourceGroup, name, acc.Region())
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstanceMySQLMinimal_ReadReplica(databaseResourceGroup string, name string) string {
return fmt.Sprintf(`
resource "ibm_database" "%[2]s-replica" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s-replica"
service = "databases-for-mysql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
remote_leader_id = ibm_database.%[2]s.id
}
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstanceMySQLReadReplicaPromote(databaseResourceGroup string, readReplicaName string) string {
return fmt.Sprintf(`
resource "ibm_database" "%[2]s" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s"
service = "databases-for-mysql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
remote_leader_id = ""
skip_initial_backup = true
}
`, databaseResourceGroup, readReplicaName, acc.Region())
}

func testAccCheckIBMDatabaseInstanceMysqlBasic(databaseResourceGroup string, name string) string {
Expand Down Expand Up @@ -234,36 +272,3 @@ func testAccCheckIBMDatabaseInstanceMysqlFullyspecified(databaseResourceGroup st
}
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstanceMySQLMinimal_ReadReplica(databaseResourceGroup string, name string, sourceInstanceCRN string) string {
return fmt.Sprintf(`
resource "ibm_database" "%[2]s-replica" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s-replica"
service = "databases-for-mysql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
remote_leader_id = "%[4]s"
}
`, databaseResourceGroup, name, acc.Region(), sourceInstanceCRN)
}

func testAccCheckIBMDatabaseInstanceMySQLReadReplicaPromotion(databaseResourceGroup string, name string) string {
return fmt.Sprintf(`
data "ibm_resource_group" "test_acc" {
is_default = true
# name = "%[1]s"
}
resource "ibm_database" "%[2]s-replica" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s-replica"
service = "databases-for-mysql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
skip_initial_backup = true
}
`, databaseResourceGroup, name, acc.Region())
}
83 changes: 44 additions & 39 deletions ibm/service/database/resource_ibm_database_postgresql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,22 +276,31 @@ func TestAccIBMDatabaseInstancePostgresReadReplicaPromotion(t *testing.T) {
CheckDestroy: testAccCheckIBMDatabaseInstanceDestroy,
Steps: []resource.TestStep{
{
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstancePostgresMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstancePostgresMinimal_ReadReplica(databaseResourceGroup, serviceName, sourceInstanceCRN)),
Config: testAccCheckIBMDatabaseInstancePostgresMinimal(databaseResourceGroup, serviceName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(sourceResource, &sourceInstanceCRN),
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(sourceResource, "name", serviceName),
resource.TestCheckResourceAttr(sourceResource, "service", "databases-for-postgresql"),
resource.TestCheckResourceAttr(sourceResource, "plan", "standard"),
resource.TestCheckResourceAttr(sourceResource, "location", acc.Region()),
),
},
{
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstancePostgresMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstancePostgresMinimal_ReadReplica(databaseResourceGroup, serviceName)),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "name", readReplicaName),
resource.TestCheckResourceAttr(replicaReplicaResource, "remote_leader_id", sourceInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "service", "databases-for-postgresql"),
resource.TestCheckResourceAttr(replicaReplicaResource, "plan", "standard"),
resource.TestCheckResourceAttr(replicaReplicaResource, "location", acc.Region()),
),
},
{
Config: testAccCheckIBMDatabaseInstancePostgresReadReplicaPromotion(databaseResourceGroup, serviceName),
Config: acc.ConfigCompose(
testAccCheckIBMDatabaseInstancePostgresMinimal(databaseResourceGroup, serviceName),
testAccCheckIBMDatabaseInstancePostgresReadReplicaPromote(databaseResourceGroup, readReplicaName)),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIBMDatabaseInstanceExists(replicaReplicaResource, &replicaInstanceCRN),
resource.TestCheckResourceAttr(replicaReplicaResource, "name", readReplicaName),
Expand All @@ -306,39 +315,6 @@ func TestAccIBMDatabaseInstancePostgresReadReplicaPromotion(t *testing.T) {
})
}

func testAccCheckIBMDatabaseInstancePostgresMinimal_ReadReplica(databaseResourceGroup string, name string, sourceInstanceCRN string) string {
return fmt.Sprintf(`
resource "ibm_database" "%[2]s-replica" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s-replica"
service = "databases-for-postgresql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
remote_leader_id = "%[4]s"
}
`, databaseResourceGroup, name, acc.Region(), sourceInstanceCRN)
}

func testAccCheckIBMDatabaseInstancePostgresReadReplicaPromotion(databaseResourceGroup string, name string) string {
return fmt.Sprintf(`
data "ibm_resource_group" "test_acc" {
is_default = true
# name = "%[1]s"
}
resource "ibm_database" "%[2]s-replica" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s-replica"
service = "databases-for-postgresql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
skip_initial_backup = true
}
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstanceDestroy(s *terraform.State) error {
rsContClient, err := acc.TestAccProvider.Meta().(conns.ClientSession).ResourceControllerV2API()
if err != nil {
Expand Down Expand Up @@ -819,3 +795,32 @@ func testAccCheckIBMDatabaseInstancePostgresMinimal_PITR(databaseResourceGroup s
}
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstancePostgresMinimal_ReadReplica(databaseResourceGroup string, name string) string {
return fmt.Sprintf(`
resource "ibm_database" "%[2]s-replica" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s-replica"
service = "databases-for-postgresql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
remote_leader_id = ibm_database.%[2]s.id
}
`, databaseResourceGroup, name, acc.Region())
}

func testAccCheckIBMDatabaseInstancePostgresReadReplicaPromote(databaseResourceGroup string, readReplicaName string) string {
return fmt.Sprintf(`
resource "ibm_database" "%[2]s" {
resource_group_id = data.ibm_resource_group.test_acc.id
name = "%[2]s"
service = "databases-for-postgresql"
plan = "standard"
location = "%[3]s"
service_endpoints = "public-and-private"
remote_leader_id = ""
skip_initial_backup = true
}
`, databaseResourceGroup, readReplicaName, acc.Region())
}

0 comments on commit c4135f8

Please sign in to comment.