Skip to content

Commit fbc72dd

Browse files
committed
Merge branch 'mg/encryption' into cezudas/OPS-3021-infrastructure
2 parents 6c517d8 + b8435ba commit fbc72dd

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

packages/engine/src/engine-executor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export async function executeEngine(
1515
): Promise<string> {
1616
const startTime = performance.now();
1717

18-
await encryptionKeyInitializer();
18+
encryptionKeyInitializer();
1919

2020
// TODO: Remove this from the server side
2121
engineInput.publicUrl = await networkUtls.getPublicUrl();

packages/server/api/src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ async function validateEnvPropsOnStartup(): Promise<void> {
6464
);
6565
}
6666

67-
await encryptionKeyInitializer();
67+
void encryptionKeyInitializer();
6868

6969
const jwtSecret = await jwtUtils.getJwtSecret();
7070
if (isNil(jwtSecret)) {

packages/server/api/test/integration/ce/flows/flow-step-test-output.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { encryptUtils, QueueMode } from '@openops/server-shared';
1+
import { encryptUtils } from '@openops/server-shared';
22
import { FlowVersionState, openOpsId } from '@openops/shared';
33
import { FastifyInstance } from 'fastify';
44
import { databaseConnection } from '../../../../src/app/database/database-connection';
@@ -13,7 +13,7 @@ import {
1313
let app: FastifyInstance | null = null;
1414

1515
beforeAll(async () => {
16-
await encryptUtils.loadEncryptionKey(QueueMode.MEMORY);
16+
encryptUtils.loadEncryptionKey();
1717
await databaseConnection().initialize();
1818
app = await setupServer();
1919
});

packages/server/api/test/integration/ce/flows/flow-version.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ let app: FastifyInstance | null = null;
2121

2222
beforeAll(async () => {
2323
await databaseConnection().initialize();
24-
await encryptionKeyInitializer();
24+
void encryptionKeyInitializer();
2525
app = await setupServer();
2626
});
2727

packages/server/shared/src/lib/security/encryption-key-initializer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { encryptUtils } from './encryption';
22

3-
export async function encryptionKeyInitializer(): Promise<void> {
3+
export function encryptionKeyInitializer(): void {
44
const encryptionKey = encryptUtils.loadEncryptionKey();
55
const isValidHexKey =
66
encryptionKey && /^[A-Fa-z0-9]{32}$/.test(encryptionKey);

0 commit comments

Comments
 (0)