Skip to content

Update BootstrapProject to support use across multiple projects/environments #7369

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
roaks3 merged 6 commits into from
Mar 14, 2023
Merged

Update BootstrapProject to support use across multiple projects/environments #7369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecbf4d8
Update BootstrapProject to support use across multiple projects/envir…
roaks3 Feb 28, 2023
123e8ff
Fix typo
roaks3 Feb 28, 2023
c800451
Fix arguments for getTestProjectFromEnv
roaks3 Feb 28, 2023
7300965
Fix project naming strategy for BootstrapProject to produce valid nam…
roaks3 Mar 2, 2023
4e85468
Fix typo
roaks3 Mar 3, 2023
5f189da
Fix function name after rebase
roaks3 Mar 7, 2023
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
2 changes: 1 addition & 1 deletion mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4447,7 +4447,7 @@ func TestAccContainerCluster_failedCreation(t *testing.T) {

clusterName := fmt.Sprintf("tf-test-cluster-%s", RandString(t, 10))

project := BootstrapProject(t, "tf-fail-cluster-test", GetTestBillingAccountFromEnv(t), []string{"container.googleapis.com"})
project := BootstrapProject(t, "tf-fail-cluster-", GetTestBillingAccountFromEnv(t), []string{"container.googleapis.com"})
removeContainerServiceAgentRoleFromContainerEngineRobot(t, project)

VcrTest(t, resource.TestCase{
Expand Down
11 changes: 10 additions & 1 deletion mmv1/third_party/terraform/utils/bootstrap_utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,12 +418,21 @@ func removeContainerServiceAgentRoleFromContainerEngineRobot(t *testing.T, proje
}
}

func BootstrapProject(t *testing.T, projectID, billingAccount string, services []string) *cloudresourcemanager.Project {
// BootstrapProject will create or get a project named
// "<projectIDPrefix><projectIDSuffix>" that will persist across test runs,
// where projectIDSuffix is based off of getTestProjectFromEnv(). The reason
// for the naming is to isolate bootstrapped projects by test environment.
// Given the existing projects being used by our team, the prefix provided to
// this function can be no longer than 18 characters.
func BootstrapProject(t *testing.T, projectIDPrefix, billingAccount string, services []string) *cloudresourcemanager.Project {
config := BootstrapConfig(t)
if config == nil {
return nil
}

projectIDSuffix := strings.Replace(GetTestProjectFromEnv(), "ci-test-project-", "", 1)
projectID := projectIDPrefix + projectIDSuffix

crmClient := config.NewResourceManagerClient(config.UserAgent)

project, err := crmClient.Projects.Get(projectID).Do()
Expand Down