Skip to content

Commit

Permalink
Addressed review comments and formated the code
Browse files Browse the repository at this point in the history
  • Loading branch information
@isaurabhuttam
isaurabhuttam committed Feb 8, 2023
1 parent 286b5f0 commit 02a9228
Showing 1 changed file with 15 additions and 21 deletions.
36 changes: 15 additions & 21 deletions mmv1/third_party/terraform/tests/resource_sql_database_instance_test.go.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ func TestAccSqlDatabaseInstance_ReplicaPromoteSuccessful(t *testing.T) {
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
{
Config: googleSqlDatabaseInstanceConfigForReplicaPromote(databaseName, failoverName),
Config: googleSqlDatabaseInstance_replicaPromote(databaseName, failoverName),
Check: resource.ComposeTestCheckFunc(checkPromoteReplicaConfigurations("google_sql_database_instance.instance-failover")),
},
{
Expand Down Expand Up @@ -1601,7 +1601,7 @@ func TestAccSqlDatabaseInstance_ReplicaPromoteFailedWithMasterInstanceNamePresen
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
{
Config: googleSqlDatabaseInstanceConfigForReplicaPromoteWithMasterInstanceName(databaseName, failoverName),
Config: googleSqlDatabaseInstance_replicaPromoteWithMasterInstanceName(databaseName, failoverName),
ExpectError: regexp.MustCompile("Replica promote configuration check failed. Please remove master_instance_name and try again."),
Check: resource.ComposeTestCheckFunc(checkPromoteReplicaSkipConfigurations("google_sql_database_instance.instance-failover")),
},
Expand Down Expand Up @@ -1647,7 +1647,7 @@ func TestAccSqlDatabaseInstance_ReplicaPromoteFailedWithReplicaConfigurationPres
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
{
Config: googleSqlDatabaseInstanceConfigForReplicaPromoteWithReplicaConfiguration(databaseName, failoverName),
Config: googleSqlDatabaseInstance_replicaPromoteWithReplicaConfiguration(databaseName, failoverName),
ExpectError: regexp.MustCompile("Replica promote configuration check failed. Please remove replica_configuration and try again."),
Check: resource.ComposeTestCheckFunc(checkPromoteReplicaSkipConfigurations("google_sql_database_instance.instance-failover")),
},
Expand Down Expand Up @@ -1693,7 +1693,7 @@ func TestAccSqlDatabaseInstance_ReplicaPromoteFailedWithMasterInstanceNameAndRep
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
{
Config: googleSqlDatabaseInstanceConfigForReplicaPromoteWithMasterInstanceNameAndReplicaConfiguration(databaseName, failoverName),
Config: googleSqlDatabaseInstance_replicaPromoteWithMasterInstanceNameAndReplicaConfiguration(databaseName, failoverName),
ExpectError: regexp.MustCompile("Replica promote configuration check failed. Please remove master_instance_name and try again."),
},
{
Expand Down Expand Up @@ -1738,7 +1738,7 @@ func TestAccSqlDatabaseInstance_ReplicaPromoteSkippedWithNoMasterInstanceNameAnd
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
{
Config: googleSqlDatabaseInstanceConfigForReplicaPromoteSkippedWithNoMasterInstanceNameAndNoReplicaConfiguration(databaseName, failoverName),
Config: googleSqlDatabaseInstance_replicaPromoteSkippedWithNoMasterInstanceNameAndNoReplicaConfiguration(databaseName, failoverName),
Check: resource.ComposeTestCheckFunc(checkPromoteReplicaSkipConfigurations("google_sql_database_instance.instance-failover")),
},
{
Expand All @@ -1747,12 +1747,6 @@ func TestAccSqlDatabaseInstance_ReplicaPromoteSkippedWithNoMasterInstanceNameAnd
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
{
ResourceName: "google_sql_database_instance.instance",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
{
ResourceName: "google_sql_database_instance.instance-failover",
ImportState: true,
Expand Down Expand Up @@ -2074,7 +2068,7 @@ resource "google_sql_database_instance" "instance-failover" {
`, instanceName, failoverName)
}

func googleSqlDatabaseInstanceConfigForReplicaPromote(instanceName, failoverName string) string {
func googleSqlDatabaseInstance_replicaPromote(instanceName, failoverName string) string {
return fmt.Sprintf(`
resource "google_sql_database_instance" "instance" {
name = "%s"
Expand Down Expand Up @@ -2107,7 +2101,7 @@ resource "google_sql_database_instance" "instance-failover" {
`, instanceName, failoverName)
}

func googleSqlDatabaseInstanceConfigForReplicaPromoteWithMasterInstanceName(instanceName, failoverName string) string {
func googleSqlDatabaseInstance_replicaPromoteWithMasterInstanceName(instanceName, failoverName string) string {
return fmt.Sprintf(`
resource "google_sql_database_instance" "instance" {
name = "%s"
Expand All @@ -2129,18 +2123,18 @@ resource "google_sql_database_instance" "instance" {
resource "google_sql_database_instance" "instance-failover" {
name = "%s"
region = "us-central1"
master_instance_name = google_sql_database_instance.instance.name
master_instance_name = google_sql_database_instance.instance.name
database_version = "MYSQL_5_7"
deletion_protection = false
instance_type = "CLOUD_SQL_INSTANCE"
instance_type = "CLOUD_SQL_INSTANCE"
settings {
tier = "db-n1-standard-1"
}
}
`, instanceName, failoverName)
}

func googleSqlDatabaseInstanceConfigForReplicaPromoteWithMasterInstanceNameAndReplicaConfiguration(instanceName string, failoverName string) string {
func googleSqlDatabaseInstance_replicaPromoteWithMasterInstanceNameAndReplicaConfiguration(instanceName string, failoverName string) string {
return fmt.Sprintf(`
resource "google_sql_database_instance" "instance" {
name = "%s"
Expand All @@ -2162,23 +2156,23 @@ resource "google_sql_database_instance" "instance" {
resource "google_sql_database_instance" "instance-failover" {
name = "%s"
region = "us-central1"
master_instance_name = google_sql_database_instance.instance.name
master_instance_name = google_sql_database_instance.instance.name
database_version = "MYSQL_5_7"
deletion_protection = false

replica_configuration {
failover_target = "true"
}

instance_type = "CLOUD_SQL_INSTANCE"
instance_type = "CLOUD_SQL_INSTANCE"
settings {
tier = "db-n1-standard-1"
}
}
`, instanceName, failoverName)
}

func googleSqlDatabaseInstanceConfigForReplicaPromoteSkippedWithNoMasterInstanceNameAndNoReplicaConfiguration(instanceName string, failoverName string) string {
func googleSqlDatabaseInstance_replicaPromoteSkippedWithNoMasterInstanceNameAndNoReplicaConfiguration(instanceName string, failoverName string) string {
return fmt.Sprintf(`
resource "google_sql_database_instance" "instance" {
name = "%s"
Expand Down Expand Up @@ -2210,7 +2204,7 @@ resource "google_sql_database_instance" "instance-failover" {
`, instanceName, failoverName)
}

func googleSqlDatabaseInstanceConfigForReplicaPromoteWithReplicaConfiguration(instanceName string, failoverName string) string {
func googleSqlDatabaseInstance_replicaPromoteWithReplicaConfiguration(instanceName string, failoverName string) string {
return fmt.Sprintf(`
resource "google_sql_database_instance" "instance" {
name = "%s"
Expand Down Expand Up @@ -2239,7 +2233,7 @@ resource "google_sql_database_instance" "instance-failover" {
failover_target = "true"
}

instance_type = "CLOUD_SQL_INSTANCE"
instance_type = "CLOUD_SQL_INSTANCE"
settings {
tier = "db-n1-standard-1"
}
Expand Down

0 comments on commit 02a9228

Please sign in to comment.