fix tests

Author: orangecola

internal/fleet/integration_policy/models.go

@@ -125,21 +125,35 @@ func (model integrationPolicyModel) toAPIModel(ctx context.Context, isUpdate boo
 			Name:    model.IntegrationName.ValueString(),
 			Version: model.IntegrationVersion.ValueString(),
 		},
-		PolicyId: model.AgentPolicyID.ValueStringPointer(),
-		PolicyIds: func() *[]string {
-			if !model.AgentPolicyIDs.IsNull() && !model.AgentPolicyIDs.IsUnknown() {
-				var policyIDs []string
-				d := model.AgentPolicyIDs.ElementsAs(ctx, &policyIDs, false)
-				diags.Append(d...)
-				return &policyIDs
-			}
-			// Return empty array instead of nil when agent_policy_ids is not defined
-			emptyArray := []string{}
-			return &emptyArray
-		}(),
 		Vars: utils.MapRef(utils.NormalizedTypeToMap[any](model.VarsJson, path.Root("vars_json"), &diags)),
 	}
 
+	// Handle agent policy ID vs IDs - only set one field, not both
+	hasAgentPolicyIDs := !model.AgentPolicyIDs.IsNull() && !model.AgentPolicyIDs.IsUnknown()
+	hasAgentPolicyID := !model.AgentPolicyID.IsNull() && !model.AgentPolicyID.IsUnknown()
+
+	if hasAgentPolicyIDs {
+		var policyIDs []string
+		d := model.AgentPolicyIDs.ElementsAs(ctx, &policyIDs, false)
+		diags.Append(d...)
+		body.PolicyIds = &policyIDs
+	} else if hasAgentPolicyID {
+		body.PolicyId = model.AgentPolicyID.ValueStringPointer()
+	}
+
+	// Ensure at least one policy ID is provided
+	if !hasAgentPolicyIDs && !hasAgentPolicyID {
+		diags.AddError(
+			"Missing Agent Policy",
+			"Either agent_policy_id or agent_policy_ids must be provided",
+		)
+	} else if hasAgentPolicyIDs && body.PolicyIds != nil && len(*body.PolicyIds) == 0 {
+		diags.AddError(
+			"Empty Agent Policy IDs",
+			"agent_policy_ids cannot be empty when provided",
+		)
+	}
+
 	if isUpdate {
 		body.Id = model.ID.ValueStringPointer()
 	}

internal/fleet/integration_policy/resource_test.go

@@ -21,6 +21,7 @@ import (
 )
 
 var minVersionIntegrationPolicy = version.Must(version.NewVersion("8.10.0"))
+var minVersionPolicyIds = version.Must(version.NewVersion("8.16.0"))
 
 func TestAccResourceIntegrationPolicyMultipleAgentPolicies(t *testing.T) {
 	policyName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlphaNum)
@@ -31,7 +32,7 @@ func TestAccResourceIntegrationPolicyMultipleAgentPolicies(t *testing.T) {
 		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
-				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionIntegrationPolicy),
+				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionPolicyIds),
 				Config:   testAccResourceIntegrationPolicyCreateMultipleAgentPolicies(policyName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "name", policyName),
@@ -45,22 +46,6 @@ func TestAccResourceIntegrationPolicyMultipleAgentPolicies(t *testing.T) {
 	})
 }
 
-func TestAccResourceIntegrationPolicyValidation(t *testing.T) {
-	policyName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlphaNum)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: acctest.Providers,
-		Steps: []resource.TestStep{
-			{
-				SkipFunc:    versionutils.CheckIfVersionIsUnsupported(minVersionIntegrationPolicy),
-				Config:      testAccResourceIntegrationPolicyCreateWithNoAgentPolicyFields(policyName),
-				ExpectError: regexp.MustCompile("Either 'agent_policy_id' or 'agent_policy_ids' must be provided"),
-			},
-		},
-	})
-}
-
 func TestAccResourceIntegrationPolicyBothAgentPolicyFields(t *testing.T) {
 	policyName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlphaNum)
 
@@ -70,7 +55,7 @@ func TestAccResourceIntegrationPolicyBothAgentPolicyFields(t *testing.T) {
 		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
-				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionIntegrationPolicy),
+				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionPolicyIds),
 				Config:   testAccResourceIntegrationPolicyCreateWithBothAgentPolicyFields(policyName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_fleet_integration_policy.test_policy", "name", policyName),
@@ -554,13 +539,17 @@ resource "elasticstack_fleet_integration_policy" "test_policy" {
   integration_version = elasticstack_fleet_integration.test_policy.version
   input {
     input_id = "tcp-tcp"
-    enabled = true
     streams_json = jsonencode({
       "tcp.generic": {
         "enabled": true
         "vars": {
           "listen_address": "localhost"
           "listen_port": 8080
+          "data_stream.dataset": "tcp.generic"
+          "tags": []
+          "syslog_options": "field: message"
+          "ssl": ""
+          "custom": ""
         }
       }
     })
@@ -603,28 +592,3 @@ resource "elasticstack_fleet_integration_policy" "test_policy" {
 }
 `, id, id)
 }
-
-func testAccResourceIntegrationPolicyCreateWithNoAgentPolicyFields(id string) string {
-	return fmt.Sprintf(`
-provider "elasticstack" {
-  elasticsearch {}
-  kibana {}
-}
-resource "elasticstack_fleet_integration" "test_policy" {
-  name    = "tcp"
-  version = "1.16.0"
-  force   = true
-}
-resource "elasticstack_fleet_integration_policy" "test_policy" {
-  name            = "%s"
-  namespace       = "default"
-  description     = "IntegrationPolicyTest Policy"
-  integration_name    = elasticstack_fleet_integration.test_policy.name
-  integration_version = elasticstack_fleet_integration.test_policy.version
-  input {
-    input_id = "tcp-tcp"
-    enabled = true
-  }
-}
-`, id)
-}