Fixed removing env

Author: Dray56

internal/provider/fixtures/resource_app_bits.yaml

@@ -434,7 +434,11 @@ func (r *appResource) Update(ctx context.Context, req resource.UpdateRequest, re
 	r.upsert(ctx, &req.Plan, &req.State, &resp.State, &resp.Diagnostics)
 }
 func (r *appResource) upsert(ctx context.Context, reqPlan *tfsdk.Plan, reqState *tfsdk.State, respState *tfsdk.State, respDiags *diag.Diagnostics) {
-	var desiredState, previousState AppType
+	var (
+		desiredState, previousState AppType
+		envs                        map[string]*string
+	)
+	envs = make(map[string]*string)
 	diags := reqPlan.Get(ctx, &desiredState)
 	respDiags.Append(diags...)
 	if respDiags.HasError() {
@@ -452,20 +456,23 @@ func (r *appResource) upsert(ctx context.Context, reqPlan *tfsdk.Plan, reqState
 	if reqState != nil {
 		diags = reqState.Get(ctx, &previousState)
 		respDiags.Append(diags...)
-		if respDiags.HasError() {
-			return
-		}
 		appManifestValue.Metadata, diags = setClientMetadataForUpdate(ctx, previousState.Labels, previousState.Annotations, desiredState.Labels, desiredState.Annotations)
 		respDiags.Append(diags...)
-		if respDiags.HasError() {
-			return
-		}
+		envs, diags = setEnvForUpdate(ctx, previousState.Environment, desiredState.Environment)
+		respDiags.Append(diags...)
 	}
 	appResp, err := r.push(desiredState, appManifestValue, ctx)
 	if err != nil {
 		respDiags.AddError("Error pushing app", err.Error())
 		return
 	}
+
+	_, err = r.cfClient.Applications.SetEnvironmentVariables(ctx, appResp.GUID, envs)
+	if err != nil {
+		respDiags.AddError("Error setting environment variables", err.Error())
+		return
+	}
+
 	manifestRespRaw, err := r.cfClient.Manifests.Generate(ctx, appResp.GUID)
 	if err != nil {
 		respDiags.AddError("Error generating manifest", err.Error())

internal/provider/fixtures/resource_app_bits_update.yaml

@@ -15,6 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 )
 
 // Type AppType representing Schema Attribute from function Schema in go type from resource_appManifest.go file.
@@ -692,3 +693,27 @@ func splitValueAndUnit(value string) (float64, string, error) {
 	}
 	return val, unit, nil
 }
+
+// Prepares the env for cfclient updation from existing and planned tfstate envs.
+func setEnvForUpdate(ctx context.Context, existingEnvs basetypes.MapValue, plannedEnvs basetypes.MapValue) (map[string]*string, diag.Diagnostics) {
+
+	var (
+		diagnostics                 diag.Diagnostics
+		oldEnvs, newEnvs, finalEnvs map[string]*string
+	)
+
+	finalEnvs = make(map[string]*string)
+
+	diagnostics.Append(existingEnvs.ElementsAs(ctx, &oldEnvs, false)...)
+	diagnostics.Append(plannedEnvs.ElementsAs(ctx, &newEnvs, false)...)
+
+	for key := range oldEnvs {
+		finalEnvs[key] = nil
+	}
+
+	for key, value := range newEnvs {
+		finalEnvs[key] = value
+	}
+
+	return finalEnvs, diagnostics
+}