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.

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

Yoppworks PBMM Secure LandingZone contribution #291

Conversation

jacyang2010
Copy link
Collaborator

commit d28dfcf
Author: StanImprover 131805071+StanImprover@users.noreply.github.com
Date: Tue Aug 15 09:28:39 2023 -0600

Made changes to COMMIT ID (#24)

Co-authored-by: Stanley Onweni <stanleyonweni@Stanleys-MacBook-Pro-2.local>

commit 5af991c
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Mon May 8 11:48:02 2023 -0400

GCT-51 Fixed the rego policy test for the GR#11 (#23)

* GCT-51 Fixed the rego policy test for the GR#11

* GCT-51 Updated the git patch file again

commit a23fe6c
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Wed May 3 14:39:40 2023 -0400

GCT-44 Built a rego policy for GR#7 (#22)

commit 5e2b41c
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Tue Apr 25 12:38:16 2023 -0400

GCT-45 build rego policy for guardrail 06 protection of data at rest (#21)

* GCT-45 Added rego policy for GR6 validation

* GCT-45 Fixed some typos

commit 0b0c3a5
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Tue Apr 25 11:11:22 2023 -0400

GCT-45 Added rego policy for GR6 validation (#20)

commit c13855d
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Thu Apr 13 16:10:02 2023 -0400

GCT-46 mitigate cloud function resource location issues (#19)

* GCT-46 Enabled worker pool for run validation gcf

* GCT-46 Supported worker pool for validation builds

* GCT-46 Cleaned up the gcf archive folder

* GCT-46 Recovered the gcf bucket setter commands

commit 9fb968c
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Tue Apr 11 11:45:04 2023 -0400

GCT-20 run cloud builds from required location (#18)

* GCT-20 Specified the required location for builds

* GCT-20 Added private worker pool for cloud builds

* GCT-20 Fixed the misplaced worker pool option

* GCT-20 Fixed the workpool user iam condition

* GCT-20 Fixed the missed project to worker pool bug

* GCT-20 Assigned worker pool owner role

* GCT-20 Fixed the cloudbuild trigger location issue

* GCT-20 Allowed gcf sa to use private worker pool

* GCT-20 Allowed validation cf sa to use worker pool

* GCT-20 Disabled worker pool of validation gcf

* GCT-20 built cloudbuild staging and log buckets

* GCT-20 Fixed late creation issue of cloudbuild sa

* GCT-20 Removed the cloud build submit argument

commit 64bce38
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Mon Apr 3 13:40:01 2023 -0400

GCT-43 mitigate failures from guardrails report (#17)

* GCT-43 Fixed guardrails #11 rego policy

* GCT-43 Mitigated the egress range 0.0.0.0/0 issue

* GCT-43 Delayed the organization policy application

* GCT-43 Renamed the guardrails version variable

commit 414ca0b
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Tue Mar 28 14:36:31 2023 -0400

GCT-38 Fixed unused and misused token issues (#16)

commit 88ba3dd
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Thu Mar 23 15:14:37 2023 -0400

GCT-35 Added service account expiry hours policy (#15)

commit 98aae24
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Thu Mar 23 15:14:01 2023 -0400

GCT-36 Updated cmk rotation period (#14)

commit 970c16b
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Thu Mar 23 15:13:37 2023 -0400

GCT-39 Fixed the missed organization id token bug (#13)

commit e98a815
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Thu Mar 23 15:13:15 2023 -0400

GCT-37 Fixed the rego policy parse error (#12)

commit 5e518a4
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Mon Mar 20 14:34:01 2023 -0400

GCT-29 Enabled bucket logging for buckets (#11)

* GCT-29 Enabled bucket logging for buckets

* GCT-29 Fixed iam and backward reference issues

commit 1fccfd5
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Thu Mar 16 13:34:29 2023 -0400

GCT-23 Updated log-based metrics (#10)

commit ea0a288
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Fri Mar 3 14:02:12 2023 -0500

GCT-8 Added function to use another git repo (#9)

commit f12ff25
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Wed Mar 1 15:09:38 2023 -0500

GCT-13 Added gcf artifact repository to functions (#8)

commit bcca300
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Tue Feb 28 13:15:29 2023 -0500

GCT-14 Splitted the REPLACE_FOLDER_ID token and supported token replacement on macOS (#7)

commit cf715a7
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Mon Feb 27 15:30:44 2023 -0500

GCT-12 Reverted the changes removed by Uday (#6)

commit aaf08d2
Author: uday kakkar udaykakkar@gmail.com
Date: Wed Feb 22 10:01:43 2023 -0500

Update bootstrap.sh

commit 7dc51e9
Author: uday kakkar udaykakkar@gmail.com
Date: Tue Feb 21 13:46:18 2023 -0500

folder - org switch (#5)

Co-authored-by: root <uday.kakkar@yoppworks.com>

commit 43f772e
Author: root uday.kakkar@yoppworks.com
Date: Fri Feb 17 19:27:44 2023 +0000

fixing the tfvars tokens

commit 14c1380
Author: Jackson Yang jackson.yang@yoppworks.com
Date: Thu Feb 16 16:29:15 2023 -0500

Improved writeids-mod.sh to match all auto.tfvars

commit 171fe14
Author: Jackson Yang jackson.yang@yoppworks.com
Date: Thu Feb 16 11:52:26 2023 -0500

Reduced bucket retention period to ease test

commit 7a09624
Author: JacksonYang jackson.yang@yoopworks.com
Date: Thu Feb 16 06:39:23 2023 +0000

Fixed the duplicated map key issue.

commit c0ea79b
Author: JacksonYang jackson.yang@yoopworks.com
Date: Wed Feb 15 21:25:38 2023 +0000

Refactored logging module and fixed some bugs found.

commit 2583469
Author: uday kakkar udaykakkar@gmail.com
Date: Wed Feb 15 00:49:05 2023 -0500

Update nonp-network.auto.tfvars

commit ca981f3
Author: uday kakkar udaykakkar@gmail.com
Date: Wed Feb 15 00:48:40 2023 -0500

Update prod-network.auto.tfvars

commit 533f8cf
Author: uday kakkar udaykakkar@gmail.com
Date: Wed Feb 15 00:43:46 2023 -0500

Update locals.tf

commit 0a3bc15
Author: uday kakkar udaykakkar@gmail.com
Date: Wed Feb 15 00:42:59 2023 -0500

Update main.tf

commit a593a21
Author: uday kakkar udaykakkar@gmail.com
Date: Wed Feb 15 00:42:11 2023 -0500

Update main.tf

commit 9966dcb
Author: uday kakkar udaykakkar@gmail.com
Date: Wed Feb 15 00:41:40 2023 -0500

Update locals.tf

commit c764438
Author: uday kakkar udaykakkar@gmail.com
Date: Wed Feb 15 00:30:24 2023 -0500

Update main.tf

commit 729b499
Author: uday kakkar udaykakkar@gmail.com
Date: Tue Feb 14 23:56:05 2023 -0500

Update outputs.tf

commit f499580
Author: uday kakkar udaykakkar@gmail.com
Date: Tue Feb 14 23:55:35 2023 -0500

Update locals.tf

commit 77933f1
Author: uday kakkar udaykakkar@gmail.com
Date: Tue Feb 14 23:54:58 2023 -0500

Update main.tf

commit cd2fa85
Author: Jackson Yang jackson.yang@yoppworks.com
Date: Mon Feb 13 22:53:22 2023 -0500

Added waitings to centralized logging

commit b1f8aa0
Merge: f33a6cc f10657c
Author: uday kakkar udaykakkar@gmail.com
Date: Mon Feb 13 16:29:18 2023 -0500

Merge pull request #4 from yw-liftandshift/testing-cleanups

Testing cleanups

commit f10657c
Author: root uday.kakkar@yoppworks.com
Date: Mon Feb 13 21:28:12 2023 +0000

cleanup changes

commit f33a6cc
Author: Jackson Yang jackson.yang@yoppworks.com
Date: Mon Feb 13 16:27:57 2023 -0500

Added   nat_config = [] to network host projects

commit 980261e
Author: root uday.kakkar@yoppworks.com
Date: Mon Feb 13 21:24:40 2023 +0000

cleanup changes

commit 43aef4c
Author: root uday.kakkar@yoppworks.com
Date: Mon Feb 13 21:17:49 2023 +0000

cleanup changes

commit 8863533
Author: Jackson Yang jackson.yang@yoppworks.com
Date: Mon Feb 13 14:21:31 2023 -0500

Uncommented orgnization monitoring center in common

commit 88f9cb4
Author: Jackson Yang jackson.yang@yoppworks.com
Date: Mon Feb 13 10:57:51 2023 -0500

Removed workloads from nonprod and prod

commit 0320ab6
Merge: e0ac5af ef57045
Author: uday kakkar udaykakkar@gmail.com
Date: Sat Feb 11 00:13:03 2023 -0500

Merge pull request #2 from yw-liftandshift/DRDC

fixes

commit ef57045
Author: root uday.kakkar@yoppworks.com
Date: Sat Feb 11 05:11:20 2023 +0000

fixes

commit e0ac5af
Merge: c416c6d c0048c7
Author: uday kakkar udaykakkar@gmail.com
Date: Sat Feb 11 00:00:31 2023 -0500

Merge pull request #1 from yw-liftandshift/DRDC

adding automation

commit c416c6d
Author: Jackson Yang 95398233+jacyang2010@users.noreply.github.com
Date: Wed Feb 8 17:02:40 2023 -0500

Removed project-specific prefix from folder name

commit c0048c7
Author: udaykakkar udaykakkar@gmail.com
Date: Wed Feb 8 16:39:55 2023 -0500

adding automation

commit 53f69cc
Author: JacksonYang jackson.yang@yoppworks.com
Date: Wed Feb 8 10:02:04 2023 -0500

Added feature to find all auto.tfvars files

commit 2791bbc
Author: JacksonYang jackson.yang@yoppworks.com
Date: Wed Feb 8 00:06:13 2023 -0500

reinitiated  2023-02-08.0002

@jacyang2010 jacyang2010 marked this pull request as draft August 21, 2023 16:58
@jacyang2010 jacyang2010 marked this pull request as ready for review August 21, 2023 16:59
@fmichaelobrien
Copy link
Contributor

Reviewing over the next 48+h including a clean org deploy of this patch and arch review.
Customer lz focused modifications going in separately will need to be merged.

@jacyang2010 jacyang2010 marked this pull request as draft August 21, 2023 18:42
@jacyang2010
Copy link
Collaborator Author

jacyang2010 commented Aug 22, 2023

Hi @fmichaelobrien ,

Here are some architecture diagrams of the changes from the contribution for architecture review:

Organizational Structure
GCP LZ - Organization Structure

GCP LandingZone Architecture
GCP LZ - Architecture

Centralized Logging and Monitoring
GCP LZ - CLM

We are suggesting updating these diagrams to the current Readme.md or documents. Please let us know if that is ok.

@jacyang2010
Copy link
Collaborator Author

jacyang2010 commented Aug 22, 2023

Hi @fmichaelobrien

The blow are screenshots of some major changes of deployed GCP LandingZone for deployment review.

Resource Tree:
Deployed GCP LZ - ResourceTree

CloudBuilds:
Deployed GCP LZ - CloudBuilds

Terraform Root Modules:
Deployed GCP LZ- CSR - BS Common
Deployed GCP LZ - NP PROD

CMK Module:
Deployed GCP LZ - CMK

Logging and Monitoring Modules:
Deployed GCP LZ - LOG MON

GKE Modules:
Deployed GCP LZ -GKE

@fmichaelobrien
Copy link
Contributor

Sounds good, the more diagrams the better, projected (ngfw perimeter based) and current (armor only) for example are all good. You can split the PR's by GitHub issue id as well if that granular approach is easier

@obriensystems
Copy link
Collaborator

In general I will need to fully deploy this branch in a new clean org.
It would help if your team posted some testing/deployment results - not from the previous private branch where this code comes from - but the PR branch above that is synced with main.
There will be some edits on my side on the main branch to remove some hardcoding specific to dev testing with our main client likely before all your merge conflicts are resolved.

docs/architecture.md Outdated Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue for all the img files - rebase your PR branch
this file was already added in oct 2022
https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/commits/main/docs/img/_01_guardrails_mfa_on_admin_wide_org_2.png

@fmichaelobrien
Copy link
Contributor

Jackson the TF PR needs to be rebased - half the changes in your patch are changes I already added since Oct 2022 - which looks like the version of main your PR is based on.for example
I recommend the following.

git checkout main
git pull
git checkout <yopps-branch>
git merge main
git commit -m ...
git push ...

provider = google-beta
for_each = local.filtered_monitored_projects
metrics_scope = "locations/global/metricsScopes/${local.scoping_project_id}"
name = "locations/global/metricsScopes/${local.scoping_project_id}/projects/${each.value.project_id}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this monitored_projects resource needs to be modified to use a non beta module or commented out in entirety for now. The issue is that the for loop that gathers project id's will also gather recently deleted project id's in the 30 day window - breaking common and sometimes prod

This is an intermittent issue with deleted projects - the for loop in prod is intermittent and can be retried but the one in common has issues with the 30 day list in combination with the state file. Yesterday I worked around it but today depending on the changes (2 new bq projects) i needed to comment out/remove the monitoring section - partially disabling some of the logging/monitoring additions. Now to be fair that module uses a beta group api that may have the same issues I have seen with the automated in-beta groups creation module (workaround there is to fully delete the group before doing user add/removes - tool gets confused on authoratative vs additive modes. I have workarounds for the non-public code that gets in the way of something that should take 20 min to merge/deploy into 1 hour of triage - with a solution. https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/issues/279

scoping_project_id = (var.project == null || var.project == "") ? try(module.monitoring_center_project[0].project_id, null) : var.project
scoping_project_parent_id = try(split("/", var.parent)[1], null)
matched_monitored_projects = local.scoping_project_id == null || local.scoping_project_parent_id == null ? [] : try(var.monitored_projects, [])
filtered_monitored_projects = { for prj in local.matched_monitored_projects : prj.project_id => prj if prj.parent.id != local.scoping_project_parent_id && prj.project_id != local.scoping_project_id }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See commented issue with intermittently bringing in deleted project ids - requiring modules/monitoring-center/main.tf to be commented out to allow the build to proceed

@jacyang2010 jacyang2010 force-pushed the pbmm-secure-landingzone-contribution branch from 6e66106 to e88583e Compare September 11, 2023 21:00
@jacyang2010
Copy link
Collaborator Author

Jackson the TF PR needs to be rebased - half the changes in your patch are changes I already added since Oct 2022 - which looks like the version of main your PR is based on.for example I recommend the following.

git checkout main
git pull
git checkout <yopps-branch>
git merge main
git commit -m ...
git push ...

Hi @fmichaelobrien , the latest main is merged into the Yoppworks contribution PR as per the above steps.

@obriensystems
Copy link
Collaborator

Looks good, some verification/testing examples are in the following issue where a clean org installs the build (add/spawn issues as they occur for side-PRs)
#300

@jacyang2010 jacyang2010 force-pushed the pbmm-secure-landingzone-contribution branch from e88583e to 51a4f0f Compare September 12, 2023 18:16
@fmichaelobrien
Copy link
Contributor

Jackson, looks good, can we flip the PR from draft and fix the merge conflicts - then we can get it merged and work out adjustments as we go on the main branch after it is merged.

@jacyang2010 jacyang2010 marked this pull request as ready for review September 14, 2023 17:14
@jacyang2010 jacyang2010 force-pushed the pbmm-secure-landingzone-contribution branch from 51a4f0f to 6bb02e1 Compare September 14, 2023 17:21
@jacyang2010
Copy link
Collaborator Author

@fmichaelobrien , Rebased/Merged latest main again and all look good. Since I have no write access permission to this repository, can you please click the merge button to trigger the merging? @obriensystems

Copy link
Contributor

@fmichaelobrien fmichaelobrien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick check on the merge - there are HEAD sections left over in the docs

@jacyang2010
Copy link
Collaborator Author

jacyang2010 commented Sep 14, 2023

Quick check on the merge - there are HEAD sections left over in the docs

It is fixed by replacing content with current main's. Please continue with the merging. @fmichaelobrien

Copy link
Contributor

@fmichaelobrien fmichaelobrien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Fully reviewed
Once the 314 changes are merged and the conflicts of my earlier 284 PRs are rebased - I'll approve and merge is patch.

I have some changes to do for monitoring/alerting that needs to be done on top of your 291 push to main - so ideally we merge this before Thursday.

Any comment or proposed changes can be done post PR merge in the tracking issue
#315

@@ -78,6 +77,11 @@ resource "google_artifact_registry_repository_iam_member" "terraform-image-iam"

}

data "google_projects" "active_projects" {
provider = google-beta
filter = "lifecycleState:active"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll test this later with deleted projects

@@ -214,3 +267,9 @@ module "net-public-perimeter-firewall" { #net-perimeter-prj-firewall
module.net-private-perimeter
]
}

data "google_projects" "monitored_projects" {
for_each = local.monitored_project_search_filter_map
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test later with deleted projects

@@ -42,7 +42,7 @@ module "partner-interconnect-primary" {
}*/

# Module used to deploy the VPC Service control defined in nonp-vpc-svc-ctl.auto.tfvars
module "vpc-svc-ctl" {
/*module "vpc-svc-ctl" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree - we will revisit VPC and integration with the new PSC later

REPLACE_ORGANIZATION_ROOT_NODE='folders\/167626420317'
REPLACE_WITH_BOOTSTRAP_UDS=clt29test
REPLACE_BOOTSTRAP_PARENT='folders\/167626420317'
REPLACE_BOOTSTRAP_EMAIL=user:uday.kakkar@yoppworks.com
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can generisize a couple of these later

# }
}

resource "google_kms_crypto_key" "default_global_customer_managed_key" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very nice

@@ -0,0 +1,197 @@
/**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can reuse this for kubeflow

@@ -23,7 +23,7 @@ set -e
modify()
{

array=( environments/bootstrap/bootstrap.auto.tfvars environments/bootstrap/organization-config.auto.tfvars environments/common/common.auto.tfvars environments/nonprod/nonp-network.auto.tfvars environments/common/perimeter-network.auto.tfvars environments/prod/prod-network.auto.tfvars )
array=$( find environments/** -type f -name "*.auto.tfvars" )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice - thanks for removing the hardcoding

@fmichaelobrien
Copy link
Contributor

Jackson don't worry about extensive testing - I will be running a clean install in ob.....eering anyway as I need to make some adjustments to the bootstrap (pre-your patch) and alerting (post your patch) anyway this week.If you put in 314 I'll merge tomorrow the 19th and we can continue on the main branch with smaller changes.
/michael

Copy link
Contributor

@fmichaelobrien fmichaelobrien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very nice
LGTM

@fmichaelobrien
Copy link
Contributor

Jackson, looks good, after a rebase for expected conflicts - I will reapprove and merge
Thank you

@jacyang2010 jacyang2010 force-pushed the pbmm-secure-landingzone-contribution branch from 0318ad5 to efdc514 Compare September 20, 2023 23:08
@jacyang2010
Copy link
Collaborator Author

jacyang2010 commented Sep 20, 2023

Deployment Test

Step1: Fill the lz.env with deployment parameter values and apply tokens.

Screenshot 2023-09-20 at 4 23 33 PM

Step2: Bootstrap Run

Screenshot 2023-09-20 at 4 30 12 PM

Step3: Comfirm domain.

Screenshot 2023-09-20 at 5 13 13 PM

Step4: Approve bootstrapping deployment.

Screenshot 2023-09-20 at 5 13 59 PM

Step5: Bootstrapping completed and push to CSR

Screenshot 2023-09-20 at 5 24 09 PM

Step6: Wait the cloud build image job completed

Screenshot 2023-09-20 at 5 33 59 PM

Step7: Assign terraform deployer service account to Group Admin group at workspace

Screenshot 2023-09-20 at 5 39 52 PM

Step8: Re-Run the bootstrap cloud build (Optional)

https://console.cloud.google.com/cloud-build/builds;region=northamerica-northeast1/5fc5868e-5cd6-45e9-a0f6-5948bdbea108?cloudshell=false&orgonly=true&project=lzpe-yjs04-yjs04test&supportedpurview=project

Screenshot 2023-09-20 at 7 52 15 PM

Step9: Run the common cloud build

https://console.cloud.google.com/cloud-build/builds;region=northamerica-northeast1/9a598c64-2cd3-46cf-842f-b3e4a05d1b83?cloudshell=false&orgonly=true&project=lzpe-yjs04-yjs04test&supportedpurview=project

Screenshot 2023-09-20 at 7 52 43 PM

Step10: Run the nonprod cloud build

https://console.cloud.google.com/cloud-build/builds;region=northamerica-northeast1/8777ee9e-6211-4a09-9194-8c57bbbeb97d?cloudshell=false&orgonly=true&project=lzpe-yjs04-yjs04test&supportedpurview=project

Screenshot 2023-09-20 at 7 53 00 PM

Step11: Run the prod cloud build

https://console.cloud.google.com/cloud-build/builds;region=northamerica-northeast1/85b4d65f-2bb6-4627-9c80-6dd129d7a1c6?cloudshell=false&orgonly=true&project=lzpe-yjs04-yjs04test&supportedpurview=project

Screenshot 2023-09-20 at 7 53 15 PM

Step12: All jobs success.

Screenshot 2023-09-20 at 7 31 35 PM

Step13: Check resource tree.

Screenshot 2023-09-20 at 8 01 03 PM

Step15: Done

@jacyang2010
Copy link
Collaborator Author

@fmichaelobrien Fixed some issues found from deployments and validated that this PR basically works. Please continue with the review and merging.

@fmichaelobrien
Copy link
Contributor

Very nice Jackson. Excellent test results - thank you
I noticed you fixed the 2nd account CLA as well
Everything is good for merging to main right now except for some merge conflicts reported by the PR - once these are fixed I can merge the PR

Copy link
Contributor

@fmichaelobrien fmichaelobrien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jacyang2010 jacyang2010 force-pushed the pbmm-secure-landingzone-contribution branch from efdc514 to dce21fc Compare September 21, 2023 02:46
@jacyang2010
Copy link
Collaborator Author

jacyang2010 commented Sep 21, 2023

LGTM

Rebased again and solved all merge conflicts. @fmichaelobrien
Please be noted I have no write access to merge this PR so please feel free to merge once it looks good to you.

@fmichaelobrien
Copy link
Contributor

Thanks for the work Jackson.
Also, I will look into getting yourself elevated access - like myself to the repo.
Merging...

@fmichaelobrien fmichaelobrien merged commit 22877ef into GoogleCloudPlatform:main Sep 21, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants