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

refactor: remove base vpc and change in perimeter #5

Open
wants to merge 90 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
79b82e7
first commit
mariammartins Oct 24, 2024
a41d95d
removing base_shared service projects
mariammartins Oct 31, 2024
e8e85eb
fix example storage cmek
mariammartins Nov 5, 2024
6e0efc8
fixes
mariammartins Nov 5, 2024
d2db667
changing network step name and references to 3-networks-svpc
mariammartins Nov 5, 2024
ebee33f
replacing shared resources and references names to svpc
mariammartins Nov 5, 2024
bf909fc
fix lint
mariammartins Nov 5, 2024
491877c
fix 2-environments step
mariammartins Nov 5, 2024
3093e88
fix network steps
mariammartins Nov 5, 2024
e388658
fix network svps step
mariammartins Nov 5, 2024
1cd4a08
fix 4-projects step
mariammartins Nov 5, 2024
d02b55a
remove some base references
mariammartins Nov 7, 2024
a1a0671
delete base shared vpc resources
mariammartins Nov 8, 2024
906092a
rm base shared project in integration tests
mariammartins Nov 8, 2024
9192c5f
rm network hub and spoke base project resources
mariammartins Nov 8, 2024
803ca3e
fix hub and spoke README
mariammartins Nov 8, 2024
cca43b5
fix READMEs
mariammartins Nov 8, 2024
0f3df1e
solve conflicts
mariammartins Nov 11, 2024
efd9fe3
fix README
mariammartins Nov 11, 2024
69a206d
gitignore
mariammartins Nov 11, 2024
66e954f
fix tfvars
mariammartins Nov 11, 2024
8243830
fix conflicts
mariammartins Nov 12, 2024
a285303
fix conflicts
mariammartins Nov 12, 2024
2da2f19
updating 1-org step with service control
mariammartins Nov 18, 2024
726ae2c
fix variables and network modules
mariammartins Nov 18, 2024
ac1f07a
add bootstrap outputs
mariammartins Nov 24, 2024
178bd44
Merge branch 'master' into refactor/remove-base-VPC
mariammartins Nov 24, 2024
f552c92
fix output number
mariammartins Nov 24, 2024
e246487
fix output
mariammartins Nov 24, 2024
81f64dc
add service control modules
mariammartins Nov 24, 2024
16cc49f
fix output
mariammartins Nov 24, 2024
82e0b29
fix 1-org step
mariammartins Nov 25, 2024
bb1f1c1
grant access policy admin env sa
mariammartins Nov 25, 2024
7c842c7
fix 2-envivonrmnet step
mariammartins Nov 25, 2024
89ab184
docker generate docks and test lint
mariammartins Nov 25, 2024
ca3a0bf
step 3-networks-svps refactoring
mariammartins Nov 27, 2024
a7eced0
updt remote file
mariammartins Nov 27, 2024
af46884
refactoring step 4
mariammartins Nov 27, 2024
dc2f0cc
add terraform.example.tfvars
mariammartins Dec 3, 2024
745c6ab
rm tf-wrapper
mariammartins Dec 3, 2024
34edfe2
upd README 1-org
mariammartins Dec 3, 2024
2eff10a
upd terraform.example.tfvars
mariammartins Dec 3, 2024
509a182
fix 3-network-svpc README
mariammartins Dec 3, 2024
7e549ed
upd 4-projects step
mariammartins Dec 3, 2024
a429aa8
rm sample-base peering instance
mariammartins Dec 3, 2024
804d8ec
upd env prj subnets
mariammartins Dec 3, 2024
eb1a7cf
fix lint
mariammartins Dec 3, 2024
8aa2337
fix add bootstrap prjs resource
mariammartins Dec 3, 2024
10f7f5c
fix lint
mariammartins Dec 3, 2024
57bc48e
add depends on
mariammartins Dec 3, 2024
4145dd4
add instructions to include app infra pipeline SA in the perimeter
mariammartins Dec 3, 2024
6596445
rm base prj references
mariammartins Dec 3, 2024
6bc0d16
rm base prj references
mariammartins Dec 3, 2024
a136c5c
fix linta
mariammartins Dec 4, 2024
ec8193e
fix lint
mariammartins Dec 4, 2024
3924636
rm perimeter variable hub and spoke
mariammartins Dec 4, 2024
15cfc30
rm perimeter variable svpc
mariammartins Dec 4, 2024
a2d5ade
review fixes
mariammartins Dec 5, 2024
353affd
uncommenting the header
mariammartins Dec 5, 2024
0de7de0
rm Restricted Outputs comments
mariammartins Dec 5, 2024
2e2012b
add new line in the end of file
mariammartins Dec 5, 2024
5e85832
fix lint
mariammartins Dec 5, 2024
476e411
rm restricted term from host_project
mariammartins Dec 5, 2024
9cb6ce0
rm restricted name hub and spoke resources
mariammartins Dec 5, 2024
abe3ec8
rm restricted name svpc network
mariammartins Dec 5, 2024
c6d4f38
rm restricted name projects resources
mariammartins Dec 5, 2024
55ba378
rm restricted name from subnets_self_links
mariammartins Dec 5, 2024
d20955f
rm restricted name in newtork_hub module
mariammartins Dec 5, 2024
b8709c7
rm restricted name in network module and shared files
mariammartins Dec 5, 2024
4f269bb
rm some restricted references in shared files
mariammartins Dec 5, 2024
50b03f3
rm restricted name in shared vpc host project module
mariammartins Dec 5, 2024
083d2aa
upd application name label
mariammartins Dec 5, 2024
a893962
rm some restricted names in service control and network modules
mariammartins Dec 5, 2024
a600ec2
rm restricted name
mariammartins Dec 5, 2024
8d0381c
rm restricted vpc label and prefix
mariammartins Dec 5, 2024
3bccb7f
rm restricted references
mariammartins Dec 5, 2024
73c0810
fix locals
mariammartins Dec 5, 2024
0b576c5
fix 3-networks-svpc step
mariammartins Dec 5, 2024
3cf7b3f
fix interconnect example
mariammartins Dec 5, 2024
af31b41
rm 3-networks-hub-and-spoke restricted resources
mariammartins Dec 5, 2024
8831dd9
rm restricted references
mariammartins Dec 5, 2024
06b7a71
fix parter interconnect README
mariammartins Dec 5, 2024
195e298
fix README and main
mariammartins Dec 5, 2024
be04cc0
rm restricted reference in resources
mariammartins Dec 5, 2024
1386456
rm restricted references
mariammartins Dec 5, 2024
0a62c24
fix integration tests, shared files and root README
mariammartins Dec 5, 2024
6d48a0d
fixes
mariammartins Dec 5, 2024
958472a
fix shared vpc project name in locals
mariammartins Dec 6, 2024
bf87065
add random version
mariammartins Dec 6, 2024
469a01a
fix integration tests, shared vpc module and bootstrap README
mariammartins Dec 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
Prev Previous commit
Next Next commit
fix lint
mariammartins committed Nov 5, 2024
commit bf909fc04c5a73cae0b626a1b5276a547505b986
4 changes: 2 additions & 2 deletions 3-networks-svpc/modules/base_env/remote.tf
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@
*/

locals {
restricted_project_id = data.terraform_remote_state.org.outputs.shared_vpc_projects[var.env].restricted_shared_vpc_project_id
restricted_project_number = data.terraform_remote_state.org.outputs.shared_vpc_projects[var.env].restricted_shared_vpc_project_number
restricted_project_id = data.terraform_remote_state.org.outputs.shared_vpc_projects[var.env].restricted_shared_vpc_project_id
restricted_project_number = data.terraform_remote_state.org.outputs.shared_vpc_projects[var.env].restricted_shared_vpc_project_number
interconnect_project_number = data.terraform_remote_state.org.outputs.interconnect_project_number
dns_hub_project_id = data.terraform_remote_state.org.outputs.dns_hub_project_id
organization_service_account = data.terraform_remote_state.bootstrap.outputs.organization_step_terraform_service_account_email