Skip to content

Commit 0bfcb5a

Browse files
vinckamavinckama
authored
pre-sort map keys in list-item result blocks (deepSort fix) (DataDog#23952)
* pre-sort map keys in list-item result blocks (deepSort fix) * fix: sort deeply nested map keys inside list items (complete deepSort)
1 parent 6485dcc commit 0bfcb5a

51 files changed

Lines changed: 2256 additions & 2256 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎adyen/assets/logs/adyen_tests.yaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,30 +47,30 @@ tests:
4747
notificationItems:
4848
-
4949
NotificationRequestItem:
50-
eventCode: "AUTHORISATION"
51-
merchantAccountCode: "ABCD123"
52-
reason: "1234:7777:12/2012"
50+
additionalData:
51+
NAME1: "VALUE1"
52+
NAME2: "VALUE2"
53+
authCode: "1234"
54+
cardSummary: "7777"
55+
expiryDate: "12/2012"
56+
fraudCheck-6-ShopperIpUsage: "10"
57+
hmacSignature: "snUIAaCX6vgmaF4vr65BYPyvl4D9QX1VICKbpBXD8="
58+
totalFraudScore: "10"
5359
amount:
5460
currency: "EUR"
5561
value: 101
62+
eventCode: "AUTHORISATION"
63+
eventDate: "2024-09-24T14:47:01+02:00"
64+
merchantAccountCode: "ABCD123"
65+
merchantReference: "8313840770001"
5666
operations:
5767
- "CANCEL"
5868
- "CAPTURE"
5969
- "REFUND"
60-
success: "true"
6170
paymentMethod: "visa"
62-
additionalData:
63-
expiryDate: "12/2012"
64-
authCode: "1234"
65-
cardSummary: "7777"
66-
totalFraudScore: "10"
67-
hmacSignature: "snUIAaCX6vgmaF4vr65BYPyvl4D9QX1VICKbpBXD8="
68-
NAME2: "VALUE2"
69-
NAME1: "VALUE1"
70-
fraudCheck-6-ShopperIpUsage: "10"
71-
merchantReference: "8313840770001"
7271
pspReference: "PB5FVSKW5N6DN65"
73-
eventDate: "2024-09-24T14:47:01+02:00"
72+
reason: "1234:7777:12/2012"
73+
success: "true"
7474
pspReference: "PB5FVSKW5N6DN65"
7575
service: "transaction"
7676
message: |-
@@ -143,19 +143,19 @@ tests:
143143
notificationItems:
144144
-
145145
NotificationRequestItem:
146-
eventCode: "PAYOUT_THIRDPARTY"
147-
merchantAccountCode: "ABCD123"
148-
originalReference: "pspReference of the PAYOUT_THIRDPARTY"
149-
reason: ""
146+
additionalData:
147+
hmacSignature: "moFrJq/s/SzE8devOIm2EYFaEQQsRWHp8e4OdwB5Y="
150148
amount:
151149
currency: "EUR"
152150
value: 0
153-
success: "true"
154-
additionalData:
155-
hmacSignature: "moFrJq/s/SzE8devOIm2EYFaEQQsRWHp8e4OdwB5Y="
151+
eventCode: "PAYOUT_THIRDPARTY"
152+
eventDate: "2024-09-24T14:48:29+02:00"
153+
merchantAccountCode: "ABCD123"
156154
merchantReference: "testMerchantRf1"
155+
originalReference: "pspReference of the PAYOUT_THIRDPARTY"
157156
pspReference: "HVC6JNTJW3DV65"
158-
eventDate: "2024-09-24T14:48:29+02:00"
157+
reason: ""
158+
success: "true"
159159
pspReference: "HVC6JNTJW3DV65"
160160
service: "payout"
161161
message: |-
@@ -219,18 +219,18 @@ tests:
219219
notificationItems:
220220
-
221221
NotificationRequestItem:
222-
eventCode: "CHARGEBACK"
223-
merchantAccountCode: "ABCD123"
224-
reason: ""
222+
additionalData:
223+
hmacSignature: "jJgfaV99ZVYh/AIigUxaNKIMwsK2cWzA+7qqUWaeA="
225224
amount:
226225
currency: "EUR"
227226
value: 0
228-
success: "true"
229-
additionalData:
230-
hmacSignature: "jJgfaV99ZVYh/AIigUxaNKIMwsK2cWzA+7qqUWaeA="
227+
eventCode: "CHARGEBACK"
228+
eventDate: "2024-09-24T14:49:59+02:00"
229+
merchantAccountCode: "ABCD123"
231230
merchantReference: "testMrchantRef1"
232231
pspReference: "HHCPTJW39ZDV65"
233-
eventDate: "2024-09-24T14:49:59+02:00"
232+
reason: ""
233+
success: "true"
234234
pspReference: "HHCPTJW39ZDV65"
235235
service: "dispute"
236236
message: |-

‎azure_active_directory/assets/logs/azure.activedirectory_tests.yaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ tests:
201201
activity_name: "Logon"
202202
actor:
203203
user:
204+
email_addr: "testtest@datadoghq.com"
204205
name: "Test Test"
205206
type: "User"
206207
type_id: 1
207208
uid: "0abb8889-005c-4307-85c2-97a5d3cd0964"
208-
email_addr: "testtest@datadoghq.com"
209209
category_name: "Identity & Access Management"
210210
category_uid: 3
211211
class_name: "Authentication"
@@ -244,8 +244,8 @@ tests:
244244
type_name: "Authentication: Logon"
245245
type_uid: 300201
246246
user:
247-
name: "Test Test"
248247
email_addr: "testtest@datadoghq.com"
248+
name: "Test Test"
249249
type: "User"
250250
type_id: 1
251251
uid: "0abb8889-005c-4307-85c2-97a5d3cd0964"
@@ -256,18 +256,18 @@ tests:
256256
appId: "23523755-3a2b-41ca-9315-f81f3f566a95"
257257
appliedConditionalAccessPolicies:
258258
-
259-
result: "success"
260259
conditionsNotSatisfied: 0
261260
conditionsSatisfied: 3
261+
displayName: "Require MFA"
262262
enforcedGrantControls:
263263
- "Mfa"
264-
displayName: "Require MFA"
265264
id: "ccb90f89-cdaf-4ae6-9dd1-a9ee6ea86a90"
265+
result: "success"
266266
authenticationDetails:
267267
-
268268
authenticationStepDateTime: "2020-05-13T12:35:19.6363979+00:00"
269-
authenticationStepResultDetail: "MFA requirement satisfied by claim in the token"
270269
authenticationStepRequirement: "MultiConditionalAccess"
270+
authenticationStepResultDetail: "MFA requirement satisfied by claim in the token"
271271
succeeded: false
272272
clientAppUsed: "Browser"
273273
conditionalAccessStatus: "success"
@@ -446,8 +446,8 @@ tests:
446446
activityDateTime: "2020-04-08T07:40:53.1695436+00:00"
447447
activityDisplayName: "Delete user"
448448
additionalDetails:
449-
- value: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:141.0) Gecko/20100101 Firefox/141.0"
450-
key: "User-Agent"
449+
- key: "User-Agent"
450+
value: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:141.0) Gecko/20100101 Firefox/141.0"
451451
category: "UserManagement"
452452
correlationId: "a13bd0fa-70d0-4e60-ae23-b687377b4695"
453453
id: "Directory_a13bd0fa-70d0-4e60-ae23-b687377b4695_VTP26_161277857"
@@ -465,10 +465,10 @@ tests:
465465
resultReason: ""
466466
resultType: ""
467467
targetResources:
468-
- modifiedProperties:
469-
- newValue: '"False"'
470-
displayName: "Is Hard Deleted"
471-
id: "1606d62c-71bc-42ff-a03c-87809c6b0e68"
468+
- id: "1606d62c-71bc-42ff-a03c-87809c6b0e68"
469+
modifiedProperties:
470+
- displayName: "Is Hard Deleted"
471+
newValue: '"False"'
472472
type: "User"
473473
userPrincipalName: "deleted_user@datadoghq.com"
474474
tenantGeo: "NA"
@@ -683,8 +683,8 @@ tests:
683683
activityDisplayName: "Add member to role"
684684
additionalDetails:
685685
-
686-
value: "9205c433-2781-42be-a046-c21ef6b5e608"
687686
key: "AppId"
687+
value: "9205c433-2781-42be-a046-c21ef6b5e608"
688688
category: "RoleManagement"
689689
correlationId: "5d3c3340-5c5e-419c-9ae9-193b1669f84e"
690690
id: "Directory_5d3c3340-5c5e-419c-9ae9-193b1669f84e_D4P59_168172641"
@@ -704,23 +704,23 @@ tests:
704704
targetResources:
705705
-
706706
displayName: "Test Service Principal"
707+
id: "febf6383-8bed-4efb-8244-c9a456a1f172"
707708
modifiedProperties:
708709
-
709-
newValue: "\"260a316b-1246-41c7-bc20-16569a1bd28d\""
710710
displayName: "Role.ObjectID"
711+
newValue: "\"260a316b-1246-41c7-bc20-16569a1bd28d\""
711712
-
712-
newValue: "\"Security Administrator\""
713713
displayName: "Role.DisplayName"
714+
newValue: "\"Security Administrator\""
714715
-
715-
newValue: "\"194ae4cb-b126-40b2-bd5b-6091b380977d\""
716716
displayName: "Role.TemplateId"
717+
newValue: "\"194ae4cb-b126-40b2-bd5b-6091b380977d\""
717718
-
718-
newValue: "\"SecurityAdmins\""
719719
displayName: "Role.WellKnownObjectName"
720+
newValue: "\"SecurityAdmins\""
720721
-
721-
newValue: "\"9205c433-2781-42be-a046-c21ef6b5e608\""
722722
displayName: "TargetId.ServicePrincipalNames"
723-
id: "febf6383-8bed-4efb-8244-c9a456a1f172"
723+
newValue: "\"9205c433-2781-42be-a046-c21ef6b5e608\""
724724
type: "ServicePrincipal"
725725
-
726726
id: "260a316b-1246-41c7-bc20-16569a1bd28d"
@@ -948,11 +948,11 @@ tests:
948948
activityDisplayName: "Add member to group"
949949
additionalDetails:
950950
-
951-
value: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36"
952951
key: "User-Agent"
952+
value: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36"
953953
-
954-
value: "9205c433-2781-42be-a046-c21ef6b5e608"
955954
key: "AppId"
955+
value: "9205c433-2781-42be-a046-c21ef6b5e608"
956956
category: "GroupManagement"
957957
correlationId: "67c2eef3-4b38-4017-82dd-ecc064c38151"
958958
id: "Directory_67c2eef3-4b38-4017-82dd-ecc064c38151_M4V7T_12366951"
@@ -972,17 +972,17 @@ tests:
972972
targetResources:
973973
-
974974
displayName: "Test Application"
975+
id: "febf6383-8bed-4efb-8244-c9a456a1f172"
975976
modifiedProperties:
976977
-
977-
newValue: "\"3b3bf2cd-049a-4f35-9e63-dc2a0a830807\""
978978
displayName: "Group.ObjectID"
979+
newValue: "\"3b3bf2cd-049a-4f35-9e63-dc2a0a830807\""
979980
-
980-
newValue: "\"Security-Research-Admins\""
981981
displayName: "Group.DisplayName"
982+
newValue: "\"Security-Research-Admins\""
982983
-
983-
newValue: "\"9205c433-2781-42be-a046-c21ef6b5e608\""
984984
displayName: "TargetId.ServicePrincipalNames"
985-
id: "febf6383-8bed-4efb-8244-c9a456a1f172"
985+
newValue: "\"9205c433-2781-42be-a046-c21ef6b5e608\""
986986
type: "ServicePrincipal"
987987
-
988988
groupType: "unknownFutureValue"
@@ -1182,14 +1182,14 @@ tests:
11821182
activityDateTime: "2020-04-08T07:40:53.1695436+00:00"
11831183
activityDisplayName: "Validate user authentication"
11841184
additionalDetails:
1185-
- value: "00000000-0000-0000-0000-000000000000"
1186-
key: "targetTenant"
1187-
- value: "None"
1188-
key: "targetEntityType"
1189-
- value: "UPN"
1190-
key: "actorIdentityType"
1191-
- value: "f32c392f-d8a3-4846-b89d-8c4cb9a404d8"
1192-
key: "RequestId"
1185+
- key: "targetTenant"
1186+
value: "00000000-0000-0000-0000-000000000000"
1187+
- key: "targetEntityType"
1188+
value: "None"
1189+
- key: "actorIdentityType"
1190+
value: "UPN"
1191+
- key: "RequestId"
1192+
value: "f32c392f-d8a3-4846-b89d-8c4cb9a404d8"
11931193
category: "Authentication"
11941194
correlationId: "f32c392f-d8a3-4846-b89d-8c4cb9a404d8"
11951195
id: "B2C_f32c392f-d8a3-4846-b89d-8c4cb9a404d8_4d3bac44-0230-4732-9e70-cc00736f0a97_134000182275995730"

‎beyondtrust_privileged_remote_access/assets/logs/beyondtrust-privileged-remote-access_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ tests:
3737
-
3838
sample: "Dec 28 23:45:21 pf60fc91 BG[65890] 1427:01:09:site=pf60fc91.beyondtrustcloud.com;when=1766987121;who=John Carter IT (john.carter@test.ai);who_ip=64.252.101.204;event=group_policy_added;account:disabled=0;allow_override=0;login_code:enabled=1"
3939
result:
40-
result:
4140
custom:
4241
account:disabled: 0
4342
account_status_value: "enabled"
@@ -63,6 +62,7 @@ tests:
6362
when: 1.766987121E12
6463
who: "John Carter IT (john.carter@test.ai)"
6564
message: "Dec 28 23:45:21 pf60fc91 BG[65890] 1427:01:09:site=pf60fc91.beyondtrustcloud.com;when=1766987121;who=John Carter IT (john.carter@test.ai);who_ip=64.252.101.204;event=group_policy_added;account:disabled=0;allow_override=0;login_code:enabled=1"
65+
result:
6666
tags:
6767
- "source:LOGS_SOURCE"
6868
timestamp: 1766987121000

0 commit comments

Comments
 (0)