Fix merge conflicts

backend/src/utils/addDevelopmentUser.ts

@@ -5,6 +5,7 @@
 ************************************************************************************************/
 
 import { Key, Membership, MembershipOrg, Organization, User, Workspace } from "../models";
+import { SecretService } from "../services";
 import { Types } from 'mongoose';
 import { getNodeEnv } from '../config';
 
@@ -119,7 +120,12 @@ export const createTestUserForDevelopment = async () => {
       // create workspace if not exist 
       const workspaceInDB = await Workspace.findById(testWorkspaceId)
       if (!workspaceInDB) {
-        await Workspace.create(testWorkspace)
+        const workspace = await Workspace.create(testWorkspace)
+        
+        // initialize blind index salt for workspace
+        await SecretService.createSecretBlindIndexData({
+          workspaceId: workspace._id
+        });
       }
 
       // create workspace key if not exist

backend/src/utils/setup/index.ts

@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/node';
 import { DatabaseService, TelemetryService } from '../../services';
 import { setTransporter } from '../../helpers/nodemailer';
+import { EELicenseService } from '../../ee/services';
 import { initSmtp } from '../../services/smtp';
 import { createTestUserForDevelopment } from '../addDevelopmentUser'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -28,6 +29,7 @@ import {
  * Prepare Infisical upon startup. This includes tasks like:
  * - Log initial telemetry message
  * - Initializing SMTP configuration
+ * - Initializing the instance global feature set (if applicable)
  * - Initializing the database connection
  * - Initializing Sentry
  * - Backfilling data
@@ -41,6 +43,9 @@ export const setup = async () => {
     // initializing SMTP configuration
     setTransporter(await initSmtp());
     
+    // initializing global feature set
+    await EELicenseService.initGlobalFeatureSet();
+    
     // initializing the database connection
     await DatabaseService.initDatabase(await getMongoURL());
     

backend/src/utils/setup/reencryptData.ts

@@ -78,8 +78,6 @@ export const reencryptSecretBlindIndexDataSalts = async () => {
     const encryptionKey = await getEncryptionKey();
     const rootEncryptionKey = await getRootEncryptionKey();
 
-    // 2. re-encrypt secret blind index salts under ROOT_ENCRYPTION_KEY
-
     if (encryptionKey && rootEncryptionKey) {
         const secretBlindIndexData = await SecretBlindIndexData.find({
             algorithm: ALGORITHM_AES_256_GCM,

backend/src/utils/setup/validateConfig.ts

@@ -22,14 +22,6 @@ export const validateEncryptionKeysConfig = async () => {
     const encryptionKey = await getEncryptionKey();
     const rootEncryptionKey = await getRootEncryptionKey();
     
-    // TODO: handle case where either of keys can be empty strings
-    // and it would actually count as being defined for encryption
-    // within the application
-    
-    // console.log('validateEncryptionKeysConfig');
-    // console.log('encryptionKey: ', encryptionKey);
-    // console.log('rootEncryptionKey: ', rootEncryptionKey);
-    
     if (
         (encryptionKey === undefined || encryptionKey === "") &&
         (rootEncryptionKey === undefined || rootEncryptionKey === "")