Skip to content

Fix nightly test failures for external credentials upgrade #17063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shuyama1 merged 5 commits into from
Apr 13, 2026
+13 −6
Merged

Fix nightly test failures for external credentials upgrade #17063

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8195400
fix TestAccProvider_external_credentials_upgrade
shuyama1 Apr 9, 2026
0c3476b
fix credentials check
shuyama1 Apr 10, 2026
0fbb7e8
Apply suggestion from @shuyama1
BBBmau Apr 13, 2026
0848adb
update credentials
shuyama1 Apr 13, 2026
0ee6cc8
Apply suggestions from code review
BBBmau Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions mmv1/third_party/terraform/provider/provider_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,7 @@ func TestAccProvider_external_credentials_upgrade(t *testing.T) {
},
// old provider - credentials
{
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
ExternalProviders: oldVersion,
ExternalProviders: oldVersion,
PreConfig: func() {
for _, env := range envvar.CredsEnvVars {
t.Setenv(env, "")
Expand All @@ -233,9 +232,9 @@ func TestAccProvider_external_credentials_upgrade(t *testing.T) {
Config: testAccProviderExternalCredentialsUpgrade_CredentialsConfig(map[string]interface{}{
"credentials": credentials,
}),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.google_provider_config_sdk.default", "credentials", credentials),
),
// google_provider_config_sdk is test-specific datasource
// not available in the real provider, so we cannot verify credentials here.
// The fact that this step succeeds implies the provider accepted the credentials.
},
{
// new provider - credentials
Expand All @@ -245,7 +244,7 @@ func TestAccProvider_external_credentials_upgrade(t *testing.T) {
t.Setenv(env, "")
}
},
Config: testAccProviderExternalCredentialsUpgrade_CredentialsConfig(map[string]interface{}{
Config: testAccProviderExternalCredentialsUpgrade_CredentialsConfigNew(map[string]interface{}{
"credentials": credentials,
}),
Check: resource.ComposeTestCheckFunc(
Expand All @@ -271,6 +270,14 @@ func testAccProviderExternalCredentialsUpgrade_CredentialsConfig(context map[str
provider "google" {
credentials = "%{credentials}"
}
`, context)
}

func testAccProviderExternalCredentialsUpgrade_CredentialsConfigNew(context map[string]interface{}) string {
return acctest.Nprintf(`
provider "google" {
credentials = "%{credentials}"
}

data "google_provider_config_sdk" "default" {}
`, context)
Expand Down
Loading