fix: Update cleaner function to 2.0 (#905)

* Update cleaner function to 1.6 * recreate project
GoogleCloudPlatform · May 1, 2021 · 285a3e6 · 285a3e6
1 parent ab56841
commit 285a3e6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/infra/terraform/test-org/test-cleanup/cleanup.tf b/infra/terraform/test-org/test-cleanup/cleanup.tf
@@ -14,23 +14,22 @@
  * limitations under the License.
 */
 
-module "app-engine" {
+module "scheduler-app-engine" {
   source      = "terraform-google-modules/project-factory/google//modules/app_engine"
-  version     = "~> 3.0"
+  version     = "~> 10.0"
   location_id = local.app_location
-  project_id  = module.project.project_id
+  project_id  = module.cft-manager-project.project_id
 }
 
-module "projects_cleanup" {
+module "projects_cleaner" {
   source  = "terraform-google-modules/scheduled-function/google//modules/project_cleanup"
-  version = "~> 1.1"
+  version = "~> 2.0"
 
   job_schedule             = "17 * * * *"
   max_project_age_in_hours = "6"
   organization_id          = local.org_id
-  project_id               = module.project.project_id
+  project_id               = module.cft-manager-project.project_id
   region                   = local.region
   target_excluded_labels   = local.exclude_labels
   target_folder_id         = local.cleanup_folder
 }
-
diff --git a/infra/terraform/test-org/test-cleanup/outputs.tf b/infra/terraform/test-org/test-cleanup/outputs.tf
@@ -15,7 +15,7 @@
  */
 
 output "project_id" {
-  value = module.project.project_id
+  value = module.cft-manager-project.project_id
 }
 
 output "excluded_labels" {

diff --git a/infra/terraform/test-org/test-cleanup/project.tf b/infra/terraform/test-org/test-cleanup/project.tf
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-module "project" {
+module "cft-manager-project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 3.0"
+  version = "~> 10.0"
 
   name              = "cft-project-manager"
   random_project_id = true
@@ -28,6 +28,7 @@ module "project" {
   activate_apis = [
     "cloudresourcemanager.googleapis.com",
     "cloudscheduler.googleapis.com",
+    "cloudbuild.googleapis.com",
     "cloudfunctions.googleapis.com",
     "pubsub.googleapis.com",
     "storage-api.googleapis.com",

diff --git a/infra/terraform/test-org/test-cleanup/versions.tf b/infra/terraform/test-org/test-cleanup/versions.tf
@@ -23,11 +23,11 @@ provider "archive" {
 }
 
 provider "google" {
-  version = "~> 2.19"
+  version = "~> 3.38"
 }
 
 provider "google-beta" {
-  version = "~> 2.19"
+  version = "~> 3.38"
 }
 
 provider "null" {