Skip to content

Commit 792521c

Browse files
modular-magicianmodular-magician
authored
Add version retention period to Spanner database resource (#6141) (#11982)
Signed-off-by: Modular Magician <[email protected]>
1 parent 9dd5986 commit 792521c

8 files changed

+422
-32
lines changed

‎.changelog/6141.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```release-note:enhancement
2+
spanner: Added field `version_retention_period` to `google_spanner_database` resource
3+
```
4+
```release-note:enhancement
5+
spanner: Fixed issue where `ddl` and `version_retention_period` could not be set when first creating `google_spanner_database` using POSTGRESQL
6+
```

‎google/config_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package google
22

33
import (
44
"context"
5-
"fmt"
65
"io/ioutil"
76
"os"
87
"testing"
@@ -64,7 +63,7 @@ func TestConfigLoadAndValidate_accountFileJSONInvalid(t *testing.T) {
6463

6564
func TestAccConfigLoadValidate_credentials(t *testing.T) {
6665
if os.Getenv(TestEnvVar) == "" {
67-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
66+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
6867
}
6968
testAccPreCheck(t)
7069

@@ -92,7 +91,7 @@ func TestAccConfigLoadValidate_credentials(t *testing.T) {
9291

9392
func TestAccConfigLoadValidate_impersonated(t *testing.T) {
9493
if os.Getenv(TestEnvVar) == "" {
95-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
94+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
9695
}
9796
testAccPreCheck(t)
9897

@@ -122,7 +121,7 @@ func TestAccConfigLoadValidate_impersonated(t *testing.T) {
122121

123122
func TestAccConfigLoadValidate_accessTokenImpersonated(t *testing.T) {
124123
if os.Getenv(TestEnvVar) == "" {
125-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
124+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
126125
}
127126
testAccPreCheck(t)
128127

@@ -162,7 +161,7 @@ func TestAccConfigLoadValidate_accessTokenImpersonated(t *testing.T) {
162161

163162
func TestAccConfigLoadValidate_accessToken(t *testing.T) {
164163
if os.Getenv(TestEnvVar) == "" {
165-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
164+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
166165
}
167166
testAccPreCheck(t)
168167

‎google/resource_compute_disk_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func TestAccComputeDisk_imageDiffSuppressPublicVendorsFamilyNames(t *testing.T)
185185
t.Parallel()
186186

187187
if os.Getenv(TestEnvVar) == "" {
188-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
188+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
189189
}
190190

191191
config := getInitializedConfig(t)

‎google/resource_compute_instance_migrate_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccComputeInstanceMigrateState(t *testing.T) {
1818
t.Parallel()
1919

2020
if os.Getenv(TestEnvVar) == "" {
21-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
21+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
2222
}
2323
cases := map[string]struct {
2424
StateVersion int
@@ -122,7 +122,7 @@ func TestAccComputeInstanceMigrateState_empty(t *testing.T) {
122122
t.Parallel()
123123

124124
if os.Getenv(TestEnvVar) == "" {
125-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
125+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
126126
}
127127
var is *terraform.InstanceState
128128
var meta interface{}
@@ -150,7 +150,7 @@ func TestAccComputeInstanceMigrateState_bootDisk(t *testing.T) {
150150
t.Parallel()
151151

152152
if os.Getenv(TestEnvVar) == "" {
153-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
153+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
154154
}
155155
config := getInitializedConfig(t)
156156
zone := "us-central1-f"
@@ -218,7 +218,7 @@ func TestAccComputeInstanceMigrateState_v4FixBootDisk(t *testing.T) {
218218
t.Parallel()
219219

220220
if os.Getenv(TestEnvVar) == "" {
221-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
221+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
222222
}
223223
config := getInitializedConfig(t)
224224
zone := "us-central1-f"
@@ -285,7 +285,7 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromSource(t *testing.T) {
285285
t.Parallel()
286286

287287
if os.Getenv(TestEnvVar) == "" {
288-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
288+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
289289
}
290290
config := getInitializedConfig(t)
291291
zone := "us-central1-f"
@@ -366,7 +366,7 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromSource(t *testing.T
366366
t.Parallel()
367367

368368
if os.Getenv(TestEnvVar) == "" {
369-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
369+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
370370
}
371371
config := getInitializedConfig(t)
372372
zone := "us-central1-f"
@@ -446,7 +446,7 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromEncryptionKey(t *testing
446446
t.Parallel()
447447

448448
if os.Getenv(TestEnvVar) == "" {
449-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
449+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
450450
}
451451
config := getInitializedConfig(t)
452452
zone := "us-central1-f"
@@ -515,7 +515,7 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromEncryptionKey(t *te
515515
t.Parallel()
516516

517517
if os.Getenv(TestEnvVar) == "" {
518-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
518+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
519519
}
520520
config := getInitializedConfig(t)
521521
zone := "us-central1-f"
@@ -583,7 +583,7 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromAutoDeleteAndImage(t *te
583583
t.Parallel()
584584

585585
if os.Getenv(TestEnvVar) == "" {
586-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
586+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
587587
}
588588
config := getInitializedConfig(t)
589589
zone := "us-central1-f"
@@ -656,7 +656,7 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromAutoDeleteAndImage(
656656
t.Parallel()
657657

658658
if os.Getenv(TestEnvVar) == "" {
659-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
659+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
660660
}
661661
config := getInitializedConfig(t)
662662
zone := "us-central1-f"
@@ -728,7 +728,7 @@ func TestAccComputeInstanceMigrateState_scratchDisk(t *testing.T) {
728728
t.Parallel()
729729

730730
if os.Getenv(TestEnvVar) == "" {
731-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
731+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
732732
}
733733
config := getInitializedConfig(t)
734734
zone := "us-central1-f"
@@ -794,7 +794,7 @@ func TestAccComputeInstanceMigrateState_v4FixScratchDisk(t *testing.T) {
794794
t.Parallel()
795795

796796
if os.Getenv(TestEnvVar) == "" {
797-
t.Skip(fmt.Sprintf("Network access not allowed; use %s=1 to enable", TestEnvVar))
797+
t.Skipf("Network access not allowed; use %s=1 to enable", TestEnvVar)
798798
}
799799
config := getInitializedConfig(t)
800800
zone := "us-central1-f"

0 commit comments

Comments
 (0)