get actions from plan / state and set them on rules after read

Author: hanneshayashi

internal/provider/allocation_group.go

@@ -16,6 +16,25 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
+func (plan *allocationGroupResourceModel) getActions(ctx context.Context) (actions map[string]string, d diag.Diagnostics) {
+	actions = make(map[string]string)
+	var diags diag.Diagnostics
+	if !plan.Rules.IsNull() {
+		planRules := []resource_allocation_group.RulesValue{}
+		diags = plan.Rules.ElementsAs(ctx, &planRules, false)
+		d.Append(diags...)
+		if d.HasError() {
+			return
+		}
+		for i := range planRules {
+			if !planRules[i].Id.IsNull() {
+				actions[planRules[i].Id.ValueString()] = planRules[i].Action.ValueString()
+			}
+		}
+	}
+	return
+}
+
 func (plan *allocationGroupResourceModel) toRequest(ctx context.Context) (groupAllocationRequest models.GroupAllocationRequest, d diag.Diagnostics) {
 	var diags diag.Diagnostics
 	groupAllocationRequest.UnallocatedCosts = plan.UnallocatedCosts.ValueStringPointer()
@@ -67,7 +86,7 @@ func (plan *allocationGroupResourceModel) toRequest(ctx context.Context) (groupA
 	return groupAllocationRequest, d
 }
 
-func (state *allocationGroupResourceModel) populate(groupAllocation *models.GroupAllocation, client *ClientTest, ctx context.Context) (d diag.Diagnostics) {
+func (state *allocationGroupResourceModel) populate(groupAllocation *models.GroupAllocation, client *ClientTest, actions map[string]string, ctx context.Context) (d diag.Diagnostics) {
 	var diags diag.Diagnostics
 	state.Description = types.StringPointerValue(groupAllocation.Description)
 	state.Id = types.StringPointerValue(groupAllocation.Id)
@@ -89,7 +108,17 @@ func (state *allocationGroupResourceModel) populate(groupAllocation *models.Grou
 				Owner:      types.StringPointerValue(rule.Owner),
 				RulesType:  types.StringPointerValue(rule.Type),
 				UpdateTime: types.Int64PointerValue(rule.UpdateTime),
+				// Doesn't exist on the AllocationListItem data model
+				// AllocationType: types.StringPointerValue(string(rule.AllocationType)),
+				// Description:    types.StringPointerValue(rule.Description),
+				// UrlUi:          types.StringPointerValue(rule.UrlUi),
 			}
+			if rule.Id != nil {
+				stateRule.Action = types.StringValue(actions[*rule.Id])
+			} else {
+				stateRule.Action = types.StringValue("create")
+			}
+
 			var singleAllocation *models.SingleAllocation
 			singleAllocation, err := client.GetAllocation(stateRule.Id.ValueString())
 			if err != nil {
@@ -99,6 +128,9 @@ func (state *allocationGroupResourceModel) populate(groupAllocation *models.Grou
 				)
 				return
 			}
+			// This is an ugly hack because we have two different version of the ComponentsValue / ComponentsType and we need to convert between them
+			// This would not be necessary if we could unify resource_allocation and resource_allocation_group but the generator cannot be used with the
+			// "full" OpenAPI spec, so we have to split it
 			singleAllocationState := allocationResourceModel{}
 			diags = singleAllocationState.populate(singleAllocation, ctx)
 			d.Append(diags...)
@@ -138,7 +170,7 @@ func (state *allocationGroupResourceModel) populate(groupAllocation *models.Grou
 			}
 
 			stateRules[i], diags = resource_allocation_group.NewRulesValue(stateRule.AttributeTypes(ctx), map[string]attr.Value{
-				"action":          types.StringValue("select"),
+				"action":          stateRule.Action,
 				"allocation_type": stateRule.AllocationType,
 				"components":      stateRule.Components,
 				"create_time":     stateRule.CreateTime,

internal/provider/allocation_group_resource.go

@@ -64,6 +64,13 @@ func (r *allocationGroupResource) Create(ctx context.Context, req resource.Creat
 		return
 	}
 
+	// get actions from plan
+	actions, diags := plan.getActions(ctx)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	// Generate API request body from plan
 	allocationGroup, diags := plan.toRequest(ctx)
 	resp.Diagnostics.Append(diags...)
@@ -95,7 +102,7 @@ func (r *allocationGroupResource) Create(ctx context.Context, req resource.Creat
 		return
 	}
 	plan.Id = types.StringPointerValue(allocationgroupResponse.Id)
-	plan.populate(allocationCreated, r.client, ctx)
+	plan.populate(allocationCreated, r.client, actions, ctx)
 
 	// Set state to fully populated data
 	diags = resp.State.Set(ctx, plan)
@@ -118,6 +125,13 @@ func (r *allocationGroupResource) Read(ctx context.Context, req resource.ReadReq
 	log.Print("state id:::::::::::::::::::::::::")
 	log.Print(state.Id.ValueString())
 
+	// get actions from state
+	actions, diags := state.getActions(ctx)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	// Get refreshed allocation value from DoiT
 	allocation, err := r.client.GetAllocationGroup(state.Id.ValueString())
 	if err != nil {
@@ -131,7 +145,7 @@ func (r *allocationGroupResource) Read(ctx context.Context, req resource.ReadReq
 		)
 		return
 	}
-	diags = state.populate(allocation, r.client, ctx)
+	diags = state.populate(allocation, r.client, actions, ctx)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -155,6 +169,13 @@ func (r *allocationGroupResource) Update(ctx context.Context, req resource.Updat
 		return
 	}
 
+	// get actions from plan
+	actions, diags := plan.getActions(ctx)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	var state allocationGroupResourceModel
 	diags = req.State.Get(ctx, &state)
 	resp.Diagnostics.Append(diags...)
@@ -190,7 +211,7 @@ func (r *allocationGroupResource) Update(ctx context.Context, req resource.Updat
 		return
 	}
 	fmt.Println("Rules length", len(*allocationResponse.Rules))
-	diags = state.populate(allocationResponse, r.client, ctx)
+	diags = state.populate(allocationResponse, r.client, actions, ctx)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return