prep sync

Author: Zyther

CHANGELOG.md

@@ -5,7 +5,6 @@
 - Add missing entries to `data_view.field_formats.params` ([#1001](https://github.com/elastic/terraform-provider-elasticstack/pull/1001))
 - Fix namespaces inconsistency when creating elasticstack_kibana_data_view resources ([#1011](https://github.com/elastic/terraform-provider-elasticstack/pull/1011))
 - Update rule ID documentation. ([#1047](https://github.com/elastic/terraform-provider-elasticstack/pull/1047))
-- Add `global_data_tags` to fleet agent policies. ([#1044](https://github.com/elastic/terraform-provider-elasticstack/pull/1044))
 
 ## [0.11.13] - 2025-01-09
 

internal/fleet/agent_policy/resource_test.go

@@ -164,8 +164,8 @@ func TestAccResourceAgentPolicy(t *testing.T) {
 			},
 			{
 				SkipFunc:    versionutils.CheckIfVersionIsUnsupported(minVersionGlobalDataTags),
-				Config:      testAccResourceAgentPolicyUpdateWithBadGlobalDataTags(policyNameGlobalDataTags, false),
-				ExpectError: regexp.MustCompile("conflicts with"),
+				Config:      testAccResourceAgentPolicyUpdateWithBadGlobalDataTags(policyNameGlobalDataTags, true),
+				ExpectError: regexp.MustCompile(".*Error: Invalid Attribute Combination.*"),
 			},
 		},
 	})

internal/fleet/agent_policy/schema.go

@@ -100,14 +100,14 @@ func getSchema() schema.Schema {
 							Description: "String value for the field. If this is set, number_value must not be defined.",
 							Optional:    true,
 							Validators: []validator.String{
-								stringvalidator.ConflictsWith(path.MatchRelative().AtName("number_value")),
+								stringvalidator.ConflictsWith(path.MatchRelative().AtParent().AtName("number_value")),
 							},
 						},
 						"number_value": schema.Float32Attribute{
 							Description: "Number value for the field. If this is set, string_value must not be defined.",
 							Optional:    true,
 							Validators: []validator.Float32{
-								float32validator.ConflictsWith(path.MatchRelative().AtName("string_value")),
+								float32validator.ConflictsWith(path.MatchRelative().AtParent().AtName("string_value")),
 							},
 						},
 					},