Skip to content

Commit 191d500

Browse files
modular-magicianmodular-magician
authored
Make TestAccAlloydbCluster tests not verify reconciling on import (#9958) (#6959)
[upstream:4eb28f207ce0df1d578ae0f76691d151bb9e8a9d] Signed-off-by: Modular Magician <[email protected]>
1 parent 03ddd08 commit 191d500

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed

‎.changelog/9958.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google-beta/services/alloydb/resource_alloydb_secondary_cluster_test.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestAccAlloydbCluster_secondaryClusterMandatoryFields(t *testing.T) {
3232
ResourceName: "google_alloydb_cluster.secondary",
3333
ImportState: true,
3434
ImportStateVerify: true,
35-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels"},
35+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels", "reconciling"},
3636
},
3737
},
3838
})
@@ -295,7 +295,7 @@ func TestAccAlloydbCluster_secondaryClusterUpdate(t *testing.T) {
295295
ResourceName: "google_alloydb_cluster.secondary",
296296
ImportState: true,
297297
ImportStateVerify: true,
298-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels"},
298+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels", "reconciling"},
299299
},
300300
{
301301
Config: testAccAlloydbCluster_secondaryClusterUpdate(context),
@@ -304,7 +304,7 @@ func TestAccAlloydbCluster_secondaryClusterUpdate(t *testing.T) {
304304
ResourceName: "google_alloydb_cluster.secondary",
305305
ImportState: true,
306306
ImportStateVerify: true,
307-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels"},
307+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels", "reconciling"},
308308
},
309309
},
310310
})
@@ -379,7 +379,7 @@ func TestAccAlloydbCluster_secondaryClusterAddAutomatedBackupPolicy(t *testing.T
379379
ResourceName: "google_alloydb_cluster.secondary",
380380
ImportState: true,
381381
ImportStateVerify: true,
382-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels"},
382+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels", "reconciling"},
383383
},
384384
{
385385
// Invalid input check - can not add automated backup policy to a secondary cluster
@@ -479,7 +479,7 @@ func TestAccAlloydbCluster_secondaryClusterUsingCMEK(t *testing.T) {
479479
ResourceName: "google_alloydb_cluster.secondary",
480480
ImportState: true,
481481
ImportStateVerify: true,
482-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels"},
482+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels", "reconciling"},
483483
},
484484
},
485485
})
@@ -572,7 +572,7 @@ func TestAccAlloydbCluster_secondaryClusterWithNetworkConfig(t *testing.T) {
572572
ResourceName: "google_alloydb_cluster.secondary",
573573
ImportState: true,
574574
ImportStateVerify: true,
575-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels"},
575+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels", "reconciling"},
576576
},
577577
},
578578
})
@@ -647,7 +647,7 @@ func TestAccAlloydbCluster_secondaryClusterWithNetworkConfigAndAllocatedIPRange(
647647
ResourceName: "google_alloydb_cluster.secondary",
648648
ImportState: true,
649649
ImportStateVerify: true,
650-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels"},
650+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "labels", "annotations", "terraform_labels", "reconciling"},
651651
},
652652
},
653653
})
@@ -728,7 +728,7 @@ func TestAccAlloydbCluster_secondaryClusterPromote(t *testing.T) {
728728
ResourceName: "google_alloydb_cluster.secondary",
729729
ImportState: true,
730730
ImportStateVerify: true,
731-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
731+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
732732
},
733733
{
734734
Config: testAccAlloydbCluster_secondaryClusterPromote(context),
@@ -737,7 +737,7 @@ func TestAccAlloydbCluster_secondaryClusterPromote(t *testing.T) {
737737
ResourceName: "google_alloydb_cluster.secondary",
738738
ImportState: true,
739739
ImportStateVerify: true,
740-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
740+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
741741
},
742742
},
743743
})
@@ -875,7 +875,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndSimultaneousUpdate(t *testi
875875
ResourceName: "google_alloydb_cluster.secondary",
876876
ImportState: true,
877877
ImportStateVerify: true,
878-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
878+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
879879
},
880880
{
881881
Config: testAccAlloydbCluster_secondaryClusterPromoteAndSimultaneousUpdate(context),
@@ -884,7 +884,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndSimultaneousUpdate(t *testi
884884
ResourceName: "google_alloydb_cluster.secondary",
885885
ImportState: true,
886886
ImportStateVerify: true,
887-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
887+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
888888
},
889889
},
890890
})
@@ -967,7 +967,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteOriginalPrimary(t *te
967967
ResourceName: "google_alloydb_cluster.secondary",
968968
ImportState: true,
969969
ImportStateVerify: true,
970-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
970+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
971971
},
972972
{
973973
Config: testAccAlloydbCluster_secondaryClusterPromote(context),
@@ -976,7 +976,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteOriginalPrimary(t *te
976976
ResourceName: "google_alloydb_cluster.secondary",
977977
ImportState: true,
978978
ImportStateVerify: true,
979-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
979+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
980980
},
981981
{
982982
Config: testAccAlloydbCluster_secondaryClusterPromoteAndDeleteOriginalPrimary(context),
@@ -985,7 +985,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteOriginalPrimary(t *te
985985
ResourceName: "google_alloydb_cluster.secondary",
986986
ImportState: true,
987987
ImportStateVerify: true,
988-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
988+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
989989
},
990990
},
991991
})
@@ -1048,7 +1048,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndUpdate(t *testing.T) {
10481048
ResourceName: "google_alloydb_cluster.secondary",
10491049
ImportState: true,
10501050
ImportStateVerify: true,
1051-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1051+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
10521052
},
10531053
{
10541054
Config: testAccAlloydbCluster_secondaryClusterPromote(context),
@@ -1057,7 +1057,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndUpdate(t *testing.T) {
10571057
ResourceName: "google_alloydb_cluster.secondary",
10581058
ImportState: true,
10591059
ImportStateVerify: true,
1060-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1060+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
10611061
},
10621062
{
10631063
Config: testAccAlloydbCluster_secondaryClusterPromoteAndUpdate(context),
@@ -1066,7 +1066,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndUpdate(t *testing.T) {
10661066
ResourceName: "google_alloydb_cluster.secondary",
10671067
ImportState: true,
10681068
ImportStateVerify: true,
1069-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1069+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
10701070
},
10711071
},
10721072
})
@@ -1318,7 +1318,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddAndDeleteAutomatedBackup
13181318
ResourceName: "google_alloydb_cluster.secondary",
13191319
ImportState: true,
13201320
ImportStateVerify: true,
1321-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1321+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
13221322
},
13231323
{
13241324
Config: testAccAlloydbCluster_secondaryClusterPromote(context),
@@ -1327,7 +1327,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddAndDeleteAutomatedBackup
13271327
ResourceName: "google_alloydb_cluster.secondary",
13281328
ImportState: true,
13291329
ImportStateVerify: true,
1330-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1330+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
13311331
},
13321332
{
13331333
Config: testAccAlloydbCluster_secondaryClusterPromoteAndAddAutomatedBackupPolicyAndInitialUser(context),
@@ -1336,7 +1336,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddAndDeleteAutomatedBackup
13361336
ResourceName: "google_alloydb_cluster.secondary",
13371337
ImportState: true,
13381338
ImportStateVerify: true,
1339-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1339+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
13401340
},
13411341
{
13421342
Config: testAccAlloydbCluster_secondaryClusterPromote(context),
@@ -1345,7 +1345,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddAndDeleteAutomatedBackup
13451345
ResourceName: "google_alloydb_cluster.secondary",
13461346
ImportState: true,
13471347
ImportStateVerify: true,
1348-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1348+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
13491349
},
13501350
},
13511351
})
@@ -1454,7 +1454,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteTimeBasedRetentionPol
14541454
ResourceName: "google_alloydb_cluster.secondary",
14551455
ImportState: true,
14561456
ImportStateVerify: true,
1457-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1457+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
14581458
},
14591459
{
14601460
Config: testAccAlloydbCluster_secondaryClusterPromote(context),
@@ -1463,7 +1463,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteTimeBasedRetentionPol
14631463
ResourceName: "google_alloydb_cluster.secondary",
14641464
ImportState: true,
14651465
ImportStateVerify: true,
1466-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1466+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
14671467
},
14681468
{
14691469
Config: testAccAlloydbCluster_secondaryClusterPromoteWithTimeBasedRetentionPolicy(context),
@@ -1472,7 +1472,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteTimeBasedRetentionPol
14721472
ResourceName: "google_alloydb_cluster.secondary",
14731473
ImportState: true,
14741474
ImportStateVerify: true,
1475-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1475+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
14761476
},
14771477
{
14781478
Config: testAccAlloydbCluster_secondaryClusterPromoteWithoutTimeBasedRetentionPolicy(context),
@@ -1481,7 +1481,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteTimeBasedRetentionPol
14811481
ResourceName: "google_alloydb_cluster.secondary",
14821482
ImportState: true,
14831483
ImportStateVerify: true,
1484-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1484+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
14851485
},
14861486
},
14871487
})
@@ -1668,7 +1668,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddContinuousBackupConfig(t
16681668
ResourceName: "google_alloydb_cluster.secondary",
16691669
ImportState: true,
16701670
ImportStateVerify: true,
1671-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1671+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
16721672
},
16731673
{
16741674
Config: testAccAlloydbCluster_secondaryClusterPromote(context),
@@ -1677,7 +1677,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddContinuousBackupConfig(t
16771677
ResourceName: "google_alloydb_cluster.secondary",
16781678
ImportState: true,
16791679
ImportStateVerify: true,
1680-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1680+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
16811681
},
16821682
{
16831683
Config: testAccAlloydbCluster_secondaryClusterPromoteAndAddContinuousBackupConfig(context),
@@ -1686,7 +1686,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddContinuousBackupConfig(t
16861686
ResourceName: "google_alloydb_cluster.secondary",
16871687
ImportState: true,
16881688
ImportStateVerify: true,
1689-
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels"},
1689+
ImportStateVerifyIgnore: []string{"initial_user", "restore_backup_source", "restore_continuous_backup_source", "cluster_id", "location", "deletion_policy", "labels", "annotations", "terraform_labels", "reconciling"},
16901690
},
16911691
},
16921692
})

0 commit comments

Comments
 (0)