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.

Sign up for GitHub

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

fix(deps): Update terraform-google-modules/project-factory v17 #246

Merged
merged 3 commits into from
Sep 26, 2024
Merged

fix(deps): Update terraform-google-modules/project-factory v17 #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ba5dbf
fix(deps): Update Terraform terraform-google-modules/project-factory/…
apeabody Sep 25, 2024
54e34cc
Merge branch 'main' into ap/del_policy
apeabody Sep 25, 2024
6dc3ead
Merge branch 'main' into ap/del_policy
apeabody Sep 26, 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
3 changes: 2 additions & 1 deletion 2-multitenant/modules/env_baseline/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ locals {
// Create cluster project
module "eab_cluster_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 16.0"
version = "~> 17.0"

count = var.create_cluster_project ? 1 : 0

Expand All @@ -41,6 +41,7 @@ module "eab_cluster_project" {
billing_account = var.billing_account
svpc_host_project_id = var.network_project_id
shared_vpc_subnets = var.cluster_subnetworks
deletion_policy = "DELETE"

// Skip disabling APIs for gkehub.googleapis.com
// https://cloud.google.com/anthos/fleet-management/docs/troubleshooting#error_when_disabling_the_fleet_api
Expand Down
6 changes: 4 additions & 2 deletions 4-appfactory/modules/app-group-baseline/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ locals {
// Create admin project
module "app_admin_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 16.0"
version = "~> 17.0"

random_project_id = true
random_project_id_length = 4
billing_account = var.billing_account
name = substr("${var.acronym}-${var.service_name}-admin", 0, 25) # max length 30 chars
org_id = var.org_id
folder_id = var.folder_id
deletion_policy = "DELETE"
activate_apis = [
"iam.googleapis.com",
"cloudresourcemanager.googleapis.com",
Expand Down Expand Up @@ -74,7 +75,7 @@ module "tf_cloudbuild_workspace" {
// Create env project
module "app_env_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 16.0"
version = "~> 17.0"
for_each = var.create_env_projects ? var.envs : {}

random_project_id = true
Expand All @@ -84,4 +85,5 @@ module "app_env_project" {
org_id = each.value.org_id
folder_id = each.value.folder_id
activate_apis = var.env_project_apis
deletion_policy = "DELETE"
}
6 changes: 4 additions & 2 deletions test/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,15 @@ resource "random_string" "prefix" {

module "project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 16.0"
version = "~> 17.0"

name = "ci-enterprise-application"
random_project_id = "true"
random_project_id_length = 4
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
deletion_policy = "DELETE"

activate_apis = [
"cloudbuild.googleapis.com",
Expand Down Expand Up @@ -117,14 +118,15 @@ resource "google_folder_iam_member" "common_folder_iam" {
module "vpc_project" {
for_each = module.folders.ids
source = "terraform-google-modules/project-factory/google"
version = "~> 16.0"
version = "~> 17.0"

name = "eab-vpc-${each.key}"
random_project_id = "true"
random_project_id_length = 4
org_id = var.org_id
folder_id = each.value
billing_account = var.billing_account
deletion_policy = "DELETE"

activate_apis = [
"cloudresourcemanager.googleapis.com",
Expand Down