fix(project_cleanup): check all cluster locations and defer when dele…

…ting (#248)
terraform-google-modules · Jul 29, 2024 · 14e7ce1 · 14e7ce1
1 parent 4287d62
commit 14e7ce1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/project_cleanup/function_source/main.go b/modules/project_cleanup/function_source/main.go
@@ -626,7 +626,7 @@ func invoke(ctx context.Context) {
 
 	removeProjectClusters := func(projectId string) int {
 		logger.Printf("Try to remove clusters for [%s]", projectId)
-		reqLCR := &containerpb.ListClustersRequest{Parent: fmt.Sprintf("projects/%s/locations/*", projectId)}
+		reqLCR := &containerpb.ListClustersRequest{Parent: fmt.Sprintf("projects/%s/locations/-", projectId)}
 		listResponse, err := containerService.ListClusters(ctx, reqLCR)
 		if err != nil {
 			logger.Printf("Failed to list clusters for [%s], error [%s]", projectId, err.Error())
@@ -695,6 +695,7 @@ func invoke(ctx context.Context) {
 		logger.Printf("Try to remove project [%s]", projectId)
 		if clusters := removeProjectClusters(projectId); clusters != 0 {
 			logger.Printf("Defer removing project [%s], %d clusters marked for deletion", projectId, clusters)
+			return
 		}
 		err := removeProjectById(projectId)
 		if err != nil {