Merge branch 'master' into kessplas/drop-ie-11

Author: kessplas

modules/branch-keystore-node/test/fixtures.ts

@@ -18,7 +18,7 @@ import {
 export const DDB_TABLE_NAME = 'KeyStoreDdbTable'
 export const LOGICAL_KEYSTORE_NAME = DDB_TABLE_NAME
 export const BRANCH_KEY_ID = '3f43a9af-08c5-4317-b694-3d3e883dcaef'
-export const BRANCH_KEY_ACTIVE_VERSION = 'a4905627-4b7f-4272-a847-f50dae245737'
+export const BRANCH_KEY_ACTIVE_VERSION = 'caf0c508-e64d-4b6c-bffe-381cbc546c02'
 export const BRANCH_KEY_ID_WITH_EC = '4bb57643-07c1-419e-92ad-0df0df149d7c'
 export const BRANCH_KEY_ACTIVE_VERSION_UTF8_BYTES = Buffer.from(
   BRANCH_KEY_ACTIVE_VERSION,
@@ -39,7 +39,7 @@ export const LYING_BRANCH_KEY_DECRYPT_ONLY_VERSION =
 
 // may not be active currently, but serves structural purpose
 const ENCRYPTED_ACTIVE_BRANCH_KEY_CIPHERTEXT_BASE64 =
-  'AQICAHhTIzkciiF5TDB8qaCjctFmv6Dx+AQICAHhTIzkciiF5TDB8qaCjctFmv6Dx+4yjarauOA4MtH0jwgFHXGFS6janEEbpRnd0qbBJAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMQLI9FLotey+qbs/CAgEQgDtqHnL1epEEpixeJCOG16V4cozeww9wMc82h7SSvXHP9PHTycAScLYZi2YICMka+QnZmPj4qP/9mb1xWQ==/7VWpSPAgEQgDuxKdGTboqxDhxBV1FQUVia8OFaQsLlPkuhwgc82tMhH9T2vAvsHGZPyPoK8zCG2xEjo3KIos8N1YK7mA=='
+  'AQICAHhTIzkciiF5TDB8qaCjctFmv6Dx+4yjarauOA4MtH0jwgFrAysFMwuTXIlzPuKZBKlPAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMPOLzNZ+AMDyjR071AgEQgDvqeTDjLIQknoIIXMr3Q3/HepXoFcbGIzT8zhJYUlEFYm5P972/EWbYRlMQdsftQ4SUkLpL0+R3PS+7FA=='
 const ENCRYPTED_ACTIVE_BRANCH_KEY_CIPHERTEXT = new Uint8Array(
   // @ts-ignore
   Buffer.from(ENCRYPTED_ACTIVE_BRANCH_KEY_CIPHERTEXT_BASE64, 'base64')
@@ -51,7 +51,7 @@ export const ENCRYPTED_ACTIVE_BRANCH_KEY = new EncryptedHierarchicalKey(
     [TYPE_FIELD]: BRANCH_KEY_ACTIVE_TYPE,
     [BRANCH_KEY_ACTIVE_VERSION_FIELD]:
       `branch:version:${BRANCH_KEY_ACTIVE_VERSION}` as BranchKeyVersionType,
-    [KEY_CREATE_TIME_FIELD]: '2025-04-04T22:29:59.000549Z',
+    [KEY_CREATE_TIME_FIELD]: '2026-03-09T22:46:57.871000Z',
     [HIERARCHY_VERSION_FIELD]: '1',
     [KMS_FIELD]: KEY_ARN,
     [TABLE_FIELD]: LOGICAL_KEYSTORE_NAME,
@@ -60,7 +60,7 @@ export const ENCRYPTED_ACTIVE_BRANCH_KEY = new EncryptedHierarchicalKey(
 )
 
 const ENCRYPTED_VERSION_BRANCH_KEY_CIPHERTEXT_BASE64 =
-  'AQIBAHhTIzkciiF5TDB8qaCjctFmv6Dx+4yjarauOA4MtH0jwgHZhG1KfZ/k1VQMBZzo0X+GAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMG5wDTuB2qzfR/mOKAgEQgDtbcAO39/bHj6BGaqgZTd3DSKHmpORsoaHLilWhAHryOlSjAiXK1NZxil7hOLcxjBzKE0QsMAaWJVtwag=='
+  'AQIBAHhTIzkciiF5TDB8qaCjctFmv6Dx+4yjarauOA4MtH0jwgElsc+vieODk1/lpgx33YonAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMxajcxtSzD9dRiQK7AgEQgDs2f+mmWMql5NujKIPdvBX/zxNiOlUQAJcZfMZfqVyLWdPE+g9qbHJu0fs7nIY3xDglQvwE1MCaw+vsNQ=='
 const ENCRYPTED_VERSION_BRANCH_KEY_CIPHERTEXT = new Uint8Array(
   // @ts-ignore
   Buffer.from(ENCRYPTED_VERSION_BRANCH_KEY_CIPHERTEXT_BASE64, 'base64')
@@ -71,7 +71,7 @@ export const ENCRYPTED_VERSION_BRANCH_KEY = new EncryptedHierarchicalKey(
     [BRANCH_KEY_IDENTIFIER_FIELD]: BRANCH_KEY_ID,
     [TYPE_FIELD]:
       `branch:version:${BRANCH_KEY_ACTIVE_VERSION}` as BranchKeyVersionType,
-    [KEY_CREATE_TIME_FIELD]: '2025-04-04T22:29:59.000549Z',
+    [KEY_CREATE_TIME_FIELD]: '2026-03-09T22:46:57.871000Z',
     [HIERARCHY_VERSION_FIELD]: '1',
     [KMS_FIELD]: KEY_ARN,
     [TABLE_FIELD]: LOGICAL_KEYSTORE_NAME,
@@ -84,7 +84,7 @@ export const ACTIVE_BRANCH_KEY: BranchKeyRecord = {
   [TYPE_FIELD]: BRANCH_KEY_ACTIVE_TYPE,
   [BRANCH_KEY_ACTIVE_VERSION_FIELD]:
     `branch:version:${BRANCH_KEY_ACTIVE_VERSION}` as BranchKeyVersionType,
-  [KEY_CREATE_TIME_FIELD]: '2025-04-04T22:29:59.000549Z',
+  [KEY_CREATE_TIME_FIELD]: '2026-03-09T22:46:57.871000Z',
   [HIERARCHY_VERSION_FIELD]: 1,
   [KMS_FIELD]: KEY_ARN,
   [BRANCH_KEY_FIELD]: ENCRYPTED_ACTIVE_BRANCH_KEY_CIPHERTEXT,
@@ -94,7 +94,7 @@ export const VERSION_BRANCH_KEY: BranchKeyRecord = {
   [BRANCH_KEY_IDENTIFIER_FIELD]: BRANCH_KEY_ID,
   [TYPE_FIELD]:
     `branch:version:${BRANCH_KEY_ACTIVE_VERSION}` as BranchKeyVersionType,
-  [KEY_CREATE_TIME_FIELD]: '2025-04-04T22:29:59.000549Z',
+  [KEY_CREATE_TIME_FIELD]: '2026-03-09T22:46:57.871000Z',
   [HIERARCHY_VERSION_FIELD]: 1,
   [KMS_FIELD]: KEY_ARN,
   [BRANCH_KEY_FIELD]: ENCRYPTED_VERSION_BRANCH_KEY_CIPHERTEXT,

modules/kms-keyring-node/test/fixtures.ts

@@ -11,7 +11,7 @@ import {
 export const DDB_TABLE_NAME = 'KeyStoreDdbTable'
 export const LOGICAL_KEYSTORE_NAME = DDB_TABLE_NAME
 export const BRANCH_KEY_ID = '3f43a9af-08c5-4317-b694-3d3e883dcaef'
-export const BRANCH_KEY_ACTIVE_VERSION = 'a4905627-4b7f-4272-a847-f50dae245737'
+export const BRANCH_KEY_ACTIVE_VERSION = 'caf0c508-e64d-4b6c-bffe-381cbc546c02'
 export const BRANCH_KEY_ID_WITH_EC = '4bb57643-07c1-419e-92ad-0df0df149d7c'
 
 export const KEY_ARN =