adds delete_recursive_allowed field in space and org ressources : (#528)

- to allow recursive deletion of spaces within an organization
 - to allow recursive deletion of apps, routes and service instances
   within a space

update orgs and spaces deletion with api v3

Co-authored-by: Gilles Miraillet <Gmllt>

Author: clementdqn

cloudfoundry/managers/config.go

@@ -17,4 +17,5 @@ type Config struct {
 	DefaultQuotaName          string
 	StoreTokensPath           string
 	ForceNotFailBrokerCatalog bool
+	DeleteRecursiveAllowed    bool
 }

cloudfoundry/provider.go

@@ -94,6 +94,12 @@ func Provider() *schema.Provider {
 				DefaultFunc: schema.EnvDefaultFunc("CF_FORCE_BROKER_NOT_FAIL_CATALOG", false),
 				Description: "Set to true to not trigger fail on catalog on service broker",
 			},
+			"delete_recursive_allowed": &schema.Schema{
+				Type:        schema.TypeBool,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("CF_DELETE_RECURSIVE_ALLOWED", true),
+				Description: "Set to false to disallow recurive deletion",
+			},
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{
@@ -165,6 +171,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}
 		DefaultQuotaName:          d.Get("default_quota_name").(string),
 		StoreTokensPath:           d.Get("store_tokens_path").(string),
 		ForceNotFailBrokerCatalog: d.Get("force_broker_not_fail_when_catalog_not_accessible").(bool),
+		DeleteRecursiveAllowed:    d.Get("delete_recursive_allowed").(bool),
 	}
 	session, err := managers.NewSession(c)
 	return session, diag.FromErr(err)

cloudfoundry/resource_cf_org.go

@@ -1,8 +1,10 @@
 package cloudfoundry
 
 import (
-	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv2"
 	"context"
+
+	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv2"
+	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers"
@@ -62,6 +64,12 @@ func resourceOrg() *schema.Resource {
 			},
 			labelsKey:      labelsSchema(),
 			annotationsKey: annotationsSchema(),
+			"delete_recursive_allowed": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Allow recursive deletion of spaces.",
+			},
 		},
 	}
 }
@@ -170,14 +178,19 @@ func resourceOrgUpdate(ctx context.Context, d *schema.ResourceData, meta interfa
 
 func resourceOrgDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	session := meta.(*managers.Session)
-	client := session.ClientV2
+	client := session.ClientV3
 
 	id := d.Id()
-	spaces, _, err := client.GetSpaces(ccv2.FilterByOrg(id))
-
+	spaces, _, _, err := session.ClientV3.GetSpaces(ccv3.Query{
+		Key:    ccv3.OrganizationGUIDFilter,
+		Values: []string{d.Id()},
+	})
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	if !session.Config.DeleteRecursiveAllowed && len(spaces) > 0 {
+		return diag.Errorf("Organization %s has %d spaces. Please delete them first or set delete_recursive_allowed to true", id, len(spaces))
+	}
 	for _, s := range spaces {
 		j, _, err := client.DeleteSpace(s.GUID)
 		if err != nil {

cloudfoundry/resource_cf_space.go

@@ -1,8 +1,10 @@
 package cloudfoundry
 
 import (
-	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv2"
 	"context"
+
+	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv2"
+	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -86,6 +88,12 @@ func resourceSpace() *schema.Resource {
 			},
 			labelsKey:      labelsSchema(),
 			annotationsKey: annotationsSchema(),
+			"delete_recursive_allowed": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Allow recursive deletion of apps, routes, service instances.",
+			},
 		},
 	}
 }
@@ -311,11 +319,48 @@ func resourceSpaceUpdate(ctx context.Context, d *schema.ResourceData, meta inter
 
 func resourceSpaceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	session := meta.(*managers.Session)
-	j, _, err := session.ClientV2.DeleteSpace(d.Id())
+
+	if !session.Config.DeleteRecursiveAllowed {
+		// Check for apps
+		apps, _, err := session.ClientV3.GetApplications(ccv3.Query{
+			Key:    ccv3.SpaceGUIDFilter,
+			Values: []string{d.Id()},
+		})
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		if len(apps) > 0 {
+			return diag.Errorf("Space %s has %d apps. Please delete them first or set delete_recursive_allowed to true", d.Id(), len(apps))
+		}
+		// Check routes
+		routes, _, err := session.ClientV3.GetRoutes(ccv3.Query{
+			Key:    ccv3.SpaceGUIDFilter,
+			Values: []string{d.Id()},
+		})
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		if len(routes) > 0 {
+			return diag.Errorf("Space %s has %d routes. Please delete them first or set delete_recursive_allowed to true", d.Id(), len(routes))
+		}
+		// Check service instances
+		serviceInstances, _, _, err := session.ClientV3.GetServiceInstances(ccv3.Query{
+			Key:    ccv3.SpaceGUIDFilter,
+			Values: []string{d.Id()},
+		})
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		if len(serviceInstances) > 0 {
+			return diag.Errorf("Space %s has %d service instances. Please delete them first or set delete_recursive_allowed to true", d.Id(), len(serviceInstances))
+		}
+	}
+
+	j, _, err := session.ClientV3.DeleteSpace(d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	_, err = session.ClientV2.PollJob(j)
+	_, err = session.ClientV3.PollJob(j)
 	if err != nil {
 		return diag.FromErr(err)
 	}

docs/resources/org.md

@@ -34,6 +34,7 @@ The following arguments are supported:
   Works only on cloud foundry with api >= v3.63.
 * `annotations` - (Optional, map string of string) Add annotations as described [here](https://docs.cloudfoundry.org/adminguide/metadata.html#-view-metadata-for-an-object).
   Works only on cloud foundry with api >= v3.63.
+* `delete_recursive_allowed` - (Optional, bool) Allow recursive delete of spaces within the organization. Default: `true`.
 
 ## Attributes Reference
 

docs/resources/space.md

@@ -42,6 +42,7 @@ The following arguments are supported:
   Works only on cloud foundry with api >= v3.63.
 * `annotations` - (Optional, map string of string) Add annotations as described [here](https://docs.cloudfoundry.org/adminguide/metadata.html#-view-metadata-for-an-object).
   Works only on cloud foundry with api >= v3.63.
+* `delete_recursive_allowed` - (Optional, bool) Allow recursive delete of apps, routes and service instances within the space. Default: `true`.
 
 ## Attributes Reference