From c7a884f65851ccf8d070b1b7fb260b97d26a33a1 Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Mon, 17 Jan 2022 11:29:01 +0100 Subject: [PATCH] replace module refs in 02-sec --- fast/TODO.txt | 7 ++++++- fast/stages/02-security/core-dev.tf | 4 ++-- fast/stages/02-security/core-prod.tf | 4 ++-- fast/stages/02-security/vpc-sc.tf | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/fast/TODO.txt b/fast/TODO.txt index f94d2e64..3c99a403 100644 --- a/fast/TODO.txt +++ b/fast/TODO.txt @@ -8,4 +8,9 @@ TODO before merging - [ ] proper docstring on new tools - [x] modify github actions for different fast tfdoc usage - [ ] add roadmap to top-level fast README -- [ ] update modules references to local paths (ludo:0+2sec, julio:1, simo:2net+3) +- [ ] update modules references to local paths + - [x] stage 00 (ludo) + - [ ] stage 01 (julio) + - [ ] stage 02-net (simo) + - [x] stage 02-sec (ludo) + - [ ] stage 03-pf (simo) diff --git a/fast/stages/02-security/core-dev.tf b/fast/stages/02-security/core-dev.tf index b0c78485..4862ef52 100644 --- a/fast/stages/02-security/core-dev.tf +++ b/fast/stages/02-security/core-dev.tf @@ -15,7 +15,7 @@ */ module "dev-sec-project" { - source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/project?ref=v12.0.0" + source = "../../../modules/project" name = "dev-sec-core-0" parent = var.folder_id prefix = var.prefix @@ -29,7 +29,7 @@ module "dev-sec-project" { module "dev-sec-kms" { for_each = toset(local.kms_locations) - source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v12.0.0" + source = "../../../modules/kms" project_id = module.dev-sec-project.project_id keyring = { location = each.key diff --git a/fast/stages/02-security/core-prod.tf b/fast/stages/02-security/core-prod.tf index 0524788d..f259a488 100644 --- a/fast/stages/02-security/core-prod.tf +++ b/fast/stages/02-security/core-prod.tf @@ -15,7 +15,7 @@ */ module "prod-sec-project" { - source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/project?ref=v12.0.0" + source = "../../../modules/project" name = "prod-sec-core-0" parent = var.folder_id prefix = var.prefix @@ -29,7 +29,7 @@ module "prod-sec-project" { module "prod-sec-kms" { for_each = toset(local.kms_locations) - source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v12.0.0" + source = "../../../modules/kms" project_id = module.prod-sec-project.project_id keyring = { location = each.key diff --git a/fast/stages/02-security/vpc-sc.tf b/fast/stages/02-security/vpc-sc.tf index f22added..855dc1dd 100644 --- a/fast/stages/02-security/vpc-sc.tf +++ b/fast/stages/02-security/vpc-sc.tf @@ -44,7 +44,7 @@ locals { } module "vpc-sc" { - source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/vpc-sc?ref=ea17e65" + source = "../../../modules/vpc-sc" # only enable if we have projects defined for perimeters count = anytrue([for k, v in local.vpc_sc_counts : v > 0]) ? 1 : 0 access_policy = null