Merge pull request #3111 from Infisical/daniel/minor-improvements

fix: minor improvements

backend/src/db/migrations/20250210101840_webhook-to-kms.ts

@@ -53,10 +53,13 @@ export async function up(knex: Knex): Promise<void> {
     webhooks.map(async (el) => {
       let projectKmsService = projectEncryptionRingBuffer.getItem(el.projectId);
       if (!projectKmsService) {
-        projectKmsService = await kmsService.createCipherPairWithDataKey({
+        projectKmsService = await kmsService.createCipherPairWithDataKey(
+          {
             type: KmsDataKey.SecretManager,
             projectId: el.projectId
-        }, knex);
+          },
+          knex
+        );
         projectEncryptionRingBuffer.push(el.projectId, projectKmsService);
       }
 

backend/src/db/migrations/20250210101841_dynamic-secret-root-to-kms.ts

@@ -46,10 +46,13 @@ export async function up(knex: Knex): Promise<void> {
     dynamicSecretRootCredentials.map(async ({ projectId, ...el }) => {
       let projectKmsService = projectEncryptionRingBuffer.getItem(projectId);
       if (!projectKmsService) {
-        projectKmsService = await kmsService.createCipherPairWithDataKey({
+        projectKmsService = await kmsService.createCipherPairWithDataKey(
+          {
             type: KmsDataKey.SecretManager,
             projectId
-        }, knex);
+          },
+          knex
+        );
         projectEncryptionRingBuffer.push(projectId, projectKmsService);
       }
 

backend/src/db/migrations/20250210101841_secret-rotation-to-kms.ts

@@ -39,10 +39,13 @@ export async function up(knex: Knex): Promise<void> {
     secretRotations.map(async ({ projectId, ...el }) => {
       let projectKmsService = projectEncryptionRingBuffer.getItem(projectId);
       if (!projectKmsService) {
-        projectKmsService = await kmsService.createCipherPairWithDataKey({
+        projectKmsService = await kmsService.createCipherPairWithDataKey(
+          {
             type: KmsDataKey.SecretManager,
             projectId
-        }, knex);
+          },
+          knex
+        );
         projectEncryptionRingBuffer.push(projectId, projectKmsService);
       }
 

backend/src/db/migrations/20250210101842_identity-k8-auth-to-kms.ts

@@ -78,14 +78,24 @@ const reencryptIdentityK8sAuth = async (knex: Knex) => {
 
   const updatedIdentityKubernetesConfigs = [];
 
-    for (const { encryptedSymmetricKey, symmetricKeyKeyEncoding, symmetricKeyTag, symmetricKeyIV, orgId, ...el } of identityKubernetesConfigs) {
+  for await (const {
+    encryptedSymmetricKey,
+    symmetricKeyKeyEncoding,
+    symmetricKeyTag,
+    symmetricKeyIV,
+    orgId,
+    ...el
+  } of identityKubernetesConfigs) {
     let orgKmsService = orgEncryptionRingBuffer.getItem(orgId);
 
     if (!orgKmsService) {
-        orgKmsService = await kmsService.createCipherPairWithDataKey({
+      orgKmsService = await kmsService.createCipherPairWithDataKey(
+        {
           type: KmsDataKey.Organization,
           orgId
-        }, knex);
+        },
+        knex
+      );
       orgEncryptionRingBuffer.push(orgId, orgKmsService);
     }
 

backend/src/db/migrations/20250210101842_identity-oidc-auth-to-kms.ts

@@ -62,10 +62,13 @@ const reencryptIdentityOidcAuth = async (knex: Knex) => {
       async ({ encryptedSymmetricKey, symmetricKeyKeyEncoding, symmetricKeyTag, symmetricKeyIV, orgId, ...el }) => {
         let orgKmsService = orgEncryptionRingBuffer.getItem(orgId);
         if (!orgKmsService) {
-          orgKmsService = await kmsService.createCipherPairWithDataKey({
+          orgKmsService = await kmsService.createCipherPairWithDataKey(
+            {
               type: KmsDataKey.Organization,
               orgId
-          }, knex);
+            },
+            knex
+          );
           orgEncryptionRingBuffer.push(orgId, orgKmsService);
         }
         const key = infisicalSymmetricDecrypt({

backend/src/db/migrations/20250210101845_directory-config-to-kms.ts

@@ -49,10 +49,13 @@ const reencryptSamlConfig = async (knex: Knex) => {
       async ({ encryptedSymmetricKey, symmetricKeyKeyEncoding, symmetricKeyTag, symmetricKeyIV, ...el }) => {
         let orgKmsService = orgEncryptionRingBuffer.getItem(el.orgId);
         if (!orgKmsService) {
-          orgKmsService = await kmsService.createCipherPairWithDataKey({
+          orgKmsService = await kmsService.createCipherPairWithDataKey(
+            {
               type: KmsDataKey.Organization,
               orgId: el.orgId
-          }, knex);
+            },
+            knex
+          );
           orgEncryptionRingBuffer.push(el.orgId, orgKmsService);
         }
         const key = infisicalSymmetricDecrypt({
@@ -204,10 +207,13 @@ const reencryptLdapConfig = async (knex: Knex) => {
       async ({ encryptedSymmetricKey, symmetricKeyKeyEncoding, symmetricKeyTag, symmetricKeyIV, ...el }) => {
         let orgKmsService = orgEncryptionRingBuffer.getItem(el.orgId);
         if (!orgKmsService) {
-          orgKmsService = await kmsService.createCipherPairWithDataKey({
+          orgKmsService = await kmsService.createCipherPairWithDataKey(
+            {
               type: KmsDataKey.Organization,
               orgId: el.orgId
-          }, knex);
+            },
+            knex
+          );
           orgEncryptionRingBuffer.push(el.orgId, orgKmsService);
         }
         const key = infisicalSymmetricDecrypt({
@@ -353,10 +359,13 @@ const reencryptOidcConfig = async (knex: Knex) => {
       async ({ encryptedSymmetricKey, symmetricKeyKeyEncoding, symmetricKeyTag, symmetricKeyIV, ...el }) => {
         let orgKmsService = orgEncryptionRingBuffer.getItem(el.orgId);
         if (!orgKmsService) {
-          orgKmsService = await kmsService.createCipherPairWithDataKey({
+          orgKmsService = await kmsService.createCipherPairWithDataKey(
+            {
               type: KmsDataKey.Organization,
               orgId: el.orgId
-          }, knex);
+            },
+            knex
+          );
           orgEncryptionRingBuffer.push(el.orgId, orgKmsService);
         }
         const key = infisicalSymmetricDecrypt({

backend/src/ee/services/group/group-dal.ts

@@ -111,7 +111,7 @@ export const groupDALFactory = (db: TDbClient) => {
       }
 
       if (search) {
-        void query.andWhereRaw(`CONCAT_WS(' ', "firstName", "lastName", "username") ilike '%${search}%'`);
+        // void query.andWhereRaw(`CONCAT_WS(' ', "firstName", "lastName", "username") ilike '%${search}%'`);
       } else if (username) {
         void query.andWhere(`${TableName.Users}.username`, "ilike", `%${username}%`);
       }