feat: add folder clean up (#47)

* feat: add folder clean up

* checkin go mod

* pin setup provider to minor version

* fix pubsub iam dep

Author: bharathkkb

modules/project_cleanup/function_source/go.mod

@@ -3,7 +3,7 @@ module github.com/terraform-google-modules/terraform-google-scheduled-function/m
 go 1.13
 
 require (
-	golang.org/x/net v0.0.0-20190318221613-d196dffd7c2b
-	golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421
-	google.golang.org/api v0.1.0
+	golang.org/x/net v0.0.0-20200822124328-c89045814202
+	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
+	google.golang.org/api v0.35.0
 )

modules/project_cleanup/function_source/main.go

@@ -55,7 +55,7 @@ type PubSubMessage struct {
 	Data []byte `json:"data"`
 }
 
-type FolderRecursion func(string, FolderRecursion)
+type FolderRecursion func(*cloudresourcemanager2.Folder, FolderRecursion)
 
 func activeProjectFilter(project *cloudresourcemanager.Project) bool {
 	return project.LifecycleState == LifecycleStateActiveRequested
@@ -274,21 +274,41 @@ func invoke(ctx context.Context) {
 		}
 	}
 
-	getSubFoldersAndRemoveProjectsRecursively := func(folderId string, recursion FolderRecursion) {
+	removeFolder := func(folder *cloudresourcemanager2.Folder) {
+		folderId := folder.Name
+		logger.Printf("Try to delete folder with id [%s]", folderId)
+		_, err := folderService.Delete(folderId).Do()
+		if err != nil {
+			logger.Printf("Failed to delete folder [%s], error [%s]", folderId, err.Error())
+		} else {
+			logger.Printf("Deleted folder [%s]", folderId)
+		}
+	}
+
+	getSubFoldersAndRemoveProjectsFoldersRecursively := func(folder *cloudresourcemanager2.Folder, recursion FolderRecursion) {
+		folderId := folder.Name
 		listFoldersRequest := folderService.List().Parent(folderId).ShowDeleted(false)
 		if err := listFoldersRequest.Pages(ctx, func(foldersResponse *cloudresourcemanager2.ListFoldersResponse) error {
 			for _, folder := range foldersResponse.Folders {
-				recursion(folder.Name, recursion)
+				recursion(folder, recursion)
 			}
 			removeProjectsInFolder(folderId)
+			if folder.Parent != fmt.Sprintf("folders/%s", rootFolderId) {
+				removeFolder(folder)
+			}
 			return nil
 		}); err != nil {
 			logger.Fatalf("Fail to get subfolders for the folder with id [%s], error [%s]", folderId, err.Error())
 		}
 	}
 
 	rootFolderId := fmt.Sprintf("folders/%s", rootFolderId)
-	getSubFoldersAndRemoveProjectsRecursively(rootFolderId, getSubFoldersAndRemoveProjectsRecursively)
+	rootFolder, err := folderService.Get(rootFolderId).Do()
+	if err != nil {
+		logger.Printf("Fail to get parent folder [%s], error [%s]", rootFolderId, err.Error())
+	} else {
+		getSubFoldersAndRemoveProjectsFoldersRecursively(rootFolder, getSubFoldersAndRemoveProjectsFoldersRecursively)
+	}
 }
 
 func CleanUpProjects(ctx context.Context, m PubSubMessage) error {

test/setup/iam.tf

@@ -17,7 +17,8 @@
 locals {
   int_required_roles = [
     "roles/storage.admin",
-    "roles/pubsub.editor",
+    "roles/pubsub.admin",
+    "roles/resourcemanager.projectIamAdmin",
     "roles/cloudscheduler.admin",
     "roles/cloudfunctions.developer",
     "roles/iam.serviceAccountUser",

test/setup/versions.tf

@@ -19,9 +19,9 @@ terraform {
 }
 
 provider "google" {
-  version = "~> 3.35.0"
+  version = "~> 3.35"
 }
 
 provider "google-beta" {
-  version = "~> 3.35.0"
+  version = "~> 3.35"
 }