Skip to content

Commit 666c061

Browse files
BBBmauBBBmau
authored
VCR: add TF_ACC_REFRESH_AFTER_APPLY for plugin-testing 1.13.3 support (#15244)
2 parents 4ef6dac + eb05ce4 commit 666c061

File tree

2 files changed

+30
-24
lines changed

2 files changed

+30
-24
lines changed

‎.ci/magician/cmd/vcr_cassette_update_test.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ func TestExecVCRCassetteUpdate(t *testing.T) {
324324
"GOOGLE_TEST_DIRECTORY": "",
325325
"SA_KEY": "sa_key",
326326
"TF_ACC": "1",
327+
"TF_ACC_REFRESH_AFTER_APPLY": "1",
327328
"TF_LOG": "DEBUG",
328329
"TF_LOG_CORE": "WARN",
329330
"TF_LOG_PATH_MASK": "/mock/dir/magic-modules/.ci/magician/testlogs/replaying/beta/%s.log",
@@ -340,8 +341,8 @@ func TestExecVCRCassetteUpdate(t *testing.T) {
340341
{
341342
name: "replay failed then record",
342343
cmdResults: map[string]string{
343-
"gopath/src/github.com/hashicorp/terraform-provider-google-beta go [test -parallel 32 -v -run=TestAcc -timeout 240m -ldflags=-X=github.com/hashicorp/terraform-provider-google-beta/version.ProviderVersion=acc -vet=off] map[ACCTEST_PARALLELISM:32 GOOGLE_APPLICATION_CREDENTIALS:/mock/dir/magic-modules/.ci/magician/sa_key.json GOOGLE_CREDENTIALS:sa_key GOOGLE_TEST_DIRECTORY: SA_KEY:sa_key TF_ACC:1 TF_LOG:DEBUG TF_LOG_CORE:WARN TF_LOG_PATH_MASK:/mock/dir/magic-modules/.ci/magician/testlogs/replaying/beta/%s.log TF_LOG_SDK_FRAMEWORK:INFO TF_SCHEMA_PANIC_ON_ERROR:1 VCR_MODE:REPLAYING VCR_PATH:/mock/dir/magic-modules/.ci/magician/cassettes/beta]": "--- FAIL: TestAccContainerNodePool_defaultDriverInstallation (590.29s)",
344-
"gopath/src/github.com/hashicorp/terraform-provider-google-beta go [test -parallel 1 -v -run=TestAccContainerNodePool_defaultDriverInstallation$ -timeout 240m -ldflags=-X=github.com/hashicorp/terraform-provider-google-beta/version.ProviderVersion=acc -vet=off] map[ACCTEST_PARALLELISM:1 GOOGLE_APPLICATION_CREDENTIALS:/mock/dir/magic-modules/.ci/magician/sa_key.json GOOGLE_CREDENTIALS:sa_key GOOGLE_TEST_DIRECTORY: SA_KEY:sa_key TF_ACC:1 TF_LOG:DEBUG TF_LOG_CORE:WARN TF_LOG_PATH_MASK:/mock/dir/magic-modules/.ci/magician/testlogs/recording/beta/%s.log TF_LOG_SDK_FRAMEWORK:INFO TF_SCHEMA_PANIC_ON_ERROR:1 VCR_MODE:RECORDING VCR_PATH:/mock/dir/magic-modules/.ci/magician/cassettes/beta]": "--- PASS: TestAccContainerNodePool_defaultDriverInstallation (590.29s)",
344+
"gopath/src/github.com/hashicorp/terraform-provider-google-beta go [test -parallel 32 -v -run=TestAcc -timeout 240m -ldflags=-X=github.com/hashicorp/terraform-provider-google-beta/version.ProviderVersion=acc -vet=off] map[ACCTEST_PARALLELISM:32 GOOGLE_APPLICATION_CREDENTIALS:/mock/dir/magic-modules/.ci/magician/sa_key.json GOOGLE_CREDENTIALS:sa_key GOOGLE_TEST_DIRECTORY: SA_KEY:sa_key TF_ACC:1 TF_ACC_REFRESH_AFTER_APPLY:1 TF_LOG:DEBUG TF_LOG_CORE:WARN TF_LOG_PATH_MASK:/mock/dir/magic-modules/.ci/magician/testlogs/replaying/beta/%s.log TF_LOG_SDK_FRAMEWORK:INFO TF_SCHEMA_PANIC_ON_ERROR:1 VCR_MODE:REPLAYING VCR_PATH:/mock/dir/magic-modules/.ci/magician/cassettes/beta]": "--- FAIL: TestAccContainerNodePool_defaultDriverInstallation (590.29s)",
345+
"gopath/src/github.com/hashicorp/terraform-provider-google-beta go [test -parallel 1 -v -run=TestAccContainerNodePool_defaultDriverInstallation$ -timeout 240m -ldflags=-X=github.com/hashicorp/terraform-provider-google-beta/version.ProviderVersion=acc -vet=off] map[ACCTEST_PARALLELISM:1 GOOGLE_APPLICATION_CREDENTIALS:/mock/dir/magic-modules/.ci/magician/sa_key.json GOOGLE_CREDENTIALS:sa_key GOOGLE_TEST_DIRECTORY: SA_KEY:sa_key TF_ACC:1 TF_ACC_REFRESH_AFTER_APPLY:1 TF_LOG:DEBUG TF_LOG_CORE:WARN TF_LOG_PATH_MASK:/mock/dir/magic-modules/.ci/magician/testlogs/recording/beta/%s.log TF_LOG_SDK_FRAMEWORK:INFO TF_SCHEMA_PANIC_ON_ERROR:1 VCR_MODE:RECORDING VCR_PATH:/mock/dir/magic-modules/.ci/magician/cassettes/beta]": "--- PASS: TestAccContainerNodePool_defaultDriverInstallation (590.29s)",
345346
},
346347
expectedCalls: map[string][]ParameterList{
347348
"Run": {
@@ -357,6 +358,7 @@ func TestExecVCRCassetteUpdate(t *testing.T) {
357358
"GOOGLE_TEST_DIRECTORY": "",
358359
"SA_KEY": "sa_key",
359360
"TF_ACC": "1",
361+
"TF_ACC_REFRESH_AFTER_APPLY": "1",
360362
"TF_LOG": "DEBUG",
361363
"TF_LOG_CORE": "WARN",
362364
"TF_LOG_PATH_MASK": "/mock/dir/magic-modules/.ci/magician/testlogs/replaying/beta/%s.log",
@@ -376,6 +378,7 @@ func TestExecVCRCassetteUpdate(t *testing.T) {
376378
"GOOGLE_TEST_DIRECTORY": "",
377379
"SA_KEY": "sa_key",
378380
"TF_ACC": "1",
381+
"TF_ACC_REFRESH_AFTER_APPLY": "1",
379382
"TF_LOG": "DEBUG",
380383
"TF_LOG_CORE": "WARN",
381384
"TF_LOG_PATH_MASK": "/mock/dir/magic-modules/.ci/magician/testlogs/recording/beta/%s.log",

‎.ci/magician/vcr/tester.go‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ var safeToLog = map[string]bool{
104104
"PATH": true,
105105
"SA_KEY": false,
106106
"TF_ACC": true,
107+
"TF_ACC_REFRESH_AFTER_APPLY": true,
107108
"TF_LOG": true,
108109
"TF_LOG_CORE": true,
109110
"TF_LOG_PATH_MASK": true,
@@ -253,17 +254,18 @@ func (vt *Tester) Run(opt RunOptions) (Result, error) {
253254
"-vet=off",
254255
)
255256
env := map[string]string{
256-
"VCR_PATH": cassettePath,
257-
"VCR_MODE": opt.Mode.Upper(),
258-
"ACCTEST_PARALLELISM": strconv.Itoa(accTestParallelism),
259-
"GOOGLE_CREDENTIALS": vt.env["SA_KEY"],
260-
"GOOGLE_TEST_DIRECTORY": strings.Join(opt.TestDirs, " "),
261-
"TF_LOG": "DEBUG",
262-
"TF_LOG_CORE": "WARN",
263-
"TF_LOG_SDK_FRAMEWORK": "INFO",
264-
"TF_LOG_PATH_MASK": filepath.Join(logPath, "%s.log"),
265-
"TF_ACC": "1",
266-
"TF_SCHEMA_PANIC_ON_ERROR": "1",
257+
"VCR_PATH": cassettePath,
258+
"VCR_MODE": opt.Mode.Upper(),
259+
"ACCTEST_PARALLELISM": strconv.Itoa(accTestParallelism),
260+
"GOOGLE_CREDENTIALS": vt.env["SA_KEY"],
261+
"GOOGLE_TEST_DIRECTORY": strings.Join(opt.TestDirs, " "),
262+
"TF_LOG": "DEBUG",
263+
"TF_LOG_CORE": "WARN",
264+
"TF_LOG_SDK_FRAMEWORK": "INFO",
265+
"TF_LOG_PATH_MASK": filepath.Join(logPath, "%s.log"),
266+
"TF_ACC": "1",
267+
"TF_ACC_REFRESH_AFTER_APPLY": "1",
268+
"TF_SCHEMA_PANIC_ON_ERROR": "1",
267269
}
268270
if vt.saKeyPath != "" {
269271
env["GOOGLE_APPLICATION_CREDENTIALS"] = filepath.Join(vt.baseDir, vt.saKeyPath)
@@ -401,17 +403,18 @@ func (vt *Tester) runInParallel(mode Mode, version provider.Version, testDir, te
401403
"-vet=off",
402404
}
403405
env := map[string]string{
404-
"VCR_PATH": cassettePath,
405-
"VCR_MODE": mode.Upper(),
406-
"ACCTEST_PARALLELISM": "1",
407-
"GOOGLE_CREDENTIALS": vt.env["SA_KEY"],
408-
"GOOGLE_TEST_DIRECTORY": testDir,
409-
"TF_LOG": "DEBUG",
410-
"TF_LOG_CORE": "WARN",
411-
"TF_LOG_SDK_FRAMEWORK": "INFO",
412-
"TF_LOG_PATH_MASK": filepath.Join(logPath, "%s.log"),
413-
"TF_ACC": "1",
414-
"TF_SCHEMA_PANIC_ON_ERROR": "1",
406+
"VCR_PATH": cassettePath,
407+
"VCR_MODE": mode.Upper(),
408+
"ACCTEST_PARALLELISM": "1",
409+
"GOOGLE_CREDENTIALS": vt.env["SA_KEY"],
410+
"GOOGLE_TEST_DIRECTORY": testDir,
411+
"TF_LOG": "DEBUG",
412+
"TF_LOG_CORE": "WARN",
413+
"TF_LOG_SDK_FRAMEWORK": "INFO",
414+
"TF_LOG_PATH_MASK": filepath.Join(logPath, "%s.log"),
415+
"TF_ACC": "1",
416+
"TF_ACC_REFRESH_AFTER_APPLY": "1",
417+
"TF_SCHEMA_PANIC_ON_ERROR": "1",
415418
}
416419
if vt.saKeyPath != "" {
417420
env["GOOGLE_APPLICATION_CREDENTIALS"] = filepath.Join(vt.baseDir, vt.saKeyPath)

0 commit comments

Comments
 (0)