Skip to content

fix(deps): Update Terraform terraform-google-modules/bootstrap/google to v7 #1093

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

Merged
merged 2 commits into from
Feb 6, 2024
Merged

fix(deps): Update Terraform terraform-google-modules/bootstrap/google to v7 #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09750fd
fix(deps): Update Terraform terraform-google-modules/bootstrap/google…
renovate[bot] Feb 5, 2024
83d0415
update vpc_type variable
apeabody Feb 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
6 changes: 3 additions & 3 deletions 0-bootstrap/cb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ module "gcp_projects_state_bucket" {

module "tf_source" {
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_source"
version = "~> 6.4"
version = "~> 7.0"

org_id = var.org_id
folder_id = google_folder.bootstrap.id
Expand Down Expand Up @@ -154,7 +154,7 @@ module "tf_private_pool" {

module "tf_cloud_builder" {
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
version = "~> 6.5"
version = "~> 7.0"

project_id = module.tf_source.cloudbuild_project_id
dockerfile_repo_uri = module.tf_source.csr_repos[local.cloudbuilder_repo].url
Expand Down Expand Up @@ -205,7 +205,7 @@ module "build_terraform_image" {

module "tf_workspace" {
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
version = "~> 6.4"
version = "~> 7.0"
for_each = local.granular_sa

project_id = module.tf_source.cloudbuild_project_id
Expand Down
2 changes: 1 addition & 1 deletion 0-bootstrap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource "google_folder" "bootstrap" {

module "seed_bootstrap" {
source = "terraform-google-modules/bootstrap/google"
version = "~> 6.3"
version = "~> 7.0"

org_id = var.org_id
folder_id = google_folder.bootstrap.id
Expand Down
2 changes: 1 addition & 1 deletion 4-projects/modules/infra_pipelines/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ resource "google_storage_bucket" "cloudbuild_bucket" {

module "tf_workspace" {
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
version = "~> 6.4"
version = "~> 7.0"
for_each = toset(var.app_infra_repos)

project_id = var.cloudbuild_project_id
Expand Down
2 changes: 1 addition & 1 deletion 4-projects/modules/single_project/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
| vpc\_service\_control\_attach\_enabled | Whether the project will be attached to a VPC Service Control Perimeter | `bool` | `false` | no |
| vpc\_service\_control\_perimeter\_name | The name of a VPC Service Control Perimeter to add the created project to | `string` | `null` | no |
| vpc\_service\_control\_sleep\_duration | The duration to sleep in seconds before adding the project to a shared VPC after the project is added to the VPC Service Control Perimeter | `string` | `"5s"` | no |
| vpc\_type | The type of VPC to attach the project to. Possible options are base or restricted. | `string` | `""` | no |
| vpc\_type | The type of VPC to attach the project to. Possible options are base or restricted. | `string` | `null` | no |

## Outputs

Expand Down
2 changes: 1 addition & 1 deletion 4-projects/modules/single_project/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ variable "environment" {
variable "vpc_type" {
description = "The type of VPC to attach the project to. Possible options are base or restricted."
type = string
default = ""
default = null
}

variable "shared_vpc_host_project_id" {
Expand Down