refactor: update list_fiter and user_rules resources to use state for…

… unknown value (#21)
gmichels · Mar 27, 2023 · 68882bf · 68882bf
1 parent b51438a
commit 68882bf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/adguard/list_filter_resource.go b/adguard/list_filter_resource.go
@@ -9,6 +9,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
@@ -64,6 +66,9 @@ func (r *listFilterResource) Schema(_ context.Context, _ resource.SchemaRequest,
 			"id": schema.StringAttribute{
 				Description: "Identifier attribute",
 				Computed:    true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.UseStateForUnknown(),
+				},
 			},
 			"rules_count": schema.Int64Attribute{
 				Description: "Number of rules in the list filter",
@@ -223,20 +228,12 @@ func (r *listFilterResource) Update(ctx context.Context, req resource.UpdateRequ
 		return
 	}
 
-	// retrieve current state as we need the id
-	var state listFilterResourceModel
-	diags = req.State.Get(ctx, &state)
-	resp.Diagnostics.Append(diags...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-
 	// convert id to int64
-	id, err := strconv.ParseInt(state.ID.ValueString(), 10, 64)
+	id, err := strconv.ParseInt(plan.ID.ValueString(), 10, 64)
 	if err != nil {
 		resp.Diagnostics.AddError(
 			"Error Reading AdGuard Home List Filter",
-			"Could not read list filter with id "+state.ID.ValueString()+": "+err.Error(),
+			"Could not read list filter with id "+plan.ID.ValueString()+": "+err.Error(),
 		)
 		return
 	}
@@ -272,7 +269,6 @@ func (r *listFilterResource) Update(ctx context.Context, req resource.UpdateRequ
 	}
 
 	// update plan with computed attributes
-	plan.ID = state.ID
 	plan.LastUpdated = types.StringValue(updatedlistFilter.LastUpdated)
 	plan.RulesCount = types.Int64Value(int64(updatedlistFilter.RulesCount))
 

diff --git a/adguard/user_rules_resource.go b/adguard/user_rules_resource.go
@@ -8,6 +8,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
@@ -47,6 +49,9 @@ func (r *userRulesResource) Schema(_ context.Context, _ resource.SchemaRequest,
 			"id": schema.StringAttribute{
 				Description: "Identifier attribute",
 				Computed:    true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.UseStateForUnknown(),
+				},
 			},
 			"rules": schema.ListAttribute{
 				Description: "List of user rules",
@@ -160,14 +165,6 @@ func (r *userRulesResource) Update(ctx context.Context, req resource.UpdateReque
 		return
 	}
 
-	// retrieve current state as we need the id
-	var state userRulesResourceModel
-	diags = req.State.Get(ctx, &state)
-	resp.Diagnostics.Append(diags...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-
 	// instantiate empty client for storing plan data
 	var userRules adguard.SetRulesRequest
 
@@ -191,7 +188,6 @@ func (r *userRulesResource) Update(ctx context.Context, req resource.UpdateReque
 	}
 
 	// populate plan with computed attributes
-	plan.ID = state.ID
 	plan.LastUpdated = types.StringValue(time.Now().Format(time.RFC850))
 
 	// update state