Merge branch 'master' into add-possibility-to-disable-default-notyfic…

…ation-on-budget

.github/renovate.json

@@ -1,37 +1,34 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    "config:recommended",
     ":semanticCommits",
     ":preserveSemverRanges",
     ":rebaseStalePrs"
   ],
-  "stabilityDays":7,
-  "ignorePaths": [],
+  "minimumReleaseAge": "7 days",
+  "ignorePaths": [".github/workflows/lint.yaml", ".github/workflows/stale.yml"],
   "labels": ["dependencies"],
-    "vulnerabilityAlerts":{
-     "labels":[
-       "type:security"
-     ],
-     "stabilityDays":0
-  },
-  "separateMajorMinor":false,
-  "constraints": {
-    "go": "1.20"
+  "vulnerabilityAlerts": {
+    "labels": ["type:security"],
+    "minimumReleaseAge": null
   },
+  "constraints": {"go": "1.20"},
   "packageRules": [
     {
-      "matchPaths": ["examples/**", "test/**", ".github/**"],
-      "extends": [":semanticCommitTypeAll(chore)"]
+      "matchFileNames": ["examples/**", "test/**", ".github/**"],
+      "commitMessagePrefix": "chore(deps):"
     },
     {
-      "matchPaths": ["*", "modules/**"],
-      "extends": [":semanticCommitTypeAll(fix)"]
+      "matchFileNames": ["*", "modules/**"],
+      "commitMessagePrefix": "fix(deps):"
     },
     {
-      "matchDepTypes": ["module"],
-      "groupName": "TF modules"
+      "matchFileNames": ["*", "modules/**"],
+      "matchUpdateTypes": "major",
+      "commitMessagePrefix": "fix(deps)!:"
     },
+    {"matchDepTypes": ["module"], "groupName": "TF modules"},
     {
       "matchDepTypes": ["require"],
       "groupName": "GO modules",
@@ -44,21 +41,25 @@
       "postUpdateOptions": ["gomodTidy"]
     },
     {
-      "matchPackageNames": ["google", "google-beta"],
-      "groupName": "terraform googles"
+      "matchDepNames": ["google", "google-beta"],
+      "groupName": "Terraform Google Provider"
     }
   ],
   "regexManagers": [
     {
       "fileMatch": ["(^|/)Makefile$"],
-      "matchStrings": ["DOCKER_TAG_VERSION_DEVELOPER_TOOLS := (?<currentValue>.*?)\\n"],
+      "matchStrings": [
+        "DOCKER_TAG_VERSION_DEVELOPER_TOOLS := (?<currentValue>.*?)\\n"
+      ],
       "datasourceTemplate": "docker",
       "registryUrlTemplate": "https://gcr.io/cloud-foundation-cicd",
       "depNameTemplate": "cft/developer-tools"
     },
     {
       "fileMatch": ["(^|/)build/(int|lint)\\.cloudbuild\\.yaml$"],
-      "matchStrings": ["  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '(?<currentValue>.*?)'\\n"],
+      "matchStrings": [
+        "  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '(?<currentValue>.*?)'\\n"
+      ],
       "datasourceTemplate": "docker",
       "registryUrlTemplate": "https://gcr.io/cloud-foundation-cicd",
       "depNameTemplate": "cft/developer-tools"

.github/workflows/lint.yaml

@@ -31,7 +31,7 @@ jobs:
     name: 'lint'
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3'
+      - uses: 'actions/checkout@v4'
       - id: variables
         run: |
           MAKEFILE=$(find . -name Makefile -print -quit)

.github/workflows/stale.yml

@@ -22,6 +22,7 @@ on:
 
 jobs:
   stale:
+    if: github.repository_owner == 'GoogleCloudPlatform' || github.repository_owner == 'terraform-google-modules'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/stale@v8

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Extending the adopted spec, each change should have a link to its corresponding pull request appended.
 
+## [14.3.0](https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v14.2.1...v14.3.0) (2023-07-27)
+
+
+### Features
+
+* **budget:** Only read project data when budget will be created ([#829](https://github.com/terraform-google-modules/terraform-google-project-factory/issues/829)) ([ee3865b](https://github.com/terraform-google-modules/terraform-google-project-factory/commit/ee3865b68703b80da8e41d789e3a081152441b78))
+
 ## [14.2.1](https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v14.2.0...v14.2.1) (2023-06-22)
 
 

README.md

@@ -29,7 +29,7 @@ There are multiple examples included in the [examples](./examples/) folder but s
 ```hcl
 module "project-factory" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 14.2"
+  version = "~> 14.3"
 
   name                 = "pf-test-1"
   random_project_id    = true

modules/budget/versions.tf

@@ -25,9 +25,9 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:budget/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:budget/v14.3.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:budget/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:budget/v14.3.0"
   }
 }

modules/essential_contacts/versions.tf

@@ -27,9 +27,9 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:essential_contacts/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:essential_contacts/v14.3.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:essential_contacts/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:essential_contacts/v14.3.0"
   }
 }

modules/fabric-project/versions.tf

@@ -24,9 +24,9 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:fabric-project/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:fabric-project/v14.3.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:fabric-project/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:fabric-project/v14.3.0"
   }
 }

modules/gsuite_enabled/README.md

@@ -10,7 +10,7 @@ There are multiple examples included in the [examples] folder but simple usage i
 ```hcl
 module "project-factory" {
   source = "terraform-google-modules/project-factory/google//modules/gsuite_enabled"
-  version = "~> 14.2"
+  version = "~> 14.3"
 
   billing_account   = "ABCDEF-ABCDEF-ABCDEF"
   create_group      = true

modules/gsuite_enabled/versions.tf

@@ -31,9 +31,9 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:gsuite_enabled/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:gsuite_enabled/v14.3.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:gsuite_enabled/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:gsuite_enabled/v14.3.0"
   }
 }

modules/project_services/README.md

@@ -21,7 +21,7 @@ APIs without knowing it. Therefore, it is recommended to avoid using
 ```
 module "project-services" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 14.2"
+  version = "~> 14.3"
 
   project_id                  = "my-project-id"
 

modules/project_services/versions.tf

@@ -27,9 +27,9 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:project_services/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:project_services/v14.3.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:project_services/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:project_services/v14.3.0"
   }
 }

modules/shared_vpc_access/versions.tf

@@ -27,9 +27,9 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:shared_vpc_access/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:shared_vpc_access/v14.3.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:shared_vpc_access/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:shared_vpc_access/v14.3.0"
   }
 }

modules/svpc_service_project/README.md

@@ -7,7 +7,7 @@ The advantage of using this module over the root module, is being able to provis
 ```hcl
 module "service-project" {
   source  = "terraform-google-modules/project-factory/google//modules/svpc_service_project"
-  version = "~> 14.2"
+  version = "~> 14.3"
 
   name                = "pf-test-1"
   random_project_id   = true

modules/svpc_service_project/versions.tf

@@ -27,9 +27,9 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:svpc_service_project/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:svpc_service_project/v14.3.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-project-factory:svpc_service_project/v14.2.1"
+    module_name = "blueprints/terraform/terraform-google-project-factory:svpc_service_project/v14.3.0"
   }
 }

test/integration/go.mod

@@ -3,14 +3,14 @@ module github.com/terraform-google-modules/terraform-google-project-factory/test
 go 1.20
 
 require (
-	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.6.0
+	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.8.0
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/oauth2 v0.9.0
+	golang.org/x/oauth2 v0.11.0
 )
 
 require (
 	cloud.google.com/go v0.110.2 // indirect
-	cloud.google.com/go/compute v1.19.3 // indirect
+	cloud.google.com/go/compute v1.20.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.0.1 // indirect
 	cloud.google.com/go/storage v1.30.1 // indirect
@@ -31,8 +31,8 @@ require (
 	github.com/google/s2a-go v0.1.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.9.1 // indirect
-	github.com/gruntwork-io/terratest v0.42.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
+	github.com/gruntwork-io/terratest v0.43.11 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-getter v1.7.1 // indirect
@@ -48,30 +48,30 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-zglob v0.0.4 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.2-0.20210217184823-a52172cd2f64 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.2-0.20210821155943-2d9075ca8770 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/tidwall/gjson v1.14.4 // indirect
+	github.com/tidwall/gjson v1.15.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/tmccombs/hcl2json v0.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.11 // indirect
 	github.com/zclconf/go-cty v1.13.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.10.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.11.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/api v0.124.0 // indirect
+	google.golang.org/api v0.126.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
+	google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
 	google.golang.org/grpc v1.55.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect