Skip to content
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

fix: fix location variables for step 4-projects in deploy helper #1334

Merged
merged 5 commits into from
Nov 6, 2024
Merged

fix: fix location variables for step 4-projects in deploy helper #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f166b8b
add instruction about Security Command Center enablement
daniel-cit Sep 4, 2024
4508e1d
fix location variables for 4-projects
daniel-cit Sep 4, 2024
89b67f1
Merge branch 'master' into helper-location-fix
daniel-cit Sep 6, 2024
6f300f6
fix global.tfvars.example vars
daniel-cit Sep 25, 2024
a9a4778
Merge branch 'master' into helper-location-fix
daniel-cit Nov 6, 2024
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
1 change: 1 addition & 0 deletions helpers/foundation-deployer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Helper tool to deploy the Terraform example foundation using Cloud Build and Clo
- [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) version 2.28.0 or later
- [Terraform](https://www.terraform.io/downloads.html) version 1.5.7 or later
- See `0-bootstrap` README for additional IAM [requirements](../../0-bootstrap/README.md#prerequisites) on the user deploying the Foundation.
- To enable Security Command Center, choose a Security Command Center tier and create and grant permissions for the Security Command Center service account as described in [Setting up Security Command Center](https://cloud.google.com/security-command-center/docs/quickstart-security-command-center).

Your environment need to use the same [Terraform](https://www.terraform.io/downloads.html) version used on the build pipeline.
Otherwise, you might experience Terraform state snapshot lock errors.
Expand Down
4 changes: 2 additions & 2 deletions helpers/foundation-deployer/global.tfvars.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,5 @@ target_name_server_addresses = [
// Can be used to override the default region set in 0-bootstrap
// See https://github.com/terraform-google-modules/terraform-example-foundation/blob/master/4-projects/business_unit_1/production/README.md#outputs

gcs_location = "US"
kms_location = "us"
location_kms = "us"
location_gcs = "US"
4 changes: 2 additions & 2 deletions helpers/foundation-deployer/stages/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ func DeployProjectsStage(t testing.TB, s steps.Steps, tfvars GlobalTFVars, outpu
}
//for each environment
envTfvars := ProjEnvTfvars{
ProjectsKMSLocation: tfvars.ProjectsKMSLocation,
ProjectsGCSLocation: tfvars.ProjectsGCSLocation,
LocationKMS: tfvars.LocationKMS,
LocationGCS: tfvars.LocationGCS,
}
for _, envfile := range []string{
"development.auto.tfvars",
Expand Down
8 changes: 4 additions & 4 deletions helpers/foundation-deployer/stages/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ type GlobalTFVars struct {
EnableHubAndSpoke bool `hcl:"enable_hub_and_spoke"`
EnableHubAndSpokeTransitivity bool `hcl:"enable_hub_and_spoke_transitivity"`
CreateUniqueTagKey bool `hcl:"create_unique_tag_key"`
ProjectsKMSLocation string `hcl:"projects_kms_location"`
ProjectsGCSLocation string `hcl:"projects_gcs_location"`
LocationKMS string `hcl:"location_kms"`
LocationGCS string `hcl:"location_gcs"`
CodeCheckoutPath string `hcl:"code_checkout_path"`
FoundationCodePath string `hcl:"foundation_code_path"`
ValidatorProjectId *string `hcl:"validator_project_id"`
Expand Down Expand Up @@ -250,8 +250,8 @@ type ProjSharedTfvars struct {
}

type ProjEnvTfvars struct {
ProjectsKMSLocation string `hcl:"projects_kms_location"`
ProjectsGCSLocation string `hcl:"projects_gcs_location"`
LocationKMS string `hcl:"location_kms"`
LocationGCS string `hcl:"location_gcs"`
}

type AppInfraCommonTfvars struct {
Expand Down