Undo changes

Author: cezudas

packages/engine/src/lib/resolve-variable.ts

@@ -17,8 +17,6 @@ export async function resolveVariable(
       flowVersion: input.flowVersion,
       stepName: input.stepName,
       stepTestOutputs: input.stepTestOutputs,
-      tablesDatabaseId: input.tablesDatabaseId,
-      tablesDatabaseToken: input.tablesDatabaseToken,
     });
 
     const executionState = await testExecutionContext.stateFromFlowVersion({

packages/engine/test/resolve-variable.test.ts

@@ -16,8 +16,6 @@ describe('resolveVariable', () => {
     engineToken: 'test-engine-token',
     internalApiUrl: 'https://test-api.com',
     publicUrl: 'https://test-public.com',
-    tablesDatabaseId: 1,
-    tablesDatabaseToken: { iv: 'test-iv', data: 'test-data' },
     flowVersion: {
       id: 'flow-version-id',
       flowId: 'flow-id',
@@ -148,8 +146,6 @@ describe('resolveVariable', () => {
         flowVersion: mockInput.flowVersion,
         stepName: mockInput.stepName,
         stepTestOutputs: mockInput.stepTestOutputs,
-        tablesDatabaseId: mockInput.tablesDatabaseId,
-        tablesDatabaseToken: mockInput.tablesDatabaseToken,
       });
 
       expect(mockTestExecutionContext.stateFromFlowVersion).toHaveBeenCalledWith({
@@ -190,8 +186,6 @@ describe('resolveVariable', () => {
         flowVersion: mockInput.flowVersion,
         stepName: mockInput.stepName,
         stepTestOutputs: undefined,
-        tablesDatabaseId: mockInput.tablesDatabaseId,
-        tablesDatabaseToken: mockInput.tablesDatabaseToken,
       });
     });
   });

packages/server/worker/src/lib/api/server-api.service.ts

@@ -19,7 +19,6 @@ import {
   GetBlockRequestQuery,
   GetFlowVersionForWorkerRequest,
   PopulatedFlow,
-  Project,
   RemoveStableJobEngineRequest,
   UpdateRunProgressRequest,
   WorkerMachineHealthcheckRequest,
@@ -87,9 +86,6 @@ export const engineApiService = (engineToken: string) => {
         responseType: 'arraybuffer',
       });
     },
-    async getProject(): Promise<Project> {
-      return client.get<Project>('/v1/worker/project', {});
-    },
     async updateJobStatus(request: UpdateJobRequest): Promise<void> {
       await client.post('/v1/engine/update-job', request);
     },

packages/server/worker/src/lib/engine/engine-runner.ts

@@ -27,12 +27,7 @@ import {
 } from '@openops/shared';
 import chalk from 'chalk';
 
-type EngineConstants =
-  | 'publicUrl'
-  | 'internalApiUrl'
-  | 'engineToken'
-  | 'tablesDatabaseId'
-  | 'tablesDatabaseToken';
+type EngineConstants = 'publicUrl' | 'internalApiUrl' | 'engineToken';
 
 export type CodeArtifact = {
   name: string;

packages/server/worker/src/lib/engine/index.ts

@@ -14,23 +14,18 @@ import {
   ResolveVariableOperation,
   TriggerHookType,
 } from '@openops/shared';
-import { engineApiService } from '../api/server-api.service';
 import { webhookUtils } from '../utils/webhook-utils';
 import { callEngineLambda } from './call-engine';
 import { EngineRunner } from './engine-runner';
 import { blockEngineUtil } from './flow-enginer-util';
 
 export const engineRunner: EngineRunner = {
   async executeFlow(engineToken, operation) {
-    const project = await engineApiService(engineToken).getProject();
-
     const input: ExecuteFlowOperation = {
       ...operation,
       engineToken,
       publicUrl: await networkUtls.getPublicUrl(),
       internalApiUrl: networkUtls.getInternalApiUrl(),
-      tablesDatabaseId: project.tablesDatabaseId,
-      tablesDatabaseToken: project.tablesDatabaseToken,
     };
 
     return callEngineLambda(EngineOperationType.EXECUTE_FLOW, input);
@@ -49,7 +44,6 @@ export const engineRunner: EngineRunner = {
       '[EngineHelper#executeTrigger]',
     );
 
-    const project = await engineApiService(engineToken).getProject();
     const triggerBlock = await blockEngineUtil.getTriggerBlock(
       engineToken,
       operation.flowVersion,
@@ -74,45 +68,34 @@ export const engineRunner: EngineRunner = {
       internalApiUrl: networkUtls.getInternalApiUrl(),
       webhookSecret: await webhookSecretsUtils.getWebhookSecret(lockedVersion),
       engineToken,
-      tablesDatabaseId: project.tablesDatabaseId,
-      tablesDatabaseToken: project.tablesDatabaseToken,
     };
 
     return callEngineLambda(EngineOperationType.EXECUTE_TRIGGER_HOOK, input);
   },
 
   async executeProp(engineToken, operation) {
-    const project = await engineApiService(engineToken).getProject();
-
     const input: ExecutePropsOptions = {
       ...operation,
       publicUrl: await networkUtls.getPublicUrl(),
       internalApiUrl: networkUtls.getInternalApiUrl(),
       engineToken,
-      tablesDatabaseId: project.tablesDatabaseId,
-      tablesDatabaseToken: project.tablesDatabaseToken,
     };
 
     return callEngineLambda(EngineOperationType.EXECUTE_PROPERTY, input);
   },
 
   async executeValidateAuth(engineToken, operation) {
-    const project = await engineApiService(engineToken).getProject();
-
     const input: ExecuteValidateAuthOperation = {
       ...operation,
       publicUrl: await networkUtls.getPublicUrl(),
       internalApiUrl: networkUtls.getInternalApiUrl(),
       engineToken,
-      tablesDatabaseId: project.tablesDatabaseId,
-      tablesDatabaseToken: project.tablesDatabaseToken,
     };
 
     return callEngineLambda(EngineOperationType.EXECUTE_VALIDATE_AUTH, input);
   },
 
   async executeAction(engineToken, operation) {
-    const project = await engineApiService(engineToken).getProject();
     const lockedFlowVersion = await blockEngineUtil.lockBlockInFlowVersion({
       engineToken,
       flowVersion: operation.flowVersion,
@@ -127,23 +110,17 @@ export const engineRunner: EngineRunner = {
       internalApiUrl: networkUtls.getInternalApiUrl(),
       engineToken,
       stepTestOutputs: operation.stepTestOutputs,
-      tablesDatabaseId: project.tablesDatabaseId,
-      tablesDatabaseToken: project.tablesDatabaseToken,
     };
 
     return callEngineLambda(EngineOperationType.EXECUTE_STEP, input);
   },
 
   async executeVariable(engineToken, operation) {
-    const project = await engineApiService(engineToken).getProject();
-
     const input: ResolveVariableOperation = {
       ...operation,
       publicUrl: await networkUtls.getPublicUrl(),
       internalApiUrl: networkUtls.getInternalApiUrl(),
       engineToken,
-      tablesDatabaseId: project.tablesDatabaseId,
-      tablesDatabaseToken: project.tablesDatabaseToken,
     };
 
     return callEngineLambda(EngineOperationType.RESOLVE_VARIABLE, input);

packages/server/worker/src/lib/executors/flow-job-executor.ts

@@ -25,12 +25,7 @@ import {
 import { engineApiService } from '../api/server-api.service';
 import { engineRunner } from '../engine';
 
-type EngineConstants =
-  | 'internalApiUrl'
-  | 'publicUrl'
-  | 'engineToken'
-  | 'tablesDatabaseId'
-  | 'tablesDatabaseToken';
+type EngineConstants = 'internalApiUrl' | 'publicUrl' | 'engineToken';
 
 async function prepareInput(
   flowVersion: FlowVersion,

packages/shared/src/lib/engine/engine-operation.ts

@@ -32,11 +32,6 @@ export enum TriggerHookType {
   TEST = 'TEST',
 }
 
-export type EncryptedDatabaseToken = {
-  iv: string;
-  data: string;
-};
-
 export type EngineOperation =
   | ExecuteStepOperation
   | ExecuteFlowOperation
@@ -51,8 +46,6 @@ export type BaseEngineOperation = {
   engineToken: string;
   internalApiUrl: string;
   publicUrl: string;
-  tablesDatabaseId: number;
-  tablesDatabaseToken: EncryptedDatabaseToken;
 };
 
 export type ExecuteValidateAuthOperation = BaseEngineOperation & {