From 4bdd3bf91042afbc1c6686f3500acea692d9e628 Mon Sep 17 00:00:00 2001 From: Rowan Seymour Date: Mon, 15 Jul 2024 11:29:59 -0500 Subject: [PATCH] Update to latest gocommon which changes contact ql conversion to ES --- contactql/es/query_test.go | 20 +- contactql/es/testdata/to_query.json | 744 +++++++++++++++++----------- contactql/es/testdata/to_sort.json | 24 +- go.mod | 24 +- go.sum | 48 +- 5 files changed, 527 insertions(+), 333 deletions(-) diff --git a/contactql/es/query_test.go b/contactql/es/query_test.go index eec2b9d88..f6a11723a 100644 --- a/contactql/es/query_test.go +++ b/contactql/es/query_test.go @@ -81,7 +81,7 @@ func TestElasticQuery(t *testing.T) { ny, _ := time.LoadLocation("America/New_York") - for _, tc := range tcs { + for i, tc := range tcs { testName := fmt.Sprintf("test '%s' for query '%s'", tc.Description, tc.Query) redactionPolicy := envs.RedactionPolicyNone @@ -99,6 +99,22 @@ func TestElasticQuery(t *testing.T) { asJSON, err := jsonx.Marshal(query) require.NoError(t, err) - test.AssertEqualJSON(t, tc.Elastic, asJSON, "elastic mismatch in %s", testName) + // clone test case and populate with actual values + actual := tc + actual.Elastic = asJSON + + if !test.UpdateSnapshots { + test.AssertEqualJSON(t, tc.Elastic, actual.Elastic, "elastic mismatch in %s", testName) + } else { + tcs[i] = actual + } + } + + if test.UpdateSnapshots { + actualJSON, err := jsonx.MarshalPretty(tcs) + require.NoError(t, err) + + err = os.WriteFile("testdata/to_query.json", actualJSON, 0666) + require.NoError(t, err) } } diff --git a/contactql/es/testdata/to_query.json b/contactql/es/testdata/to_query.json index 213ade9b5..a7ac3a1b1 100644 --- a/contactql/es/testdata/to_query.json +++ b/contactql/es/testdata/to_query.json @@ -10,7 +10,9 @@ "must": [ { "term": { - "fields.field": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + "fields.field": { + "value": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + } } }, { @@ -22,7 +24,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "text field is not set", @@ -37,7 +40,9 @@ "must": [ { "term": { - "fields.field": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + "fields.field": { + "value": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + } } }, { @@ -51,7 +56,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "text field equality", @@ -64,19 +70,24 @@ "must": [ { "term": { - "fields.field": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + "fields.field": { + "value": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + } } }, { "term": { - "fields.text": "red" + "fields.text": { + "value": "red" + } } } ] } } } - } + }, + "redact_urns": false }, { "description": "text field inequality", @@ -91,12 +102,16 @@ "must": [ { "term": { - "fields.field": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + "fields.field": { + "value": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + } } }, { "term": { - "fields.text": "red" + "fields.text": { + "value": "red" + } } }, { @@ -110,7 +125,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "number field is set", @@ -123,7 +139,9 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { @@ -135,7 +153,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "number field is not set", @@ -150,7 +169,9 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { @@ -164,7 +185,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "number field equality", @@ -177,7 +199,9 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { @@ -191,7 +215,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "number field inequality", @@ -206,7 +231,9 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { @@ -222,7 +249,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "number field less than or equal", @@ -235,16 +263,15 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { "range": { "fields.number": { - "from": null, - "include_lower": true, - "include_upper": true, - "to": 10 + "lte": 10 } } } @@ -252,7 +279,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "number field greater than or equal", @@ -265,16 +293,15 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { "range": { "fields.number": { - "from": 10, - "include_lower": true, - "include_upper": true, - "to": null + "gte": 10 } } } @@ -282,7 +309,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "number field less than", @@ -295,16 +323,15 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { "range": { "fields.number": { - "from": null, - "include_lower": true, - "include_upper": false, - "to": 10 + "lt": 10 } } } @@ -312,7 +339,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "number field greater than", @@ -325,16 +353,15 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { "range": { "fields.number": { - "from": 10, - "include_lower": false, - "include_upper": true, - "to": null + "gt": 10 } } } @@ -342,7 +369,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "date field is set", @@ -355,7 +383,9 @@ "must": [ { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, { @@ -367,7 +397,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "date field is not set", @@ -382,7 +413,9 @@ "must": [ { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, { @@ -396,7 +429,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "date field equality", @@ -409,16 +443,16 @@ "must": [ { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, { "range": { "fields.datetime": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "gte": "2018-06-23T00:00:00-04:00", + "lt": "2018-06-24T00:00:00-04:00" } } } @@ -426,7 +460,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "date field inequality", @@ -441,16 +476,16 @@ "must": [ { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, { "range": { "fields.datetime": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "gte": "2018-06-23T00:00:00-04:00", + "lt": "2018-06-24T00:00:00-04:00" } } } @@ -460,7 +495,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "date field greater than", @@ -473,16 +509,15 @@ "must": [ { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, { "range": { "fields.datetime": { - "from": "2018-06-24T00:00:00-04:00", - "include_lower": true, - "include_upper": true, - "to": null + "gte": "2018-06-24T00:00:00-04:00" } } } @@ -490,7 +525,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "date field greater than", @@ -503,16 +539,15 @@ "must": [ { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, { "range": { "fields.datetime": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": true, - "to": null + "gte": "2018-06-23T00:00:00-04:00" } } } @@ -520,7 +555,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "date field less than", @@ -533,16 +569,15 @@ "must": [ { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, { "range": { "fields.datetime": { - "from": null, - "include_lower": true, - "include_upper": false, - "to": "2018-06-23T00:00:00-04:00" + "lt": "2018-06-23T00:00:00-04:00" } } } @@ -550,7 +585,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "date field less than or equal", @@ -563,16 +599,15 @@ "must": [ { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, { "range": { "fields.datetime": { - "from": null, - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "lt": "2018-06-24T00:00:00-04:00" } } } @@ -580,7 +615,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "implicit name", @@ -591,31 +627,32 @@ "query": "will" } } - } + }, + "redact_urns": false }, { "description": "implicit name with URN redaction", "query": "will", - "redact_urns": true, "elastic": { "match": { "name": { "query": "will" } } - } + }, + "redact_urns": true }, { "description": "implicit id with URN redaction", "query": "7979", - "redact_urns": true, "elastic": { "ids": { "values": [ "7979" ] } - } + }, + "redact_urns": true }, { "description": "implicit tel", @@ -635,14 +672,17 @@ }, { "term": { - "urns.scheme": "tel" + "urns.scheme": { + "value": "tel" + } } } ] } } } - } + }, + "redact_urns": false }, { "description": "state field is set", @@ -655,7 +695,9 @@ "must": [ { "term": { - "fields.field": "67663ad1-3abc-42dd-a162-09df2dea66ec" + "fields.field": { + "value": "67663ad1-3abc-42dd-a162-09df2dea66ec" + } } }, { @@ -667,7 +709,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "state field is not set", @@ -682,7 +725,9 @@ "must": [ { "term": { - "fields.field": "67663ad1-3abc-42dd-a162-09df2dea66ec" + "fields.field": { + "value": "67663ad1-3abc-42dd-a162-09df2dea66ec" + } } }, { @@ -696,7 +741,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "state field equality", @@ -709,19 +755,24 @@ "must": [ { "term": { - "fields.field": "67663ad1-3abc-42dd-a162-09df2dea66ec" + "fields.field": { + "value": "67663ad1-3abc-42dd-a162-09df2dea66ec" + } } }, { "term": { - "fields.state_keyword": "washington" + "fields.state_keyword": { + "value": "washington" + } } } ] } } } - } + }, + "redact_urns": false }, { "description": "state field equality with punctuation", @@ -734,19 +785,24 @@ "must": [ { "term": { - "fields.field": "67663ad1-3abc-42dd-a162-09df2dea66ec" + "fields.field": { + "value": "67663ad1-3abc-42dd-a162-09df2dea66ec" + } } }, { "term": { - "fields.state_keyword": "nord-kivu" + "fields.state_keyword": { + "value": "nord-kivu" + } } } ] } } } - } + }, + "redact_urns": false }, { "description": "state field inequality", @@ -761,7 +817,9 @@ "must": [ { "term": { - "fields.state_keyword": "washington" + "fields.state_keyword": { + "value": "washington" + } } }, { @@ -775,7 +833,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "district field is set", @@ -788,7 +847,9 @@ "must": [ { "term": { - "fields.field": "54c72635-d747-4e45-883c-099d57dd998e" + "fields.field": { + "value": "54c72635-d747-4e45-883c-099d57dd998e" + } } }, { @@ -800,7 +861,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "district field is unset", @@ -815,7 +877,9 @@ "must": [ { "term": { - "fields.field": "54c72635-d747-4e45-883c-099d57dd998e" + "fields.field": { + "value": "54c72635-d747-4e45-883c-099d57dd998e" + } } }, { @@ -829,7 +893,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "district field equality", @@ -842,19 +907,24 @@ "must": [ { "term": { - "fields.field": "54c72635-d747-4e45-883c-099d57dd998e" + "fields.field": { + "value": "54c72635-d747-4e45-883c-099d57dd998e" + } } }, { "term": { - "fields.district_keyword": "chelan" + "fields.district_keyword": { + "value": "chelan" + } } } ] } } } - } + }, + "redact_urns": false }, { "description": "district field inequality", @@ -869,7 +939,9 @@ "must": [ { "term": { - "fields.district_keyword": "chelan" + "fields.district_keyword": { + "value": "chelan" + } } }, { @@ -883,7 +955,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "ward field is set", @@ -896,7 +969,9 @@ "must": [ { "term": { - "fields.field": "fde8f740-c337-421b-8abb-83b954897c80" + "fields.field": { + "value": "fde8f740-c337-421b-8abb-83b954897c80" + } } }, { @@ -908,7 +983,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "ward field is unset", @@ -923,7 +999,9 @@ "must": [ { "term": { - "fields.field": "fde8f740-c337-421b-8abb-83b954897c80" + "fields.field": { + "value": "fde8f740-c337-421b-8abb-83b954897c80" + } } }, { @@ -937,7 +1015,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "ward field equality", @@ -950,19 +1029,24 @@ "must": [ { "term": { - "fields.field": "fde8f740-c337-421b-8abb-83b954897c80" + "fields.field": { + "value": "fde8f740-c337-421b-8abb-83b954897c80" + } } }, { "term": { - "fields.ward_keyword": "stevens" + "fields.ward_keyword": { + "value": "stevens" + } } } ] } } } - } + }, + "redact_urns": false }, { "description": "ward field inequality", @@ -977,7 +1061,9 @@ "must": [ { "term": { - "fields.ward_keyword": "stevens" + "fields.ward_keyword": { + "value": "stevens" + } } }, { @@ -991,16 +1077,20 @@ } } } - } + }, + "redact_urns": false }, { "description": "name equality", "query": "name=chef", "elastic": { "term": { - "name.keyword": "chef" + "name.keyword": { + "value": "chef" + } } - } + }, + "redact_urns": false }, { "description": "name inequality", @@ -1009,11 +1099,14 @@ "bool": { "must_not": { "term": { - "name.keyword": "chef" + "name.keyword": { + "value": "chef" + } } } } - } + }, + "redact_urns": false }, { "description": "name is set", @@ -1030,14 +1123,17 @@ "bool": { "must_not": { "term": { - "name.keyword": "" + "name.keyword": { + "value": "" + } } } } } ] } - } + }, + "redact_urns": false }, { "description": "name is not set", @@ -1056,7 +1152,9 @@ "bool": { "must_not": { "term": { - "name.keyword": "" + "name.keyword": { + "value": "" + } } } } @@ -1065,7 +1163,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "name contains", @@ -1076,16 +1175,20 @@ "query": "chef" } } - } + }, + "redact_urns": false }, { "description": "uuid equality", "query": "uuid=bbe6dba0-818b-4c5a-be51-10432095e27a", "elastic": { "term": { - "uuid": "bbe6dba0-818b-4c5a-be51-10432095e27a" + "uuid": { + "value": "bbe6dba0-818b-4c5a-be51-10432095e27a" + } } - } + }, + "redact_urns": false }, { "description": "uuid inequality", @@ -1094,11 +1197,14 @@ "bool": { "must_not": { "term": { - "uuid": "bbe6dba0-818b-4c5a-be51-10432095e27a" + "uuid": { + "value": "bbe6dba0-818b-4c5a-be51-10432095e27a" + } } } } - } + }, + "redact_urns": false }, { "description": "id equality", @@ -1109,7 +1215,8 @@ "123" ] } - } + }, + "redact_urns": false }, { "description": "id inequality", @@ -1124,16 +1231,20 @@ } } } - } + }, + "redact_urns": false }, { "description": "status equality", "query": "status=active", "elastic": { "term": { - "status": "A" + "status": { + "value": "A" + } } - } + }, + "redact_urns": false }, { "description": "status inequality", @@ -1142,20 +1253,26 @@ "bool": { "must_not": { "term": { - "status": "B" + "status": { + "value": "B" + } } } } - } + }, + "redact_urns": false }, { "description": "language equality", "query": "language=spa", "elastic": { "term": { - "language": "spa" + "language": { + "value": "spa" + } } - } + }, + "redact_urns": false }, { "description": "language inequality", @@ -1164,11 +1281,14 @@ "bool": { "must_not": { "term": { - "language": "fra" + "language": { + "value": "fra" + } } } } - } + }, + "redact_urns": false }, { "description": "language is set", @@ -1185,14 +1305,17 @@ "bool": { "must_not": { "term": { - "language.keyword": "" + "language.keyword": { + "value": "" + } } } } } ] } - } + }, + "redact_urns": false }, { "description": "language is not set", @@ -1211,7 +1334,9 @@ "bool": { "must_not": { "term": { - "language.keyword": "" + "language.keyword": { + "value": "" + } } } } @@ -1220,7 +1345,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "created_on greater than", @@ -1228,13 +1354,11 @@ "elastic": { "range": { "created_on": { - "from": "2018-06-24T00:00:00-04:00", - "include_lower": true, - "include_upper": true, - "to": null + "gte": "2018-06-24T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "created_on greater than or equal", @@ -1242,13 +1366,11 @@ "elastic": { "range": { "created_on": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": true, - "to": null + "gte": "2018-06-23T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "created_on less than", @@ -1256,13 +1378,11 @@ "elastic": { "range": { "created_on": { - "from": null, - "include_lower": true, - "include_upper": false, - "to": "2018-06-23T00:00:00-04:00" + "lt": "2018-06-23T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "created_on less than or equal", @@ -1270,13 +1390,11 @@ "elastic": { "range": { "created_on": { - "from": null, - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "lt": "2018-06-24T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "created_on equality", @@ -1284,13 +1402,12 @@ "elastic": { "range": { "created_on": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "gte": "2018-06-23T00:00:00-04:00", + "lt": "2018-06-24T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "created_on inequality", @@ -1300,15 +1417,14 @@ "must_not": { "range": { "created_on": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "gte": "2018-06-23T00:00:00-04:00", + "lt": "2018-06-24T00:00:00-04:00" } } } } - } + }, + "redact_urns": false }, { "description": "last_seen_on greater than", @@ -1316,13 +1432,11 @@ "elastic": { "range": { "last_seen_on": { - "from": "2018-06-24T00:00:00-04:00", - "include_lower": true, - "include_upper": true, - "to": null + "gte": "2018-06-24T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "last_seen_on greater than or equal", @@ -1330,13 +1444,11 @@ "elastic": { "range": { "last_seen_on": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": true, - "to": null + "gte": "2018-06-23T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "last_seen_on less than", @@ -1344,13 +1456,11 @@ "elastic": { "range": { "last_seen_on": { - "from": null, - "include_lower": true, - "include_upper": false, - "to": "2018-06-23T00:00:00-04:00" + "lt": "2018-06-23T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "last_seen_on less than or equal", @@ -1358,13 +1468,11 @@ "elastic": { "range": { "last_seen_on": { - "from": null, - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "lt": "2018-06-24T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "last_seen_on equality", @@ -1372,13 +1480,12 @@ "elastic": { "range": { "last_seen_on": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "gte": "2018-06-23T00:00:00-04:00", + "lt": "2018-06-24T00:00:00-04:00" } } - } + }, + "redact_urns": false }, { "description": "last_seen_on inequality", @@ -1388,15 +1495,14 @@ "must_not": { "range": { "last_seen_on": { - "from": "2018-06-23T00:00:00-04:00", - "include_lower": true, - "include_upper": false, - "to": "2018-06-24T00:00:00-04:00" + "gte": "2018-06-23T00:00:00-04:00", + "lt": "2018-06-24T00:00:00-04:00" } } } } - } + }, + "redact_urns": false }, { "description": "last_seen_on is set", @@ -1405,7 +1511,8 @@ "exists": { "field": "last_seen_on" } - } + }, + "redact_urns": false }, { "description": "last_seen_on is not set", @@ -1418,7 +1525,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "tel scheme is set", @@ -1431,7 +1539,9 @@ "must": [ { "term": { - "urns.scheme": "tel" + "urns.scheme": { + "value": "tel" + } } }, { @@ -1443,7 +1553,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "tel scheme is not set", @@ -1458,7 +1569,9 @@ "must": [ { "term": { - "urns.scheme": "tel" + "urns.scheme": { + "value": "tel" + } } }, { @@ -1472,7 +1585,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "tel scheme equality", @@ -1485,19 +1599,24 @@ "must": [ { "term": { - "urns.path.keyword": "12345" + "urns.path.keyword": { + "value": "12345" + } } }, { "term": { - "urns.scheme": "tel" + "urns.scheme": { + "value": "tel" + } } } ] } } } - } + }, + "redact_urns": false }, { "description": "tel scheme inequality", @@ -1512,12 +1631,16 @@ "must": [ { "term": { - "urns.path.keyword": "12345" + "urns.path.keyword": { + "value": "12345" + } } }, { "term": { - "urns.scheme": "tel" + "urns.scheme": { + "value": "tel" + } } } ] @@ -1526,7 +1649,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "tel scheme contains", @@ -1546,19 +1670,21 @@ }, { "term": { - "urns.scheme": "tel" + "urns.scheme": { + "value": "tel" + } } } ] } } } - } + }, + "redact_urns": false }, { "description": "tel scheme is set with URN redaction", "query": "tel!=\"\"", - "redact_urns": true, "elastic": { "nested": { "path": "urns", @@ -1567,7 +1693,9 @@ "must": [ { "term": { - "urns.scheme": "tel" + "urns.scheme": { + "value": "tel" + } } }, { @@ -1579,12 +1707,12 @@ } } } - } + }, + "redact_urns": true }, { "description": "tel scheme is not set with URN redaction", "query": "tel=\"\"", - "redact_urns": true, "elastic": { "bool": { "must_not": { @@ -1595,7 +1723,9 @@ "must": [ { "term": { - "urns.scheme": "tel" + "urns.scheme": { + "value": "tel" + } } }, { @@ -1609,7 +1739,8 @@ } } } - } + }, + "redact_urns": true }, { "description": "urn is set", @@ -1623,7 +1754,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "urn is not set", @@ -1641,7 +1773,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "urn attribute equality", @@ -1651,11 +1784,14 @@ "path": "urns", "query": { "term": { - "urns.path.keyword": "+12067799192" + "urns.path.keyword": { + "value": "+12067799192" + } } } } - } + }, + "redact_urns": false }, { "description": "urn attribute inequality", @@ -1667,13 +1803,16 @@ "path": "urns", "query": { "term": { - "urns.path.keyword": "+12067799192" + "urns.path.keyword": { + "value": "+12067799192" + } } } } } } - } + }, + "redact_urns": false }, { "description": "urn attribute contains", @@ -1689,16 +1828,20 @@ } } } - } + }, + "redact_urns": false }, { "description": "group equality", "query": "group = \"U-Reporters\"", "elastic": { "term": { - "group_ids": 345 + "group_ids": { + "value": 345 + } } - } + }, + "redact_urns": false }, { "description": "group inequality", @@ -1707,11 +1850,14 @@ "bool": { "must_not": { "term": { - "group_ids": 345 + "group_ids": { + "value": 345 + } } } } - } + }, + "redact_urns": false }, { "description": "group is set", @@ -1720,7 +1866,8 @@ "exists": { "field": "group_ids" } - } + }, + "redact_urns": false }, { "description": "group is not set", @@ -1733,16 +1880,20 @@ } } } - } + }, + "redact_urns": false }, { "description": "flow equality", "query": "flow = \"registration\"", "elastic": { "term": { - "flow_id": 234 + "flow_id": { + "value": 234 + } } - } + }, + "redact_urns": false }, { "description": "flow inequality", @@ -1751,11 +1902,14 @@ "bool": { "must_not": { "term": { - "flow_id": 234 + "flow_id": { + "value": 234 + } } } } - } + }, + "redact_urns": false }, { "description": "flow is set", @@ -1764,7 +1918,8 @@ "exists": { "field": "flow_id" } - } + }, + "redact_urns": false }, { "description": "flow is not set", @@ -1777,16 +1932,20 @@ } } } - } + }, + "redact_urns": false }, { "description": "history equality", "query": "history = \"registration\"", "elastic": { "term": { - "flow_history_ids": 234 + "flow_history_ids": { + "value": 234 + } } - } + }, + "redact_urns": false }, { "description": "flow inequality", @@ -1795,11 +1954,14 @@ "bool": { "must_not": { "term": { - "flow_history_ids": 234 + "flow_history_ids": { + "value": 234 + } } } } - } + }, + "redact_urns": false }, { "description": "history is set", @@ -1808,7 +1970,8 @@ "exists": { "field": "flow_history_ids" } - } + }, + "redact_urns": false }, { "description": "history is not set", @@ -1821,7 +1984,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "bool and", @@ -1837,12 +2001,16 @@ "must": [ { "term": { - "fields.field": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + "fields.field": { + "value": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + } } }, { "term": { - "fields.text": "red" + "fields.text": { + "value": "red" + } } } ] @@ -1858,16 +2026,15 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { "range": { "fields.number": { - "from": 10, - "include_lower": false, - "include_upper": true, - "to": null + "gt": 10 } } } @@ -1878,7 +2045,8 @@ } ] } - } + }, + "redact_urns": false }, { "description": "bool or", @@ -1894,12 +2062,16 @@ "must": [ { "term": { - "fields.field": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + "fields.field": { + "value": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + } } }, { "term": { - "fields.text": "red" + "fields.text": { + "value": "red" + } } } ] @@ -1915,16 +2087,15 @@ "must": [ { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, { "range": { "fields.number": { - "from": 10, - "include_lower": false, - "include_upper": true, - "to": null + "gt": 10 } } } @@ -1935,7 +2106,8 @@ } ] } - } + }, + "redact_urns": false }, { "description": "tickets equality", @@ -1946,7 +2118,8 @@ "query": 2 } } - } + }, + "redact_urns": false }, { "description": "tickets inequality", @@ -1961,7 +2134,8 @@ } } } - } + }, + "redact_urns": false }, { "description": "tickets greater than", @@ -1969,13 +2143,11 @@ "elastic": { "range": { "tickets": { - "from": 0, - "include_lower": false, - "include_upper": true, - "to": null + "gt": 0 } } - } + }, + "redact_urns": false }, { "description": "tickets greater than or equal", @@ -1983,13 +2155,11 @@ "elastic": { "range": { "tickets": { - "from": 1, - "include_lower": true, - "include_upper": true, - "to": null + "gte": 1 } } - } + }, + "redact_urns": false }, { "description": "tickets less than", @@ -1997,13 +2167,11 @@ "elastic": { "range": { "tickets": { - "from": null, - "include_lower": true, - "include_upper": false, - "to": 1 + "lt": 1 } } - } + }, + "redact_urns": false }, { "description": "tickets less than or equal", @@ -2011,12 +2179,10 @@ "elastic": { "range": { "tickets": { - "from": null, - "include_lower": true, - "include_upper": true, - "to": 1 + "lte": 1 } } - } + }, + "redact_urns": false } ] \ No newline at end of file diff --git a/contactql/es/testdata/to_sort.json b/contactql/es/testdata/to_sort.json index 0c99ee15d..e5ed9e22f 100644 --- a/contactql/es/testdata/to_sort.json +++ b/contactql/es/testdata/to_sort.json @@ -52,7 +52,9 @@ "nested": { "filter": { "term": { - "fields.field": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + "fields.field": { + "value": "6b6a43fa-a26d-4017-bede-328bcdd5c93b" + } } }, "path": "fields" @@ -69,7 +71,9 @@ "nested": { "filter": { "term": { - "fields.field": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + "fields.field": { + "value": "ecc7b13b-c698-4f46-8a90-24a8fab6fe34" + } } }, "path": "fields" @@ -86,7 +90,9 @@ "nested": { "filter": { "term": { - "fields.field": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + "fields.field": { + "value": "cbd3fc0e-9b74-4207-a8c7-248082bb4572" + } } }, "path": "fields" @@ -103,7 +109,9 @@ "nested": { "filter": { "term": { - "fields.field": "67663ad1-3abc-42dd-a162-09df2dea66ec" + "fields.field": { + "value": "67663ad1-3abc-42dd-a162-09df2dea66ec" + } } }, "path": "fields" @@ -120,7 +128,9 @@ "nested": { "filter": { "term": { - "fields.field": "54c72635-d747-4e45-883c-099d57dd998e" + "fields.field": { + "value": "54c72635-d747-4e45-883c-099d57dd998e" + } } }, "path": "fields" @@ -137,7 +147,9 @@ "nested": { "filter": { "term": { - "fields.field": "fde8f740-c337-421b-8abb-83b954897c80" + "fields.field": { + "value": "fde8f740-c337-421b-8abb-83b954897c80" + } } }, "path": "fields" diff --git a/go.mod b/go.mod index b6ae37af3..4b69665da 100644 --- a/go.mod +++ b/go.mod @@ -8,31 +8,31 @@ require ( github.com/antlr4-go/antlr/v4 v4.13.1 github.com/blevesearch/segment v0.9.1 github.com/buger/jsonparser v1.1.1 - github.com/go-playground/validator/v10 v10.20.0 - github.com/nyaruka/gocommon v1.55.1 + github.com/go-playground/validator/v10 v10.22.0 + github.com/nyaruka/gocommon v1.55.8 github.com/sergi/go-diff v1.3.1 github.com/shopspring/decimal v1.4.0 github.com/stretchr/testify v1.9.0 - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 - golang.org/x/net v0.25.0 - golang.org/x/text v0.15.0 + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 + golang.org/x/net v0.27.0 + golang.org/x/text v0.16.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.3 // indirect - github.com/go-chi/chi/v5 v5.0.12 // indirect + github.com/gabriel-vasile/mimetype v1.4.4 // indirect + github.com/go-chi/chi/v5 v5.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect - github.com/gorilla/websocket v1.5.1 // indirect + github.com/gorilla/websocket v1.5.3 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/nyaruka/null/v2 v2.0.3 // indirect - github.com/nyaruka/phonenumbers v1.3.5 // indirect + github.com/nyaruka/phonenumbers v1.4.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/crypto v0.23.0 // indirect - golang.org/x/sys v0.20.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/sys v0.22.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 3917ca46c..61d56a0aa 100644 --- a/go.sum +++ b/go.sum @@ -11,24 +11,24 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= -github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s= -github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I= +github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s= +github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= +github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= -github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao= +github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= -github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o= github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -40,12 +40,12 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/nyaruka/gocommon v1.55.1 h1:f6c8Ud06ZQKrnTp5c753Q1ZA78WW/TOqbJRYeTpXOtc= -github.com/nyaruka/gocommon v1.55.1/go.mod h1:l+MMiuz0XsXT4wJD0lc8KH1+wPqfZ/a8aK6RAANOaZo= +github.com/nyaruka/gocommon v1.55.8 h1:vMMnwCt/P5D7kWic13g3TkALp6uTpR/a9JIW22DITh0= +github.com/nyaruka/gocommon v1.55.8/go.mod h1:ZiVNGrpzkv8str/Tjblddl2tmR0NCifv1mAvjTOKXQI= github.com/nyaruka/null/v2 v2.0.3 h1:rdmMRQyVzrOF3Jff/gpU/7BDR9mQX0lcLl4yImsA3kw= github.com/nyaruka/null/v2 v2.0.3/go.mod h1:OCVeCkCXwrg5/qE6RU0c1oUVZBy+ZDrT+xYg1XSaIWA= -github.com/nyaruka/phonenumbers v1.3.5 h1:WZLbQn61j2E1OFnvpUTYbK/6hViUgl6tppJ55/E2iQM= -github.com/nyaruka/phonenumbers v1.3.5/go.mod h1:Ut+eFwikULbmCenH6InMKL9csUNLyxHuBLyfkpum11s= +github.com/nyaruka/phonenumbers v1.4.0 h1:ddhWiHnHCIX3n6ETDA58Zq5dkxkjlvgrDWM2OHHPCzU= +github.com/nyaruka/phonenumbers v1.4.0/go.mod h1:gv+CtldaFz+G3vHHnasBSirAi3O2XLqZzVWz4V1pl2E= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= @@ -56,18 +56,18 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=