Skip to content

Commit

Permalink
Synced with master.
Browse files Browse the repository at this point in the history
  • Loading branch information
lpezet committed Aug 7, 2024
2 parents 7f68fcc + 028f85f commit 903633d
Show file tree
Hide file tree
Showing 31 changed files with 150 additions and 101 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
go-version-file: ${{ matrix.folder }}/go.mod
cache-dependency-path: ${{ matrix.folder }}/go.sum
- name: golangci-lint
uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
with:
version: latest
working-directory: ${{ matrix.folder }}
Expand Down
2 changes: 1 addition & 1 deletion 0-bootstrap/modules/tfc-agent-gke/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-google-tf-cloud-agents:tfc-agent-gke/v4.0.0"
module_name = "blueprints/terraform/terraform-google-tf-cloud-agents:tfc-agent-gke/v4.1.0"
}
}

2 changes: 1 addition & 1 deletion 0-bootstrap/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:bootstrap/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:bootstrap/v4.1.0"
}

}
4 changes: 2 additions & 2 deletions 1-org/envs/shared/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:org/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:org/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:org/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:org/v4.1.0"
}
}
79 changes: 43 additions & 36 deletions 1-org/modules/cai-monitoring/function-source/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 1-org/modules/cai-monitoring/function-source/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@google-cloud/security-center": "8.8.0",
"@google-cloud/security-center": "8.11.0",
"uuid4": "2.0.3",
"moment": "2.30.1"
}
Expand Down
4 changes: 2 additions & 2 deletions 2-environments/modules/env_baseline/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:environments/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:environments/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:environments/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:environments/v4.1.0"
}
}
4 changes: 2 additions & 2 deletions 3-networks-dual-svpc/modules/base_env/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:networks-dual-svpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:networks-dual-svpc/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:networks-dual-svpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:networks-dual-svpc/v4.1.0"
}
}
4 changes: 2 additions & 2 deletions 3-networks-dual-svpc/modules/base_shared_vpc/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v4.1.0"
}
}
4 changes: 2 additions & 2 deletions 3-networks-dual-svpc/modules/partner_interconnect/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module "access_level" {

module "access_level_dry_run" {
source = "terraform-google-modules/vpc-service-controls/google//modules/access_level"
version = "~> 5.0"
version = "~> 6.0"

description = "${local.prefix} Access Level for testing with a dry run perimeter"
policy = var.access_context_manager_policy_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v4.1.0"
}
}
4 changes: 2 additions & 2 deletions 3-networks-hub-and-spoke/modules/base_env/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:networks-hub-and-spoke/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:networks-hub-and-spoke/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:networks-hub-and-spoke/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:networks-hub-and-spoke/v4.1.0"
}
}
4 changes: 2 additions & 2 deletions 3-networks-hub-and-spoke/modules/base_shared_vpc/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module "access_level" {

module "access_level_dry_run" {
source = "terraform-google-modules/vpc-service-controls/google//modules/access_level"
version = "~> 5.0"
version = "~> 6.0"

description = "${local.prefix} Access Level for testing with a dry run perimeter"
policy = var.access_context_manager_policy_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v4.1.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v4.0.0"
module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v4.1.0"
}
}
Loading

0 comments on commit 903633d

Please sign in to comment.