Skip to content

Commit 4ffd911

Browse files
Fix sql VCR test failure in replaying (#6625) (#12686)
* prevent TestAccSqlDatabaseInstance_mysqlMajorVersionUpgrade from failing in VCR replaying mode Signed-off-by: Modular Magician <[email protected]> Signed-off-by: Modular Magician <[email protected]>
1 parent 1002330 commit 4ffd911

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.changelog/6625.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
```release-note:none
2+
```

google/resource_sql_database_instance_test.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -1275,13 +1275,16 @@ func TestAccSqlDatabaseInstance_SqlServerAuditConfig(t *testing.T) {
12751275
func TestAccSqlDatabaseInstance_mysqlMajorVersionUpgrade(t *testing.T) {
12761276
t.Parallel()
12771277

1278+
databaseName := "tf-test-" + randString(t, 10)
1279+
12781280
vcrTest(t, resource.TestCase{
12791281
PreCheck: func() { testAccPreCheck(t) },
12801282
Providers: testAccProviders,
12811283
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
12821284
Steps: []resource.TestStep{
12831285
{
1284-
Config: testGoogleSqlDatabaseInstance_basic2,
1286+
Config: fmt.Sprintf(
1287+
testGoogleSqlDatabaseInstance_basic3, databaseName),
12851288
},
12861289
{
12871290
ResourceName: "google_sql_database_instance.instance",
@@ -1290,7 +1293,8 @@ func TestAccSqlDatabaseInstance_mysqlMajorVersionUpgrade(t *testing.T) {
12901293
ImportStateVerifyIgnore: []string{"root_password", "deletion_protection"},
12911294
},
12921295
{
1293-
Config: testGoogleSqlDatabaseInstance_basic2_update,
1296+
Config: fmt.Sprintf(
1297+
testGoogleSqlDatabaseInstance_basic3_update, databaseName),
12941298
},
12951299
{
12961300
ResourceName: "google_sql_database_instance.instance",
@@ -1360,22 +1364,23 @@ resource "google_sql_database_instance" "instance" {
13601364
}
13611365
`
13621366

1363-
var testGoogleSqlDatabaseInstance_basic2_update = `
1367+
var testGoogleSqlDatabaseInstance_basic3 = `
13641368
resource "google_sql_database_instance" "instance" {
1369+
name = "%s"
13651370
region = "us-central1"
1366-
database_version = "MYSQL_8_0"
1371+
database_version = "MYSQL_5_7"
13671372
deletion_protection = false
13681373
settings {
13691374
tier = "db-f1-micro"
13701375
}
13711376
}
13721377
`
13731378

1374-
var testGoogleSqlDatabaseInstance_basic3 = `
1379+
var testGoogleSqlDatabaseInstance_basic3_update = `
13751380
resource "google_sql_database_instance" "instance" {
13761381
name = "%s"
13771382
region = "us-central1"
1378-
database_version = "MYSQL_5_7"
1383+
database_version = "MYSQL_8_0"
13791384
deletion_protection = false
13801385
settings {
13811386
tier = "db-f1-micro"

0 commit comments

Comments
 (0)