Update metadata to include key id (#73)

* Update metadata to include key id * Make keyid unique * Make json files EOL
IABTechLab · Nov 1, 2023 · 61529fd · 61529fd
1 parent 5bb935d
commit 61529fd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/src/main/resources/com.uid2.core/test/clients/clients.json b/src/main/resources/com.uid2.core/test/clients/clients.json
@@ -10,7 +10,8 @@
     ],
     "site_id": 3,
     "key_hash": "poag9K6u2rHmltuQDWeGMb1AsYnfRlxx6aJVtnCJSzvftwcOKV3QzknBhA9tHWHGrjRVQN+9cjifRkDUbD6aWA==",
-    "key_salt": "fYhiujcFuJnfQy8pw4VVeQlSM5fJSmnBVo8KMz+XzF0="
+    "key_salt": "fYhiujcFuJnfQy8pw4VVeQlSM5fJSmnBVo8KMz+XzF0=",
+    "key_id": "test-admin-key"
   },
   {
     "key": "test-mapper-key",
@@ -23,7 +24,8 @@
     ],
     "site_id": 4,
     "key_hash": "dHbN5wd/GUnbON14NGMMLseApTgp9ai/XM9/d7udIz4/SIEzJi4RqCU/TtGxzqah5r21D2537KitOSZMXakagw==",
-    "key_salt": "j9O/NzABFM/mqIU8tEs4nmSdK5vbtcU6LIKoz9VdEQw="
+    "key_salt": "j9O/NzABFM/mqIU8tEs4nmSdK5vbtcU6LIKoz9VdEQw=",
+    "key_id": "test-mapper-key"
   },
   {
     "key": "test-optout-key",
@@ -35,7 +37,8 @@
     ],
     "site_id": 5,
     "key_hash": "DNuG54XqyEypaNrCFqHPAy3e25zIqcofWnvVzprR9r7cBIGOcqA7vSkmLrRezawpyidhJ+Kx1cnK/s/LtlHZPQ==",
-    "key_salt": "3gCfrkODHPBxgyq4XN01Zmv4f0wLJLAl/vdFiXULDXI="
+    "key_salt": "3gCfrkODHPBxgyq4XN01Zmv4f0wLJLAl/vdFiXULDXI=",
+    "key_id": "test-optout-key"
   },
   {
     "key": "trusted-partner-key",
@@ -49,7 +52,8 @@
     ],
     "site_id": 6,
     "key_hash": "v2KvE309S7osPiSakx/MoTKz5K97CkXv6dm80UWdXnbufUPQHFpCE69PGmAIvMzD4dQmmS//F8BbQPKP1REP+Q==",
-    "key_salt": "tg3VfH+bP3I+sjL5xVjSm/1gF9+LHZ2yZkaiOtMU99Q="
+    "key_salt": "tg3VfH+bP3I+sjL5xVjSm/1gF9+LHZ2yZkaiOtMU99Q=",
+    "key_id": "trust"
   },
   {
     "key": "friendly-partner-key",
@@ -63,7 +67,8 @@
     ],
     "site_id": 7,
     "key_hash": "ThnnaO4vxLTyRXhLYnlI3R7gw1EL274uUZ1SHIrI8t+MJ16jYssqbjLHnsA/3dXelbOxgDenDhmuuBMmUUB8tg==",
-    "key_salt": "gRItFk+JXO/d2V9YIJ9pjO7FNBp032/apIi+FlQIq2s="
+    "key_salt": "gRItFk+JXO/d2V9YIJ9pjO7FNBp032/apIi+FlQIq2s=",
+    "key_id": "frien"
   },
   {
     "key": "unfriendly-partner-key",
@@ -77,6 +82,7 @@
     ],
     "site_id": 8,
     "key_hash": "mKz08gn4SRs2kWzGK4S99gAj6Rb9dxS4Cx3ZPdaWZhL0OuUflxwaShfRAKKuD0288FO7Ehm7Qu4RGqf+qHe54A==",
-    "key_salt": "5hnfxqwd+eB/x2fR9DyYLaoXtbX6gibcnxcP2wwc7A8="
+    "key_salt": "5hnfxqwd+eB/x2fR9DyYLaoXtbX6gibcnxcP2wwc7A8=",
+    "key_id": "unfri"
   }
-]
+]
diff --git a/src/main/resources/com.uid2.core/test/operators/operators.json b/src/main/resources/com.uid2.core/test/operators/operators.json
@@ -6,7 +6,8 @@
     "created": 1617149276,
     "protocol": "aws-nitro",
     "key_hash": "YJtxmu8X+y0TPW4akJuaXk3McKfzKdaLT9QI5cChFnPGwLPpnyqyRcDT997xTG6apL8mfCt3DB3ZlnR3qrSNBA==",
-    "key_salt": "W0i/DcKwCqBGD3jN6dNTsFl+tp6akTc3LpEVRuK5OB0="
+    "key_salt": "W0i/DcKwCqBGD3jN6dNTsFl+tp6akTc3LpEVRuK5OB0=",
+    "key_id": "test-partner-key"
   },
   {
     "key": "test-gcp-key",
@@ -15,7 +16,8 @@
     "created": 1617149276,
     "protocol": "gcp-vmid",
     "key_hash": "+8Vp3bOKibg7PpWomCtolqZu3uRqR7G5DLcAwvt9n2ZqkWAdmPGoXuQMcEBAmE/nAslF7eA+VwXLp7zN40IZkA==",
-    "key_salt": "uJYzyAZujZ6QOatbwEB9/+/sgXe3jvPvYaULNANxgkQ="
+    "key_salt": "uJYzyAZujZ6QOatbwEB9/+/sgXe3jvPvYaULNANxgkQ=",
+    "key_id": "test-gcp-key"
   },
   {
     "key": "test-gcp-key-2",
@@ -24,7 +26,8 @@
     "created": 1617149276,
     "protocol": "gcp-oidc",
     "key_hash": "nF2JfhBwEd1J9W2aiO2XWBnVGWaTHKzmq5WadU9GFC+gHjkFhkT4sG0boNG76fZQpBjQWYcCEhWFNPCBje52iA==",
-    "key_salt": "WSwyr8znzT0Yj/QiSRGZlsPz2lUIfRuO5FSpl89biiI="
+    "key_salt": "WSwyr8znzT0Yj/QiSRGZlsPz2lUIfRuO5FSpl89biiI=",
+    "key_id": "test-gcp-key-2"
   },
   {
     "key": "test-azure-key",
@@ -33,7 +36,8 @@
     "created": 1617149276,
     "protocol": "azure-cc",
     "key_hash": "9hmTDqMPlR7Y6mnCDKWFOWGCK8uepsg/s6pCHPCqL16ziQ8OvUSpTlqOERJJkcyvZLRShgNVbafPO66TH91Vkw==",
-    "key_salt": "VhOxETeT1+hvq8y2YRCpdcPg0JrHkBfZXI58twuohGY="
+    "key_salt": "VhOxETeT1+hvq8y2YRCpdcPg0JrHkBfZXI58twuohGY=",
+    "key_id": "test-azure-key"
   },
   {
     "key": "trusted-partner-key",
@@ -44,7 +48,8 @@
     "operator_type": "PUBLIC",
     "site_id": 10,
     "key_hash": "aGVkzavynvr6cX/kAqLSCHTlKPdumakBh0M0ysUyUVr6CiX2nSph0OlPXKzb02NZwKxnx1UQrRc5WOZTygpIVg==",
-    "key_salt": "DBQn4VlAN3CvS/2HPSvsKgBAmfctp23JjDe3Z4vBmWs="
+    "key_salt": "DBQn4VlAN3CvS/2HPSvsKgBAmfctp23JjDe3Z4vBmWs=",
+    "key_id": "trusted-partner-key"
   },
   {
     "key": "trusted-partner-key-2",
@@ -55,6 +60,7 @@
     "operator_type": "PRIVATE",
     "site_id": 11,
     "key_hash": "ty2mA34ZzTtrRhEl4cJZWAPmDu+xbAijCFWPvYOtRweBvcWS1pqzVLUVhXE+QllnOWS8vpRmdMo0VDgBMiCA8w==",
-    "key_salt": "MXolvY4RSkGZjd0GpexZvywZq887C5BgMYapF5UhHB0="
+    "key_salt": "MXolvY4RSkGZjd0GpexZvywZq887C5BgMYapF5UhHB0=",
+    "key_id": "trusted-partner-key-2"
   }
-]
+]