search

GoogleCloudPlatform / pbmm-on-gcp-onboarding

GCP Canadian Public Sector Landing Zone overlay on top of the TEF via CFT modules - a secure cloud foundation
https://cloud.google.com/architecture/security-foundations
Apache License 2.0
39 stars 55 forks source link

Architecture documentation - ongoing #378

Closed obriensystems closed 2 months ago

obriensystems commented 2 months ago

merge main

michaelobrien@mbp7 pbmm-on-gcp-onboarding % git merge main
Merge made by the 'ort' strategy.
 0-bootstrap/README.md                                                      |  16 ++++----
 0-bootstrap/backend.tf.local                                               |  22 +++++++++++
 0-bootstrap/{cb.tf => cb.tf.dont_use}                                      |   0
 0-bootstrap/{outputs.tf => outputs.tf.dont_use}                            |   0
 0-bootstrap/outputs.tf.local                                               |  83 +++++++++++++++++++++++++++++++++++++++++
 0-bootstrap/terraform-local.tf                                             |  26 +++++++++++++
 0-bootstrap/terraform.mod.tfvars                                           |  63 +++++++++++++++++++++++++++++++
 1-org/README.md                                                            |  20 +++++-----
 1-org/envs/shared/outputs.tf                                               |   2 +-
 1-org/envs/shared/scc_notification.tf                                      |  12 +++++-
 1-org/envs/shared/terraform.mod.tfvars                                     |  37 +++++++++++++++++++
 1-org/envs/shared/variables.tf                                             |   6 +++
 1-org/modules/cai-monitoring/main.tf                                       |   6 ++-
 2-environments/README.md                                                   |  16 ++++----
 2-environments/terraform.mod.tfvars                                        |  18 +++++++++
 3-networks-dual-svpc/access_context.auto.mod.tfvars                        |  17 +++++++++
 3-networks-dual-svpc/common.auto.mod.tfvars                                |  28 ++++++++++++++
 3-networks-dual-svpc/modules/hierarchical_firewall_policy/main.tf          |   3 +-
 3-networks-dual-svpc/modules/hierarchical_firewall_policy/variables.tf     |   6 +++
 3-networks-dual-svpc/shared.auto.mod.tfvars                                |  28 ++++++++++++++
 3-networks-hub-and-spoke/README.md                                         |  26 ++++++-------
 3-networks-hub-and-spoke/access_context.auto.mod.tfvars                    |  17 +++++++++
 3-networks-hub-and-spoke/common.auto.mod.tfvars                            |  28 ++++++++++++++
 3-networks-hub-and-spoke/envs/shared/hierarchical_firewall.tf              |   2 +-
 3-networks-hub-and-spoke/modules/hierarchical_firewall_policy/main.tf      |   3 +-
 3-networks-hub-and-spoke/modules/hierarchical_firewall_policy/variables.tf |   6 +++
 3-networks-hub-and-spoke/modules/transitivity/main.tf                      |   2 +
 3-networks-hub-and-spoke/shared.auto.mod.tfvars                            |  28 ++++++++++++++
 4-projects/README.md                                                       |  14 +++----
 4-projects/common.auto.mod.tfvars                                          |  17 +++++++++
 4-projects/development.auto.mod.tfvars                                     |  18 +++++++++
 4-projects/modules/base_env/example_storage_cmek.tf                        |   9 ++++-
 4-projects/non-production.auto.mod.tfvars                                  |  18 +++++++++
 4-projects/production.auto.mod.tfvars                                      |  18 +++++++++
 4-projects/shared.auto.mod.tfvars                                          |  18 +++++++++
 5-app-infra/README.md                                                      |  12 +++---
 5-app-infra/common.auto.mod.tfvars                                         |  19 ++++++++++
 fix_tfvars_symlinks.py                                                     | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 scripts/validate-requirements.sh                                           |   2 +-
 39 files changed, 806 insertions(+), 60 deletions(-)
 create mode 100644 0-bootstrap/backend.tf.local
 rename 0-bootstrap/{cb.tf => cb.tf.dont_use} (100%)
 rename 0-bootstrap/{outputs.tf => outputs.tf.dont_use} (100%)
 create mode 100644 0-bootstrap/outputs.tf.local
 create mode 100644 0-bootstrap/terraform-local.tf
 create mode 100644 0-bootstrap/terraform.mod.tfvars
 create mode 100644 1-org/envs/shared/terraform.mod.tfvars
 create mode 100644 2-environments/terraform.mod.tfvars
 create mode 100644 3-networks-dual-svpc/access_context.auto.mod.tfvars
 create mode 100644 3-networks-dual-svpc/common.auto.mod.tfvars
 create mode 100644 3-networks-dual-svpc/shared.auto.mod.tfvars
 create mode 100644 3-networks-hub-and-spoke/access_context.auto.mod.tfvars
 create mode 100644 3-networks-hub-and-spoke/common.auto.mod.tfvars
 create mode 100644 3-networks-hub-and-spoke/shared.auto.mod.tfvars
 create mode 100644 4-projects/common.auto.mod.tfvars
 create mode 100644 4-projects/development.auto.mod.tfvars
 create mode 100644 4-projects/non-production.auto.mod.tfvars
 create mode 100644 4-projects/production.auto.mod.tfvars
 create mode 100644 4-projects/shared.auto.mod.tfvars
 create mode 100644 5-app-infra/common.auto.mod.tfvars
 create mode 100644 fix_tfvars_symlinks.py
obriensystems commented 2 months ago

testing upstream merge from this repo to a private ado repo in #399