Merge pull request #234 from Bhuvisha03/bugfix/227-Destroy-spaceQuota

fix : Space quota resource destruction bug fix

Author: vipinvkmenon

docs/resources/space_quota.md

@@ -2,12 +2,12 @@
 page_title: "cloudfoundry_space_quota Resource - terraform-provider-cloudfoundry"
 subcategory: ""
 description: |-
-  Provides a Cloud Foundry resource to manage space quota definitions.
+  Provides a Cloud Foundry resource to manage space quota definitions. Only spaces assigned via Terraform are managed. On deletion, Terraform removes these assignments before deleting the quota. Non-Terraform managed assignments are not removed, which may cause deletion to fail.
 ---
 
 # cloudfoundry_space_quota (Resource)
 
-Provides a Cloud Foundry resource to manage space quota definitions.
+Provides a Cloud Foundry resource to manage space quota definitions. Only spaces assigned via Terraform are managed. On deletion, Terraform removes these assignments before deleting the quota. Non-Terraform managed assignments are not removed, which may cause deletion to fail.
 
 ## Example Usage
 

internal/provider/resource_security_group_space_bindings.go

@@ -248,9 +248,6 @@ func (rs *SecurityGroupSpacesResource) Update(ctx context.Context, req resource.
 	diags = plan.mapSecurityGroupSpacesValuestoType(ctx, runningSpaces, stagingSpaces)
 	resp.Diagnostics.Append(diags...)
 
-	diags = plan.mapSecurityGroupSpacesValuestoType(ctx, runningSpaces, stagingSpaces)
-	resp.Diagnostics.Append(diags...)
-
 	tflog.Trace(ctx, "updated a security group spaces resource")
 	resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...)
 }

internal/provider/resource_space_quota.go

@@ -38,7 +38,7 @@ func (r *spaceQuotaResource) Metadata(_ context.Context, req resource.MetadataRe
 
 func (r *spaceQuotaResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
 	resp.Schema = schema.Schema{
-		MarkdownDescription: "Provides a Cloud Foundry resource to manage space quota definitions.",
+		MarkdownDescription: "Provides a Cloud Foundry resource to manage space quota definitions. Only spaces assigned via Terraform are managed. On deletion, Terraform removes these assignments before deleting the quota. Non-Terraform managed assignments are not removed, which may cause deletion to fail.",
 		Attributes: map[string]schema.Attribute{
 			"name": schema.StringAttribute{
 				MarkdownDescription: "The name you use to identify the quota or plan in Cloud Foundry",
@@ -191,6 +191,9 @@ func (r *spaceQuotaResource) Read(ctx context.Context, req resource.ReadRequest,
 	if resp.Diagnostics.HasError() {
 		return
 	}
+	diags = spacesQuotaType.mapSpaceQuotaAssignmentValuestoType(ctx, spaceQuotaTypeState.Spaces)
+	resp.Diagnostics.Append(diags...)
+
 	diags = resp.State.Set(ctx, spacesQuotaType)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
@@ -252,6 +255,10 @@ func (r *spaceQuotaResource) Update(ctx context.Context, req resource.UpdateRequ
 	if resp.Diagnostics.HasError() {
 		return
 	}
+
+	diags = spacesQuotaType.mapSpaceQuotaAssignmentValuestoType(ctx, spaceQuotaTypePlan.Spaces)
+	resp.Diagnostics.Append(diags...)
+
 	diags = resp.State.Set(ctx, spacesQuotaType)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
@@ -266,6 +273,22 @@ func (r *spaceQuotaResource) Delete(ctx context.Context, req resource.DeleteRequ
 	if resp.Diagnostics.HasError() {
 		return
 	}
+
+	// Iterate through all Terraform-managed spaces that are currently assigned to this space quota
+	var assignedSpaces []string
+	diags = spaceQuotaType.Spaces.ElementsAs(ctx, &assignedSpaces, false)
+	resp.Diagnostics.Append(diags...)
+
+	for _, spaceId := range assignedSpaces {
+		err := r.cfClient.SpaceQuotas.Remove(ctx, spaceQuotaType.ID.ValueString(), spaceId)
+		if err != nil {
+			resp.Diagnostics.AddError(
+				"Unable to remove space quota from the space ",
+				fmt.Sprintf("Request failed with %s", err.Error()),
+			)
+			return
+		}
+	}
 	jobID, err := r.cfClient.SpaceQuotas.Delete(ctx, spaceQuotaType.ID.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(

internal/provider/types_space_quota.go

@@ -7,6 +7,7 @@ import (
 	cfv3resource "github.com/cloudfoundry/go-cfclient/v3/resource"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/samber/lo"
 )
 
 type spaceQuotaType struct {
@@ -130,3 +131,22 @@ func mapSpaceQuotasValuesToType(spaceQuotas []*cfv3resource.SpaceQuota) ([]space
 
 	return spaceQuotasList, diagnostics
 }
+
+func (plan *spaceQuotaType) mapSpaceQuotaAssignmentValuestoType(ctx context.Context, stateSpacesSet types.Set) diag.Diagnostics {
+	var diags, diagnostics diag.Diagnostics
+	var liveSpaces, stateSpaces []string
+	diags = plan.Spaces.ElementsAs(ctx, &liveSpaces, false)
+	diagnostics.Append(diags...)
+	diags = stateSpacesSet.ElementsAs(ctx, &stateSpaces, false)
+	diagnostics.Append(diags...)
+
+	terraformHandledSpaces := lo.Intersect(liveSpaces, stateSpaces)
+
+	if len(terraformHandledSpaces) == 0 {
+		plan.Spaces = types.SetNull(types.StringType)
+	} else {
+		plan.Spaces, diags = types.SetValueFrom(ctx, types.StringType, terraformHandledSpaces)
+		diagnostics.Append(diags...)
+	}
+	return diagnostics
+}