synthetics/parameter: Remove duplicate code when rereading in create/update

Signed-off-by: Andrew Gunnerson <andrew.gunnerson@elastic.co>

Author: agunnerson-elastic

internal/kibana/synthetics/parameter/create.go

@@ -29,21 +29,8 @@ func (r *Resource) Create(ctx context.Context, request resource.CreateRequest, r
 		return
 	}
 
-	resourceId := result.Id
-
-	// We can't trust the response from the POST request. At least with Kibana
-	// 9.0.0, it responds without the `value` field set.
-	result, err = kibanaClient.KibanaSynthetics.Parameter.Get(ctx, resourceId)
-	if err != nil {
-		response.Diagnostics.AddError(fmt.Sprintf("Failed to get parameter after creation `%s`", resourceId), err.Error())
-		return
-	}
-
-	plan = toModelV0(*result)
-
-	diags = response.State.Set(ctx, plan)
-	response.Diagnostics.Append(diags...)
-	if response.Diagnostics.HasError() {
-		return
-	}
+	// We can't trust the response from the POST request, so read the parameter
+	// again. At least with Kibana 9.0.0, the POST request responds without the
+	// `value` field set.
+	r.readState(ctx, kibanaClient, toModelV0(*result), &response.State, &response.Diagnostics)
 }

internal/kibana/synthetics/parameter/read.go

@@ -5,29 +5,20 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/disaster37/go-kibana-rest/v8"
 	"github.com/disaster37/go-kibana-rest/v8/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/kibana/synthetics"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 )
 
-func (r *Resource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) {
-	kibanaClient := synthetics.GetKibanaClient(r, response.Diagnostics)
-	if kibanaClient == nil {
-		return
-	}
-
-	var state tfModelV0
-	diags := request.State.Get(ctx, &state)
-	response.Diagnostics.Append(diags...)
-	if response.Diagnostics.HasError() {
-		return
-	}
-
-	resourceId := state.ID.ValueString()
+func (r *Resource) readState(ctx context.Context, kibanaClient *kibana.Client, model tfModelV0, state *tfsdk.State, diagnostics *diag.Diagnostics) {
+	resourceId := model.ID.ValueString()
 
 	compositeId, dg := tryReadCompositeId(resourceId)
-	response.Diagnostics.Append(dg...)
-	if response.Diagnostics.HasError() {
+	diagnostics.Append(dg...)
+	if diagnostics.HasError() {
 		return
 	}
 
@@ -39,20 +30,36 @@ func (r *Resource) Read(ctx context.Context, request resource.ReadRequest, respo
 	if err != nil {
 		var apiError *kbapi.APIError
 		if errors.As(err, &apiError) && apiError.Code == 404 {
-			response.State.RemoveResource(ctx)
+			state.RemoveResource(ctx)
 			return
 		}
 
-		response.Diagnostics.AddError(fmt.Sprintf("Failed to get parameter `%s`", resourceId), err.Error())
+		diagnostics.AddError(fmt.Sprintf("Failed to get parameter `%s`", resourceId), err.Error())
 		return
 	}
 
-	state = toModelV0(*result)
+	model = toModelV0(*result)
 
 	// Set refreshed state
-	diags = response.State.Set(ctx, &state)
+	diags := state.Set(ctx, &model)
+	diagnostics.Append(diags...)
+	if diagnostics.HasError() {
+		return
+	}
+}
+
+func (r *Resource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) {
+	kibanaClient := synthetics.GetKibanaClient(r, response.Diagnostics)
+	if kibanaClient == nil {
+		return
+	}
+
+	var state tfModelV0
+	diags := request.State.Get(ctx, &state)
 	response.Diagnostics.Append(diags...)
 	if response.Diagnostics.HasError() {
 		return
 	}
+
+	r.readState(ctx, kibanaClient, state, &response.State, &response.Diagnostics)
 }

internal/kibana/synthetics/parameter/update.go

@@ -35,27 +35,14 @@ func (r *Resource) Update(ctx context.Context, request resource.UpdateRequest, r
 
 	input := state.toParameterConfig(true)
 
-	_, err := kibanaClient.KibanaSynthetics.Parameter.Update(ctx, resourceId, input)
+	result, err := kibanaClient.KibanaSynthetics.Parameter.Update(ctx, resourceId, input)
 	if err != nil {
 		response.Diagnostics.AddError(fmt.Sprintf("Failed to update parameter `%s`", resourceId), err.Error())
 		return
 	}
 
-	// We can't trust the response from the PUT request. At least with Kibana
-	// 9.0.0, it responds with the new values for every field, except `value`,
-	// which contains the old value.
-	result, err := kibanaClient.KibanaSynthetics.Parameter.Get(ctx, resourceId)
-	if err != nil {
-		response.Diagnostics.AddError(fmt.Sprintf("Failed to get parameter after update `%s`", resourceId), err.Error())
-		return
-	}
-
-	state = toModelV0(*result)
-
-	// Set refreshed state
-	diags = response.State.Set(ctx, &state)
-	response.Diagnostics.Append(diags...)
-	if response.Diagnostics.HasError() {
-		return
-	}
+	// We can't trust the response from the PUT request, so read the parameter
+	// again. At least with Kibana 9.0.0, the PUT request responds with the new
+	// values for every field, except `value`, which contains the old value.
+	r.readState(ctx, kibanaClient, toModelV0(*result), &response.State, &response.Diagnostics)
 }