PRs merged to the terraform-example-foundation upstream repo

20240426 https://github.com/terraform-google-modules/terraform-example-foundation/pull/1175

terraform-example-foundation upstream resync procedure - copy not fork

working out a solution - which is like the ADO sync in https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/issues/399#issuecomment-2073445261 branch: gh387-upstream-sync https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/tree/gh387-upstream-sync

cd _upstream
git clone https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding.git
cd pbmm-on-gcp-onboarding 
git checkout gh387-upstream-sync 

michaelobrien@mbp7 pbmm-on-gcp-onboarding % git status
On branch gh387-upstream-sync
Your branch is up to date with 'origin/gh387-upstream-sync'.

git remote add upstream https://github.com/terraform-google-modules/terraform-example-foundation.git
git fetch upstream
git merge upstream/master gh387-upstream-sync
fatal: refusing to merge unrelated histories

Indirect terraform provider updates

@nbugden thank you for the bucket names fix Merge in 63 character bucket naming standard fix indirectly via the next terraform init - that pull in in the latest generated terraform-google-provider via the magic modules compile

https://github.com/GoogleCloudPlatform/magic-modules/pull/10426 for https://github.com/hashicorp/terraform-provider-google/issues/17831

following previous pr https://github.com/terraform-google-modules/terraform-google-cloud-storage/pull/308

closes https://github.com/terraform-google-modules/terraform-example-foundation/issues/1169 https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/307

upgrade the provider on the next init (1.3.10) and 1.6 (we are not using the default 1.7.5 yet) https://github.com/hashicorp/terraform-provider-google?tab=readme-ov-file#upgrading-the-provider

terraform init -upgrade

Sync procedure jira needed for https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/issues/376

fmichaelobrien commented 2 months ago

Indirect

Direct

https://github.com/terraform-google-modules/terraform-example-foundation/pull/1181/files
https://github.com/terraform-google-modules/terraform-example-foundation/pull/1196/files
nonproduction labels https://github.com/terraform-google-modules/terraform-example-foundation/pull/1107
VPCSC dry run mode enhancement (with 3-networks-hub-and-spoke pending) - https://github.com/terraform-google-modules/terraform-example-foundation/pull/1210
https://github.com/terraform-google-modules/terraform-example-foundation/pull/1199/files

obriensystems commented 2 months ago

Todo: keep the repos relatively in sync nonproduction vs non-production for example

obriensystems commented 2 months ago

  nonproduction_folder_name         = data.terraform_remote_state.env_nonproduction.outputs.env_folder

resource "gitlab_branch_protection" "non_production" {
 tf_apply_branches = ["development", "non\\-production", "production"]

Align with PR from 3 weeks ago upstream https://github.com/terraform-google-modules/terraform-example-foundation/pull/1107 https://github.com/terraform-google-modules/terraform-example-foundation/commit/eb28ecb1ca659b1279db83b0b7f9667d56698c22#diff-446d88326ec6ad0370d30957f6546694390e92cc997a810e60783bfeb016efc1L308

obriensystems commented 2 months ago

prepare for TEF to PBMM sync fix the main branch first - by re-adding cloud build support

421

michaelobrien@mbp7 terraform-example-foundation % git pull
remote: Enumerating objects: 120, done.
remote: Counting objects: 100% (119/119), done.
remote: Compressing objects: 100% (80/80), done.
remote: Total 120 (delta 52), reused 78 (delta 33), pack-reused 1
Receiving objects: 100% (120/120), 103.94 KiB | 1.07 MiB/s, done.
Resolving deltas: 100% (52/52), completed with 7 local objects.
From https://github.com/terraform-google-modules/terraform-example-foundation
   a63dc88..034b995  master                                                         -> origin/master
 * [new branch]      dependabot/go_modules/helpers/foundation-deployer/github.com/hashicorp/go-getter-1.7.4 -> origin/dependabot/go_modules/helpers/foundation-deployer/github.com/hashicorp/go-getter-1.7.4
 + 5653048...218bb21 dependabot/go_modules/helpers/foundation-deployer/golang.org/x/net-0.23.0 -> origin/dependabot/go_modules/helpers/foundation-deployer/golang.org/x/net-0.23.0  (forced update)
 * [new branch]      dependabot/go_modules/test/integration/github.com/hashicorp/go-getter-1.7.4 -> origin/dependabot/go_modules/test/integration/github.com/hashicorp/go-getter-1.7.4
 + 4d6d15d...79f5c67 dependabot/go_modules/test/integration/golang.org/x/net-0.23.0 -> origin/dependabot/go_modules/test/integration/golang.org/x/net-0.23.0  (forced update)
 + d4c27d3...4318c63 release-please--branches--master                               -> origin/release-please--branches--master  (forced update)
   ddeae49..1c2e4a8  renovate/go-modules-andor-dev-tools                            -> origin/renovate/go-modules-andor-dev-tools
 + 38e9441...7a1e347 renovate/google-cloud-security-center-8.x                      -> origin/renovate/google-cloud-security-center-8.x  (forced update)
Updating a63dc88..034b995
Fast-forward
 .github/workflows/go-lint.yaml                                     |  6 +++---
 0-bootstrap/README.md                                              | 14 ++++++++++++++
 1-org/envs/shared/terraform.example.tfvars                         |  4 ----
 2-environments/envs/nonproduction/terraform.tfvars                 |  2 +-
 4-projects/business_unit_1/nonproduction/nonproduction.auto.tfvars |  2 +-
 4-projects/business_unit_2/nonproduction/nonproduction.auto.tfvars |  2 +-
 README.md                                                          |  2 +-
 go.work                                                            |  2 +-
 helpers/foundation-deployer/README.md                              |  2 +-
 helpers/foundation-deployer/go.mod                                 |  2 +-
 test/integration/go.mod                                            |  2 +-
 test/integration/networks/networks_test.go                         |  2 +-
 test/integration/testutils/retry.go                                |  3 +++
 13 files changed, 29 insertions(+), 16 deletions(-)

keep

ssc-notification randomization for multi-tenant deployment https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/pull/385/files
bucket name length - https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/pull/386/files
Changes

Adjust
local terraform https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/pull/384/files
and https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/pull/393
Help with upstream sync
revert non-production back to tef nonproduction
0-bootstrap/

Sync

michaelobrien@mbp7 _upstream % cd pbmm-on-gcp-onboarding 
michaelobrien@mbp7 pbmm-on-gcp-onboarding % git checkout main
Already on 'main'
Your branch is up to date with 'origin/main'.
michaelobrien@mbp7 pbmm-on-gcp-onboarding % git checkout gh387-upstream-sync
Switched to branch 'gh387-upstream-sync'
Your branch is up to date with 'origin/gh387-upstream-sync'.
michaelobrien@mbp7 pbmm-on-gcp-onboarding % git merge main
Updating b9fe8d39..d7344f5f
Fast-forward
 README.md | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
michaelobrien@mbp7 pbmm-on-gcp-onboarding % 
ichaelobrien@mbp7 pbmm-on-gcp-onboarding % git push origin gh387-upstream-sync
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: 
remote: GitHub found 5 vulnerabilities on GoogleCloudPlatform/pbmm-on-gcp-onboarding's default branch (2 critical, 3 moderate). To find out more, visit:
remote:      https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/security/dependabot
remote: 
To https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding.git
   b9fe8d39..d7344f5f  gh387-upstream-sync -> gh387-upstream-sync

fmichaelobrien commented 2 months ago

20240504: Repo state: CB/CSR are the default for the main branch

The main branch is ready for Cloud Build / Cloud Source Repositories out of the box. For ADO support this is in queue via https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/issues/399 after a TEF upstream merge via https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/issues/387

obriensystems commented 1 month ago

Sync 20240511 version of the following master branch https://github.com/terraform-google-modules/terraform-example-foundation/ via branch https://github.com/terraform-google-modules/terraform-example-foundation/pull/1199 with last PR https://github.com/terraform-google-modules/terraform-example-foundation/pull/1199

into https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/tree/gh387-upstream-sync

0-bootstrap, 1-org done

tef minor bug for label changes in https://github.com/terraform-google-modules/terraform-example-foundation/pull/1199/files#diff-d6697e7c916ba73d6ae87ff4b1ce67cabc9b9738ab31c9ba582e2a3218982838L279

https://github.com/terraform-google-modules/terraform-example-foundation/blob/master/1-org/envs/shared/projects.tf#L253 match https://github.com/terraform-google-modules/terraform-example-foundation/blob/master/1-org/envs/shared/projects.tf#L237

application_name = "org-dns-hub"
application_name = "org-net-dns"

and -net-interconnect

just like in https://github.com/terraform-google-modules/terraform-example-foundation/blob/master/1-org/envs/shared/projects.tf#L295

3-networks-hub-and-spoke

2 symlinks modified in error during the non-production to nonproduction rename/refactor - the change is to ../common - which itself is a symlink so the double symlink works. The other 6 of the 2x4 symlinks are unmodified as ../../ see change in #1107 https://github.com/terraform-google-modules/terraform-example-foundation/pull/1107/files#diff-bcfdfb477dea3f75d9d515aa61ce4f3836b223f11d6e4234122778963fbfef4a

https://github.com/terraform-google-modules/terraform-example-foundation/blob/master/3-networks-hub-and-spoke/envs/nonproduction/access_context.auto.tfvars

-../../access_context.auto.tfvars
+../shared/access_context.auto.tfvars

there is a 2nd symlink regression in the same directory in https://github.com/terraform-google-modules/terraform-example-foundation/blob/master/3-networks-hub-and-spoke/envs/nonproduction/common.auto.tfvars

-../../common.auto.tfvars
+../shared/common.auto.tfvars

I'll raise an issue shortly with the fix after I test a full upstream sync of the TEF.