Refactor EnrichPolicy models to separate resource and data source types, fix test assertion

Co-authored-by: tobio <[email protected]>

Author: Copilot

internal/elasticsearch/enrich/acc_test.go

@@ -29,7 +29,7 @@ func TestAccResourceEnrichPolicyFW(t *testing.T) {
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_enrich_policy.policy", "indices.0", name),
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_enrich_policy.policy", "enrich_fields.0", "first_name"),
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_enrich_policy.policy", "enrich_fields.1", "last_name"),
-					resource.TestCheckResourceAttr("elasticstack_elasticsearch_enrich_policy.policy", "query", "{\"match_all\":{}}"),
+					resource.TestCheckResourceAttr("elasticstack_elasticsearch_enrich_policy.policy", "query", "{\"match_all\": {}}\n"),
 					resource.TestCheckResourceAttr("elasticstack_elasticsearch_enrich_policy.policy", "execute", "true"),
 				),
 			},

internal/elasticsearch/enrich/create.go

@@ -31,7 +31,7 @@ func (r *enrichPolicyResource) Update(ctx context.Context, req resource.UpdateRe
 }
 
 func (r *enrichPolicyResource) upsert(ctx context.Context, plan tfsdk.Plan, state *tfsdk.State) diag.Diagnostics {
-	var data EnrichPolicyData
+	var data EnrichPolicyDataWithExecute
 	var diags diag.Diagnostics
 	diags.Append(plan.Get(ctx, &data)...)
 	if diags.HasError() {

internal/elasticsearch/enrich/delete.go

@@ -10,7 +10,7 @@ import (
 )
 
 func (r *enrichPolicyResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
-	var data EnrichPolicyData
+	var data EnrichPolicyDataWithExecute
 	resp.Diagnostics.Append(req.State.Get(ctx, &data)...)
 	if resp.Diagnostics.HasError() {
 		return

internal/elasticsearch/enrich/models.go

@@ -20,7 +20,11 @@ type EnrichPolicyData struct {
 	MatchField              types.String         `tfsdk:"match_field"`
 	EnrichFields            types.List           `tfsdk:"enrich_fields"`
 	Query                   jsontypes.Normalized `tfsdk:"query"`
-	Execute                 types.Bool           `tfsdk:"execute"`
+}
+
+type EnrichPolicyDataWithExecute struct {
+	EnrichPolicyData
+	Execute types.Bool `tfsdk:"execute"`
 }
 
 // populateFromPolicy converts models.EnrichPolicy to EnrichPolicyData fields

internal/elasticsearch/enrich/read.go

@@ -12,7 +12,7 @@ import (
 )
 
 func (r *enrichPolicyResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
-	var data EnrichPolicyData
+	var data EnrichPolicyDataWithExecute
 	resp.Diagnostics.Append(req.State.Get(ctx, &data)...)
 	if resp.Diagnostics.HasError() {
 		return