Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
347 changes: 0 additions & 347 deletions google/acctest/bootstrap_test_utils.go

This file was deleted.

5 changes: 3 additions & 2 deletions google/acctest/provider_test_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (

"github.com/hashicorp/terraform-provider-google/google/provider"
tpgcloudbilling "github.com/hashicorp/terraform-provider-google/google/services/cloudbilling"
"github.com/hashicorp/terraform-provider-google/google/services/iambeta"
tpgiamcredentials "github.com/hashicorp/terraform-provider-google/google/services/iamcredentials"
"github.com/hashicorp/terraform-provider-google/google/services/resourcemanager"
rmClient "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager/client"
Expand Down Expand Up @@ -266,8 +267,8 @@ func SetupProjectsAndGetAccessToken(org, billing, pid, service string, config *t
}

// Create a service account for project-1
serviceAccountEmail := serviceAccountPrefix + service
sa1, err := getOrCreateServiceAccount(config, pid, serviceAccountEmail)
serviceAccountEmail := iambeta.ServiceAccountPrefix + service
sa1, err := iambeta.GetOrCreateServiceAccount(config, pid, serviceAccountEmail)
if err != nil {
return "", fmt.Errorf("error creating service account %s in 'project-1' with project id %s: %w", serviceAccountEmail, pid, err)
}
Expand Down
Loading
Loading