[datadog_synthetics_test] support elementsOperator in JSONPath assertions

datadog/resource_datadog_synthetics_test_.go

@@ -507,6 +507,12 @@ func syntheticsAPIAssertion() *schema.Schema {
 					MaxItems:    1,
 					Elem: &schema.Resource{
 						Schema: map[string]*schema.Schema{
+							"elementsoperator": {
+								Description: "The element from the list of results to assert on. Select from `firstElementMatches` (the first element in the list), `everyElementMatches` (every element in the list), `atLeastOneElementMatches` (at least one element in the list), or `serializationMatches` (the serialized value of the list). Defaults to `firstElementMatches`.",
+								Type:        schema.TypeString,
+								Optional:    true,
+								Default:     "firstElementMatches",
+							},
 							"operator": {
 								Description: "The specific operator to use on the path.",
 								Type:        schema.TypeString,
@@ -1983,6 +1989,9 @@ func buildAssertions(attr []interface{}) []datadogV1.SyntheticsAssertion {
 								subTarget.SetTargetValue(v)
 							}
 						}
+						if v, ok := targetMap["elementsoperator"]; ok {
+							subTarget.SetElementsOperator(v.(string))
+						}
 						assertionJSONPathTarget.SetTarget(*subTarget)
 					}
 					if _, ok := assertionMap["target"]; ok {
@@ -2622,6 +2631,9 @@ func buildLocalAssertions(actualAssertions []datadogV1.SyntheticsAssertion) (loc
 						return localAssertions, fmt.Errorf("unrecognized targetvalue type %v", v)
 					}
 				}
+				if v, ok := target.GetElementsOperatorOk(); ok {
+					localTarget["elementsoperator"] = string(*v)
+				}
 				localAssertion["targetjsonpath"] = []map[string]string{localTarget}
 			}
 			if v, ok := assertionTarget.GetTypeOk(); ok {

datadog/tests/cassettes/TestAccDatadogSyntheticsAPITest_BasicNewAssertionsOptions.freeze

@@ -1 +1 @@
-2024-06-13T11:40:00.03983+02:00
+2024-06-17T17:47:29.27811+02:00

datadog/tests/cassettes/TestAccDatadogSyntheticsAPITest_UpdatedNewAssertionsOptions.freeze

@@ -1 +1 @@
-2024-06-13T11:48:41.904633+02:00
+2024-06-17T16:29:49.250133+02:00

datadog/tests/resource_datadog_synthetics_test_test.go

@@ -1762,6 +1762,8 @@ func updateSyntheticsAPITestStepNewAssertionsOptions(ctx context.Context, accPro
 				"datadog_synthetics_test.bar", "assertion.0.targetjsonpath.0.operator", "isNot"),
 			resource.TestCheckResourceAttr(
 				"datadog_synthetics_test.bar", "assertion.0.targetjsonpath.0.targetvalue", "0"),
+			resource.TestCheckResourceAttr(
+				"datadog_synthetics_test.bar", "assertion.0.targetjsonpath.0.elementsoperator", "everyElementMatches"),
 			resource.TestCheckResourceAttr(
 				"datadog_synthetics_test.bar", "locations.#", "1"),
 			resource.TestCheckResourceAttr(
@@ -1836,6 +1838,7 @@ resource "datadog_synthetics_test" "bar" {
 		type = "body"
 		operator = "validatesJSONPath"
 		targetjsonpath {
+			elementsoperator = "everyElementMatches"
 			operator = "isNot"
 			targetvalue = "0"
 			jsonpath = "topKey"

docs/resources/synthetics_test.md

@@ -497,6 +497,7 @@ Required:
 
 Optional:
 
+- `elementsoperator` (String) The element from the list of results to assert on. Select from `firstElementMatches` (the first element in the list), `everyElementMatches` (every element in the list), `atLeastOneElementMatches` (at least one element in the list), or `serializationMatches` (the serialized value of the list). Defaults to `firstElementMatches`. Defaults to `"firstElementMatches"`.
 - `targetvalue` (String) Expected matching value.
 
 
@@ -707,6 +708,7 @@ Required:
 
 Optional:
 
+- `elementsoperator` (String) The element from the list of results to assert on. Select from `firstElementMatches` (the first element in the list), `everyElementMatches` (every element in the list), `atLeastOneElementMatches` (at least one element in the list), or `serializationMatches` (the serialized value of the list). Defaults to `firstElementMatches`. Defaults to `"firstElementMatches"`.
 - `targetvalue` (String) Expected matching value.
 
 

go.mod

@@ -1,7 +1,7 @@
 module github.com/terraform-providers/terraform-provider-datadog
 
 require (
-	github.com/DataDog/datadog-api-client-go/v2 v2.26.1-0.20240610185644-7125535457c2
+	github.com/DataDog/datadog-api-client-go/v2 v2.26.1-0.20240614210232-cc3cd19ea44f
 	github.com/DataDog/dd-sdk-go-testing v0.0.0-20211116174033-1cd082e322ad
 	github.com/google/uuid v1.5.0
 	github.com/hashicorp/go-cleanhttp v0.5.2

go.sum

@@ -1,7 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DataDog/datadog-api-client-go/v2 v2.26.1-0.20240610185644-7125535457c2 h1:MiYvP649Bbpd9sr2KWhgcRqA45erNJAHHh4smfDobos=
-github.com/DataDog/datadog-api-client-go/v2 v2.26.1-0.20240610185644-7125535457c2/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc=
+github.com/DataDog/datadog-api-client-go/v2 v2.26.1-0.20240614210232-cc3cd19ea44f h1:GClzSWYeKzzzqyWHGKW5qYcXfdVSyq4K/YKNyDJe4F0=
+github.com/DataDog/datadog-api-client-go/v2 v2.26.1-0.20240614210232-cc3cd19ea44f/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc=
 github.com/DataDog/datadog-go v4.4.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q=
 github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=