try destroy without refresh first to avoid invalid tf code blocking destroy

lonegunmanb · lonegunmanb · commit 20e82e21ef3d · 2023-01-13T19:45:47.000+08:00
diff --git a/e2etest.go b/e2etest.go
@@ -34,9 +34,9 @@ func destroy(t *testing.T, option terraform.Options) {
 	option.RetryableTerraformErrors = map[string]string{
 		".*": "Retry destroy on any error",
 	}
-	_, err := terraform.DestroyE(t, &option)
+	_, err := terraform.RunTerraformCommandE(t, &option, terraform.FormatArgs(&option, "destroy", "-auto-approve", "-input=false", "-refresh=false")...)
 	if err != nil {
-		_, err = terraform.RunTerraformCommandE(t, &option, terraform.FormatArgs(&option, "destroy", "-auto-approve", "-input=false", "-refresh=false")...)
+		_, err = terraform.DestroyE(t, &option)
 	}
 	require.NoError(t, err)
 }

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ func destroy(t *testing.T, option terraform.Options) {`
`34`	`34`	`option.RetryableTerraformErrors = map[string]string{`
`35`	`35`	`".*": "Retry destroy on any error",`
`36`	`36`	`}`
`37`		`- _, err := terraform.DestroyE(t, &option)`
	`37`	`+ _, err := terraform.RunTerraformCommandE(t, &option, terraform.FormatArgs(&option, "destroy", "-auto-approve", "-input=false", "-refresh=false")...)`
`38`	`38`	`if err != nil {`
`39`		`- _, err = terraform.RunTerraformCommandE(t, &option, terraform.FormatArgs(&option, "destroy", "-auto-approve", "-input=false", "-refresh=false")...)`
	`39`	`+ _, err = terraform.DestroyE(t, &option)`
`40`	`40`	`}`
`41`	`41`	`require.NoError(t, err)`
`42`	`42`	`}`