applied suggestions

Author: orangecola

docs/resources/fleet_integration_policy.md

@@ -97,7 +97,7 @@ resource "elasticstack_fleet_integration_policy" "sample" {
 
 ### Optional
 
-- `agent_policy_id` (String, Deprecated) ID of the agent policy.
+- `agent_policy_id` (String) ID of the agent policy.
 - `agent_policy_ids` (List of String) List of agent policy IDs.
 - `description` (String) The description of the integration policy.
 - `enabled` (Boolean) Enable the integration policy.

internal/fleet/integration_policy/models.go

@@ -2,6 +2,7 @@ package integration_policy
 
 import (
 	"context"
+	"fmt"
 	"sort"
 
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
@@ -53,30 +54,32 @@ func (model *integrationPolicyModel) populateFromAPI(ctx context.Context, data *
 
 	// Only populate the agent policy field that was originally configured
 	// to avoid Terraform detecting inconsistent state
-	originallyUsedAgentPolicyID := !model.AgentPolicyID.IsNull() && !model.AgentPolicyID.IsUnknown()
-	originallyUsedAgentPolicyIDs := !model.AgentPolicyIDs.IsNull() && !model.AgentPolicyIDs.IsUnknown()
 
-	if originallyUsedAgentPolicyID && !originallyUsedAgentPolicyIDs {
-		// Only set agent_policy_id if it was originally used
+	originallyUsedAgentPolicyID := utils.IsKnown(model.AgentPolicyID)
+	originallyUsedAgentPolicyIDs := utils.IsKnown(model.AgentPolicyIDs)
+
+	if originallyUsedAgentPolicyID {
 		model.AgentPolicyID = types.StringPointerValue(data.PolicyId)
-	} else if originallyUsedAgentPolicyIDs && !originallyUsedAgentPolicyID {
-		// Only set agent_policy_ids if it was originally used
+	}
+	if originallyUsedAgentPolicyIDs {
 		if data.PolicyIds != nil {
 			agentPolicyIDs, d := types.ListValueFrom(ctx, types.StringType, *data.PolicyIds)
 			diags.Append(d...)
 			model.AgentPolicyIDs = agentPolicyIDs
 		} else {
 			model.AgentPolicyIDs = types.ListNull(types.StringType)
 		}
-	} else {
+	}
+
+	if !originallyUsedAgentPolicyID && !originallyUsedAgentPolicyIDs {
 		// Handle edge cases: both fields configured or neither configured
 		// Default to the behavior based on API response structure
 		if data.PolicyIds != nil && len(*data.PolicyIds) > 1 {
 			// Multiple policy IDs, use agent_policy_ids
 			agentPolicyIDs, d := types.ListValueFrom(ctx, types.StringType, *data.PolicyIds)
 			diags.Append(d...)
 			model.AgentPolicyIDs = agentPolicyIDs
-		} else {
+		} else if data.PolicyId != nil {
 			// Single policy ID, use agent_policy_id
 			model.AgentPolicyID = types.StringPointerValue(data.PolicyId)
 		}
@@ -120,6 +123,19 @@ func (model *integrationPolicyModel) populateInputFromAPI(ctx context.Context, i
 func (model integrationPolicyModel) toAPIModel(ctx context.Context, isUpdate bool, feat features) (kbapi.PackagePolicyRequest, diag.Diagnostics) {
 	var diags diag.Diagnostics
 
+	// Check if agent_policy_ids is configured and version supports it
+	if utils.IsKnown(model.AgentPolicyIDs) {
+		if !feat.SupportsPolicyIds {
+			return kbapi.PackagePolicyRequest{}, diag.Diagnostics{
+				diag.NewAttributeErrorDiagnostic(
+					path.Root("agent_policy_ids"),
+					"Unsupported Elasticsearch version",
+					fmt.Sprintf("Agent policy IDs are only supported in Elastic Stack %s and above", MinVersionPolicyIds),
+				),
+			}
+		}
+	}
+
 	body := kbapi.PackagePolicyRequest{
 		Description: model.Description.ValueStringPointer(),
 		Force:       model.Force.ValueBoolPointer(),

internal/fleet/integration_policy/schema.go

@@ -5,12 +5,16 @@ import (
 	_ "embed"
 
 	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
+	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
+	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"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/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/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
@@ -51,14 +55,20 @@ func getSchemaV1() schema.Schema {
 				Required:    true,
 			},
 			"agent_policy_id": schema.StringAttribute{
-				Description:        "ID of the agent policy.",
-				DeprecationMessage: "Use agent_policy_ids instead. This field will be removed in a future version.",
-				Optional:           true,
+				Description: "ID of the agent policy.",
+				Optional:    true,
+				Validators: []validator.String{
+					stringvalidator.ConflictsWith(path.Root("agent_policy_ids").Expression()),
+				},
 			},
 			"agent_policy_ids": schema.ListAttribute{
 				Description: "List of agent policy IDs.",
 				ElementType: types.StringType,
 				Optional:    true,
+				Validators: []validator.List{
+					listvalidator.ConflictsWith(path.Root("agent_policy_ids").Expression()),
+					listvalidator.SizeAtLeast(1),
+				},
 			},
 			"description": schema.StringAttribute{
 				Description: "The description of the integration policy.",