Skip to content

Commit 4ec4da5

Browse files
cisse21cisse21
committed
Merge branch 'master' into chore.improveBRT
2 parents 98d85dc + 69f1baf commit 4ec4da5

File tree

14 files changed

+1140
-727
lines changed

14 files changed

+1140
-727
lines changed

‎CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## [1.46.3](https://github.com/rudderlabs/rudder-server/compare/v1.46.2...v1.46.3) (2025-04-11)
4+
5+
6+
### Bug Fixes
7+
8+
* handle consent management filtering per connection ([#5718](https://github.com/rudderlabs/rudder-server/issues/5718)) ([ef57ce6](https://github.com/rudderlabs/rudder-server/commit/ef57ce6064075ba1794cf642bf2e23d64b43c3cb))
9+
* handling isBlank for nested and empty arrays ([#5714](https://github.com/rudderlabs/rudder-server/issues/5714)) ([670bee0](https://github.com/rudderlabs/rudder-server/commit/670bee06e95ff0eee06bb1963cf964cf617b06a2))
10+
* warehouse transformations ordering while processing properties ([#5713](https://github.com/rudderlabs/rudder-server/issues/5713)) ([3298855](https://github.com/rudderlabs/rudder-server/commit/32988554d95cec34944fdf35ef15afeec35441f0))
11+
* warehouse transformations valid timestamp formats and log file path ([#5707](https://github.com/rudderlabs/rudder-server/issues/5707)) ([8675302](https://github.com/rudderlabs/rudder-server/commit/86753022fd15ca86a8d1e3cea2a4e7e7bc8e3bc3))
12+
13+
14+
### Miscellaneous
15+
16+
* fix webhook tests in release branch ([#5715](https://github.com/rudderlabs/rudder-server/issues/5715)) ([090942d](https://github.com/rudderlabs/rudder-server/commit/090942da168dd8637639adbbae476845530da32f))
17+
318
## [1.46.2](https://github.com/rudderlabs/rudder-server/compare/v1.46.1...v1.46.2) (2025-04-07)
419

520

‎go.mod

+9-9
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ require (
7272
github.com/ory/dockertest/v3 v3.12.0
7373
github.com/oschwald/maxminddb-golang v1.13.1
7474
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
75-
github.com/prometheus/client_model v0.6.1
75+
github.com/prometheus/client_model v0.6.2
7676
github.com/redis/go-redis/v9 v9.7.3
7777
github.com/rs/cors v1.11.1
7878
github.com/rudderlabs/analytics-go v3.3.3+incompatible
@@ -84,7 +84,7 @@ require (
8484
github.com/rudderlabs/rudder-transformer/go v0.0.0-20240910055720-f77d2ab4125a
8585
github.com/rudderlabs/sonnet v1.0.2
8686
github.com/rudderlabs/sql-tunnels v0.1.7
87-
github.com/rudderlabs/sqlconnect-go v1.19.0
87+
github.com/rudderlabs/sqlconnect-go v1.20.0
8888
github.com/samber/lo v1.49.1
8989
github.com/segmentio/go-hll v1.0.1
9090
github.com/segmentio/kafka-go v0.4.47
@@ -153,25 +153,25 @@ require (
153153
github.com/apache/thrift v0.21.0 // indirect
154154
github.com/ardielle/ardielle-go v1.5.2 // indirect
155155
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
156-
github.com/aws/aws-sdk-go-v2 v1.36.2 // indirect
156+
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
157157
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
158158
github.com/aws/aws-sdk-go-v2/config v1.29.7 // indirect
159159
github.com/aws/aws-sdk-go-v2/credentials v1.17.60 // indirect
160160
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.29 // indirect
161161
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18 // indirect
162-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.33 // indirect
163-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.33 // indirect
162+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
163+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
164164
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
165165
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 // indirect
166166
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
167167
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 // indirect
168-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.14 // indirect
168+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
169169
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 // indirect
170-
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.31.12 // indirect
170+
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.33.1 // indirect
171171
github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2 // indirect
172172
github.com/aws/aws-sdk-go-v2/service/sso v1.24.16 // indirect
173173
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.15 // indirect
174-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.15 // indirect
174+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.18 // indirect
175175
github.com/aws/smithy-go v1.22.2 // indirect
176176
github.com/beorn7/perks v1.0.1 // indirect
177177
github.com/bitfield/gotestdox v0.2.2 // indirect
@@ -335,7 +335,7 @@ require (
335335
golang.org/x/mod v0.24.0 // indirect
336336
golang.org/x/net v0.38.0 // indirect
337337
golang.org/x/sys v0.32.0 // indirect
338-
golang.org/x/term v0.29.0 // indirect
338+
golang.org/x/term v0.30.0 // indirect
339339
golang.org/x/text v0.23.0 // indirect
340340
golang.org/x/time v0.11.0
341341
golang.org/x/tools v0.31.0 // indirect

‎go.sum

+18-18
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk
255255
github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
256256
github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU=
257257
github.com/aws/aws-sdk-go-v2 v1.23.0/go.mod h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA=
258-
github.com/aws/aws-sdk-go-v2 v1.36.2 h1:Ub6I4lq/71+tPb/atswvToaLGVMxKZvjYDVOWEExOcU=
259-
github.com/aws/aws-sdk-go-v2 v1.36.2/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
258+
github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM=
259+
github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
260260
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM=
261261
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.1/go.mod h1:t8PYl/6LzdAqsU4/9tz28V/kU+asFePvpOMkdul0gEQ=
262262
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU=
@@ -279,12 +279,12 @@ github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18 h1:9DIp7vhmOPmueCDwpXa4
279279
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18/go.mod h1:aJv/Fwz8r56ozwYFRC4bzoeL1L17GYQYemfblOBux1M=
280280
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9/go.mod h1:AnVH5pvai0pAF4lXRq0bmhbes1u9R8wTE+g+183bZNM=
281281
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.3/go.mod h1:7sGSz1JCKHWWBHq98m6sMtWQikmYPpxjqOydDemiVoM=
282-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.33 h1:knLyPMw3r3JsU8MFHWctE4/e2qWbPaxDYLlohPvnY8c=
283-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.33/go.mod h1:EBp2HQ3f+XCB+5J+IoEbGhoV7CpJbnrsd4asNXmTL0A=
282+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q=
283+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY=
284284
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3/go.mod h1:ssOhaLpRlh88H3UmEcsBoVKq309quMvm3Ds8e9d4eJM=
285285
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.3/go.mod h1:ify42Rb7nKeDDPkFjKn7q1bPscVPu/+gmHH8d2c+anU=
286-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.33 h1:K0+Ne08zqti8J9jwENxZ5NoUyBnaFDTu3apwQJWrwwA=
287-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.33/go.mod h1:K97stwwzaWzmqxO8yLGHhClbVW1tC6VT1pDLk1pGrq4=
286+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0=
287+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q=
288288
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10/go.mod h1:8DcYQcz0+ZJaSxANlHIsbbi6S+zMwjwdDqwW3r9AzaE=
289289
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.1/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY=
290290
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
@@ -302,15 +302,15 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 h1:FLMkfEiRjhgeDT
302302
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19/go.mod h1:Vx+GucNSsdhaxs3aZIKfSUjKVGsxN25nX2SRcdhuw08=
303303
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3/go.mod h1:wlY6SVjuwvh3TVRpTqdy4I1JpBFLX4UGeKZdWntaocw=
304304
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.3/go.mod h1:Owv1I59vaghv1Ax8zz8ELY8DN7/Y0rGS+WWAmjgi950=
305-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.14 h1:2scbY6//jy/s8+5vGrk7l1+UtHl0h9A4MjOO2k/TM2E=
306-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.14/go.mod h1:bRpZPHZpSe5YRHmPfK3h1M7UBFCn2szHzyx0rw04zro=
305+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM=
306+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
307307
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3/go.mod h1:Bm/v2IaN6rZ+Op7zX+bOUMdL4fsrYZiD0dsjLhNKwZc=
308308
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.3/go.mod h1:KZgs2ny8HsxRIRbDwgvJcHHBZPOzQr/+NtGwnP+w2ec=
309309
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 h1:u+EfGmksnJc/x5tq3A+OD7LrMbSSR/5TrKLvkdy/fhY=
310310
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17/go.mod h1:VaMx6302JHax2vHJWgRo+5n9zvbacs3bLU/23DNQrTY=
311311
github.com/aws/aws-sdk-go-v2/service/kms v1.16.3/go.mod h1:QuiHPBqlOFCi4LqdSskYYAWpQlx3PKmohy+rE2F+o5g=
312-
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.31.12 h1:qsSforkf2eei0e2gWrl3cc5mxGZST2pPNH0sXYnZqwM=
313-
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.31.12/go.mod h1:5C86spGG/PUmOnC31CQF393+mug9nBxlYuykiPXM7To=
312+
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.33.1 h1:0LKMr7NqH0c8UNfDOrSZLfB+YgCCfyBCc1rV+xMXKLQ=
313+
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.33.1/go.mod h1:pe1ZJmqbvJOw0SYKoeR/JIypaIlftRUqkDxt4gLXiA8=
314314
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.3/go.mod h1:g1qvDuRsJY+XghsV6zg00Z4KJ7DtFFCx8fJD2a491Ak=
315315
github.com/aws/aws-sdk-go-v2/service/s3 v1.43.0/go.mod h1:NXRKkiRF+erX2hnybnVU660cYT5/KChRD4iUgJ97cI8=
316316
github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2 h1:Kp6PWAlXwP1UvIflkIP6MFZYBNDCa4mFCGtxrpICVOg=
@@ -328,8 +328,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.15 h1:kMyK3aKotq1aTBsj1eS8ERJ
328328
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.15/go.mod h1:5uPZU7vSNzb8Y0dm75xTikinegPYK3uJmIHQZFq5Aqo=
329329
github.com/aws/aws-sdk-go-v2/service/sts v1.16.3/go.mod h1:bfBj0iVmsUyUg4weDB4NxktD9rDGeKSVWnjTnwbx9b8=
330330
github.com/aws/aws-sdk-go-v2/service/sts v1.25.3/go.mod h1:4EqRHDCKP78hq3zOnmFXu5k0j4bXbRFfCh/zQ6KnEfQ=
331-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.15 h1:ht1jVmeeo2anR7zDiYJLSnRYnO/9NILXXu42FP3rJg0=
332-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.15/go.mod h1:xWZ5cOiFe3czngChE4LhCBqUxNwgfwndEF7XlYP/yD8=
331+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.18 h1:xz7WvTMfSStb9Y8NpCT82FXLNC3QasqBfuAFHY4Pk5g=
332+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.18/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
333333
github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM=
334334
github.com/aws/smithy-go v1.17.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
335335
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
@@ -1132,8 +1132,8 @@ github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P
11321132
github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
11331133
github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
11341134
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
1135-
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
1136-
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
1135+
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
1136+
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
11371137
github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
11381138
github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
11391139
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
@@ -1185,8 +1185,8 @@ github.com/rudderlabs/sonnet v1.0.2 h1:nPfmDKD9gUwT571Dwtcsx0VIglSchvyNjuRLju4Xs
11851185
github.com/rudderlabs/sonnet v1.0.2/go.mod h1:tjQmKEGAo/xwmhw9AwLkazP5b5m8VpUvWNzPSx4ve0g=
11861186
github.com/rudderlabs/sql-tunnels v0.1.7 h1:wDCRl6zY4M5gfWazf7XkSTGQS3yjBzUiUgEMBIfHNDA=
11871187
github.com/rudderlabs/sql-tunnels v0.1.7/go.mod h1:5f7+YL49JHYgteP4rAgqKnr4K2OadB0oIpUS+Tt3sPM=
1188-
github.com/rudderlabs/sqlconnect-go v1.19.0 h1:G/LwNnA/LYeI/4d4A2/C4PUsUaN4JFzRnZoR4+OFPZI=
1189-
github.com/rudderlabs/sqlconnect-go v1.19.0/go.mod h1:hngdfPWy2KZVWY2bZEl8FwzsxhZE1SS5LbICTJOstdo=
1188+
github.com/rudderlabs/sqlconnect-go v1.20.0 h1:/NMI/4YG1pZjkoBwH1yGXG0khzs+gjIB8o0ufXOrPsI=
1189+
github.com/rudderlabs/sqlconnect-go v1.20.0/go.mod h1:DzmP2ZitGvS2k5n43t2zQhFPoCTVwdn5o/8VbbGsOqE=
11901190
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
11911191
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
11921192
github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
@@ -1633,8 +1633,8 @@ golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
16331633
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
16341634
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
16351635
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
1636-
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
1637-
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
1636+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
1637+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
16381638
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
16391639
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
16401640
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎processor/consent.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ type GenericConsentManagementProviderConfig struct {
3737
Filters and returns destinations based on the consents configured for the destination and the user consents present in the event.
3838
3939
Supports legacy and generic consent management.
40+
For GCM based filtering, uses source and destination IDs to fetch the appropriate GCM data from the config.
4041
*/
41-
func (proc *Handle) getConsentFilteredDestinations(event types.SingularEventT, destinations []backendconfig.DestinationT) []backendconfig.DestinationT {
42+
func (proc *Handle) getConsentFilteredDestinations(event types.SingularEventT, sourceID string, destinations []backendconfig.DestinationT) []backendconfig.DestinationT {
4243
// If the event does not have denied consent IDs, do not filter any destinations
4344
consentManagementInfo, err := getConsentManagementInfo(event)
4445
if err != nil {
@@ -52,7 +53,7 @@ func (proc *Handle) getConsentFilteredDestinations(event types.SingularEventT, d
5253

5354
return lo.Filter(destinations, func(dest backendconfig.DestinationT, _ int) bool {
5455
// Generic consent management
55-
if cmpData := proc.getGCMData(dest.ID, consentManagementInfo.Provider); len(cmpData.Consents) > 0 {
56+
if cmpData := proc.getGCMData(sourceID, dest.ID, consentManagementInfo.Provider); len(cmpData.Consents) > 0 {
5657

5758
finalResolutionStrategy := consentManagementInfo.ResolutionStrategy
5859

@@ -103,17 +104,17 @@ func (proc *Handle) getKetchConsentData(destinationID string) []string {
103104
return proc.config.ketchConsentCategoriesMap[destinationID]
104105
}
105106

106-
func (proc *Handle) getGCMData(destinationID, provider string) GenericConsentManagementProviderData {
107+
func (proc *Handle) getGCMData(sourceID, destinationID, provider string) GenericConsentManagementProviderData {
107108
proc.config.configSubscriberLock.RLock()
108109
defer proc.config.configSubscriberLock.RUnlock()
109110

110111
defRetVal := GenericConsentManagementProviderData{}
111-
destinationData, ok := proc.config.destGenericConsentManagementMap[destinationID]
112+
destinationData, ok := proc.config.genericConsentManagementMap[SourceID(sourceID)][DestinationID(destinationID)]
112113
if !ok {
113114
return defRetVal
114115
}
115116

116-
providerData, ok := destinationData[provider]
117+
providerData, ok := destinationData[ConsentProviderKey(provider)]
117118
if !ok {
118119
return defRetVal
119120
}
@@ -161,8 +162,8 @@ func getKetchConsentCategories(dest *backendconfig.DestinationT) []string {
161162
})
162163
}
163164

164-
func getGenericConsentManagementData(dest *backendconfig.DestinationT) (map[string]GenericConsentManagementProviderData, error) {
165-
genericConsentManagementData := make(map[string]GenericConsentManagementProviderData)
165+
func getGenericConsentManagementData(dest *backendconfig.DestinationT) (ConsentProviderMap, error) {
166+
genericConsentManagementData := make(ConsentProviderMap)
166167

167168
if _, ok := dest.Config["consentManagement"]; !ok {
168169
return genericConsentManagementData, nil
@@ -192,7 +193,7 @@ func getGenericConsentManagementData(dest *backendconfig.DestinationT) (map[stri
192193
)
193194

194195
if len(consentIDs) > 0 {
195-
genericConsentManagementData[providerConfig.Provider] = GenericConsentManagementProviderData{
196+
genericConsentManagementData[ConsentProviderKey(providerConfig.Provider)] = GenericConsentManagementProviderData{
196197
ResolutionStrategy: providerConfig.ResolutionStrategy,
197198
Consents: consentIDs,
198199
}

0 commit comments

Comments
 (0)