Update proxy_pass in Nginx configuration

Delete unused files and dependencies
Update API hostname in WorkflowService
Update API hostname in AnalyticsDatabaseService

.github/workflows/compile.yml

@@ -178,20 +178,6 @@ jobs:
       - run: cd CommonUI && npm install --force
       - run: cd StatusPage && npm install && npm run compile && npm run dep-check
 
-  compile-workflow:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd Workflow && npm install && npm run compile && npm run dep-check
-
   compile-test-server:
     runs-on: ubuntu-latest
     env:

.github/workflows/docker-build.yml

@@ -148,21 +148,6 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./StatusPage/Dockerfile .
 
-  docker-build-workflow:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-
-      # build image for mail service
-      - name: build docker image
-        run: sudo docker build -f ./Workflow/Dockerfile .
-
 
   docker-build-test-server:
     runs-on: ubuntu-latest

App/FeatureSet/Workflow/Index.ts

@@ -0,0 +1,67 @@
+import Express, {
+    ExpressApplication,
+    ExpressRequest,
+    ExpressResponse,
+} from 'CommonServer/Utils/Express';
+import logger from 'CommonServer/Utils/Logger';
+import ManualAPI from './API/Manual';
+import ComponentCode from './API/ComponentCode';
+import { QueueJob, QueueName } from 'CommonServer/Infrastructure/Queue';
+import QueueWorker from 'CommonServer/Infrastructure/QueueWorker';
+import RunWorkflow from './Services/RunWorkflow';
+import { JSONObject } from 'Common/Types/JSON';
+import ObjectID from 'Common/Types/ObjectID';
+import WorkflowAPI from './API/Workflow';
+
+const APP_NAME: string = 'api/workflow';
+
+const app: ExpressApplication = Express.getExpressApp();
+
+app.use(`/${APP_NAME}/manual`, new ManualAPI().router);
+
+app.use(`/${APP_NAME}`, new WorkflowAPI().router);
+
+app.get(
+    `/${APP_NAME}/docs/:componentName`,
+    (req: ExpressRequest, res: ExpressResponse) => {
+        res.sendFile(
+            __dirname +
+            '/Docs/ComponentDocumentation/' +
+            req.params['componentName']
+        );
+    }
+);
+
+app.use(`/${APP_NAME}`, new ComponentCode().router);
+
+const WorkflowFeatureSet = {
+
+    init: async (): Promise<void> => {
+        try {
+
+        
+            // Job process.
+            QueueWorker.getWorker(
+                QueueName.Workflow,
+                async (job: QueueJob) => {
+                    await new RunWorkflow().runWorkflow({
+                        workflowId: new ObjectID(job.data['workflowId'] as string),
+                        workflowLogId: job.data['workflowLogId']
+                            ? new ObjectID(job.data['workflowLogId'] as string)
+                            : null,
+                        arguments: job.data.data as JSONObject,
+                        timeout: 5000,
+                    });
+                },
+                { concurrency: 10 }
+            );
+        } catch (err) {
+            logger.error('App Init Failed:');
+            logger.error(err);
+            throw err;
+        }
+    }
+}
+
+
+export default WorkflowFeatureSet;

CommonServer/Services/AnalyticsDatabaseService.ts

@@ -24,7 +24,7 @@ import Exception from 'Common/Types/Exception/Exception';
 import API from 'Common/Utils/API';
 import URL from 'Common/Types/API/URL';
 import Protocol from 'Common/Types/API/Protocol';
-import { WorkflowHostname } from '../EnvironmentConfig';
+import { AppApiHostname } from '../EnvironmentConfig';
 import Route from 'Common/Types/API/Route';
 import { WorkflowRoute } from 'Common/ServiceRoute';
 import Text from 'Common/Types/Text';
@@ -775,9 +775,9 @@ export default class AnalyticsDatabaseService<
             API.post(
                 new URL(
                     Protocol.HTTP,
-                    WorkflowHostname,
+                    AppApiHostname,
                     new Route(
-                        `${WorkflowRoute.toString()}/analytics-model/${projectId.toString()}/${Text.pascalCaseToDashes(
+                        `/api/${WorkflowRoute.toString()}/analytics-model/${projectId.toString()}/${Text.pascalCaseToDashes(
                             this.getModel().tableName!
                         )}/${triggerType}`
                     )

CommonServer/Services/DatabaseService.ts

@@ -23,7 +23,7 @@ import PostgresDatabase, {
 import { DataSource, Repository, SelectQueryBuilder } from 'typeorm';
 import ObjectID from 'Common/Types/ObjectID';
 import SortOrder from 'Common/Types/BaseDatabase/SortOrder';
-import { EncryptionSecret, WorkflowHostname } from '../EnvironmentConfig';
+import { EncryptionSecret, AppApiHostname } from '../EnvironmentConfig';
 import { WorkflowRoute } from 'Common/ServiceRoute';
 import HashedString from 'Common/Types/HashedString';
 import UpdateByID from '../Types/Database/UpdateByID';
@@ -559,9 +559,9 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
             API.post(
                 new URL(
                     Protocol.HTTP,
-                    WorkflowHostname,
+                    AppApiHostname,
                     new Route(
-                        `${WorkflowRoute.toString()}/model/${projectId.toString()}/${Text.pascalCaseToDashes(
+                        `/api/${WorkflowRoute.toString()}/model/${projectId.toString()}/${Text.pascalCaseToDashes(
                             this.getModel().tableName!
                         )}/${triggerType}`
                     )

CommonServer/Services/WorkflowService.ts

@@ -13,7 +13,7 @@ import API from 'Common/Utils/API';
 import EmptyResponseData from 'Common/Types/API/EmptyResponse';
 import URL from 'Common/Types/API/URL';
 import Protocol from 'Common/Types/API/Protocol';
-import { WorkflowHostname } from '../EnvironmentConfig';
+import { AppApiHostname } from '../EnvironmentConfig';
 import Route from 'Common/Types/API/Route';
 import ClusterKeyAuthorization from '../Middleware/ClusterKeyAuthorization';
 
@@ -67,8 +67,8 @@ export class Service extends DatabaseService<Model> {
         await API.post<EmptyResponseData>(
             new URL(
                 Protocol.HTTP,
-                WorkflowHostname,
-                new Route('/workflow/update/' + onUpdate.updateBy.query._id!)
+                AppApiHostname,
+                new Route('/api/workflow/update/' + onUpdate.updateBy.query._id!)
             ),
             {},
             {

Nginx/default.conf.template

@@ -561,7 +561,7 @@ server {
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
-        proxy_pass http://workflow;
+        proxy_pass http://app/api/workflow;
 
         client_max_body_size 50M;
     }

Workflow/.dockerignore

@@ -1,56 +0,0 @@
-.git
-
-node_modules
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-node_modules
-
-.idea
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-
-env.js
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-yarn.lock
-Untitled-1
-*.local.sh
-*.local.yaml
-run
-stop
-
-nohup.out*
-
-encrypted-credentials.tar
-encrypted-credentials/
-
-_README.md
-
-# Important Add production values to gitignore.
-values-saas-production.yaml
-kubernetes/values-saas-production.yaml
-
-/private
-
-/tls_cert.pem
-/tls_key.pem
-/keys
-
-temp_readme.md
-
-tests/coverage
-
-settings.json
-
-GoSDK/tester/

Workflow/Dockerfile.tpl

@@ -1,75 +0,0 @@
-#
-# OneUptime-Workflow Dockerfile
-#
-
-# Pull base image nodejs image.
-FROM node:21.2-alpine3.18
-USER root
-RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
-
-
-ARG GIT_SHA
-ARG APP_VERSION
-
-ENV GIT_SHA=${GIT_SHA}
-ENV APP_VERSION=${APP_VERSION}
-
-
-# Install bash. 
-RUN apk add bash && apk add curl
-
-
-# Install python
-RUN apk update && apk add --no-cache --virtual .gyp python3 make g++
-
-#Use bash shell by default
-SHELL ["/bin/bash", "-c"]
-
-
-RUN mkdir /usr/src
-
-WORKDIR /usr/src/Common
-COPY ./Common/package*.json /usr/src/Common/
-RUN npm install
-COPY ./Common /usr/src/Common
-
-
-WORKDIR /usr/src/Model
-COPY ./Model/package*.json /usr/src/Model/
-RUN npm install
-COPY ./Model /usr/src/Model
-
-
-WORKDIR /usr/src/CommonServer
-COPY ./CommonServer/package*.json /usr/src/CommonServer/
-RUN npm install
-COPY ./CommonServer /usr/src/CommonServer
-
-
-
-ENV PRODUCTION=true
-
-WORKDIR /usr/src/app
-
-# Install app dependencies
-COPY ./Workflow/package*.json /usr/src/app/
-RUN npm install
-
-
-# Expose ports.
-#   - 3088: OneUptime-Workflow
-EXPOSE 3088
-
-{{ if eq .Env.ENVIRONMENT "development" }}
-#Run the app
-CMD [ "npm", "run", "dev" ]
-{{ else }}
-# Copy app source
-COPY ./Workflow /usr/src/app
-# Bundle app source
-RUN npm run compile
-#Run the app
-CMD [ "npm", "start" ]
-{{ end }}
-
-

Workflow/Index.ts

@@ -1,86 +0,0 @@
-import Express, {
-    ExpressApplication,
-    ExpressRequest,
-    ExpressResponse,
-} from 'CommonServer/Utils/Express';
-import App from 'CommonServer/Utils/StartServer';
-import { PostgresAppInstance } from 'CommonServer/Infrastructure/PostgresDatabase';
-import Redis from 'CommonServer/Infrastructure/Redis';
-import logger from 'CommonServer/Utils/Logger';
-import ManualAPI from './API/Manual';
-import ComponentCode from './API/ComponentCode';
-import { QueueJob, QueueName } from 'CommonServer/Infrastructure/Queue';
-import QueueWorker from 'CommonServer/Infrastructure/QueueWorker';
-import RunWorkflow from './Services/RunWorkflow';
-import { JSONObject } from 'Common/Types/JSON';
-import ObjectID from 'Common/Types/ObjectID';
-import WorkflowAPI from './API/Workflow';
-import { ClickhouseAppInstance } from 'CommonServer/Infrastructure/ClickhouseDatabase';
-
-const APP_NAME: string = 'workflow';
-
-const app: ExpressApplication = Express.getExpressApp();
-
-app.use(`/${APP_NAME}/manual`, new ManualAPI().router);
-
-app.use(`/${APP_NAME}`, new WorkflowAPI().router);
-
-app.get(
-    `/${APP_NAME}/docs/:componentName`,
-    (req: ExpressRequest, res: ExpressResponse) => {
-        res.sendFile(
-            __dirname +
-                '/Docs/ComponentDocumentation/' +
-                req.params['componentName']
-        );
-    }
-);
-
-const init: () => Promise<void> = async (): Promise<void> => {
-    try {
-        // connect to the database.
-        await PostgresAppInstance.connect(
-            PostgresAppInstance.getDatasourceOptions()
-        );
-
-        app.use(`/${APP_NAME}`, new ComponentCode().router);
-
-        // init the app
-        await App(APP_NAME);
-
-        // connect redis
-        await Redis.connect();
-
-        await ClickhouseAppInstance.connect(
-            ClickhouseAppInstance.getDatasourceOptions()
-        );
-
-        // Job process.
-        QueueWorker.getWorker(
-            QueueName.Workflow,
-            async (job: QueueJob) => {
-                await new RunWorkflow().runWorkflow({
-                    workflowId: new ObjectID(job.data['workflowId'] as string),
-                    workflowLogId: job.data['workflowLogId']
-                        ? new ObjectID(job.data['workflowLogId'] as string)
-                        : null,
-                    arguments: job.data.data as JSONObject,
-                    timeout: 5000,
-                });
-            },
-            { concurrency: 10 }
-        );
-    } catch (err) {
-        logger.error('App Init Failed:');
-        logger.error(err);
-        throw err;
-    }
-};
-
-init().catch((err: Error) => {
-    logger.error(err);
-    logger.info('Exiting node process');
-    process.exit(1);
-});
-
-export default app;

Workflow/nodemon.json

@@ -1,5 +0,0 @@
-{
-"watch": ["./","../Common", "../CommonServer", "../Model"],
-    "ext": "ts,json,tsx,env,js,jsx,hbs",
-    "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
-}

Workflow/package.json

@@ -1,29 +0,0 @@
-{
-  "name": "workflows",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "start": "node --require ts-node/register Index.ts",
-    "compile": "tsc",
-    "clear-modules": "rm -rf node_modules && rm package-lock.json && npm install",
-    "dev": "npx nodemon",
-    "audit": "npm audit --audit-level=low",
-    "dep-check": "npm install -g depcheck && depcheck ./ --skip-missing=true",
-    "test": "jest --detectOpenHandles",
-    "coverage": "jest --detectOpenHandles --coverage"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "Common": "file:../Common",
-    "CommonServer": "file:../CommonServer",
-    "Model": "file:../Model",
-    "ts-node": "^10.9.1"
-  },
-  "devDependencies": {
-    "@types/node": "^17.0.31",
-    "jest": "^28.1.0",
-    "nodemon": "^2.0.20"
-  }
-}

Workflow/tsconfig.json

@@ -1,110 +0,0 @@
-{
-    "ts-node": {
-        // these options are overrides used only by ts-node
-        // same as the --compilerOptions flag and the TS_NODE_COMPILER_OPTIONS environment variable
-        "compilerOptions": {
-            "module": "commonjs"
-        }
-    },
-    "compilerOptions": {
-        /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-        /* Projects */
-        // "incremental": true,                              /* Enable incremental compilation */
-        // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-        // "tsBuildInfoFile": "./",                          /* Specify the folder for .tsbuildinfo incremental compilation files. */
-        // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects */
-        // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-        // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
-        /* Language and Environment */
-        "target": "es2017" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
-        // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-        "jsx": "react" /* Specify what JSX code is generated. */,
-        "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
-        "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-        // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
-        // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-        // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
-        // "reactNamespace": "",                             /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
-        // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-        // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-
-        /* Modules */
-        // "module": "es2022" /* Specify what module code is generated. */,
-        "rootDir": "",                                  /* Specify the root folder within your source files. */
-        "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
-        // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-        // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-        // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-        "typeRoots": [
-            "./node_modules/@types"
-        ], /* Specify multiple folders that act like `./node_modules/@types`. */
-        "types": ["node"],                                      /* Specify type package names to be included without being referenced in a source file. */
-        // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
-        // "resolveJsonModule": true,                        /* Enable importing .json files */
-        // "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
-
-        /* JavaScript Support */
-        // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
-        // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
-        // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
-
-        /* Emit */
-        // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-        // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-        // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-        "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
-        // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
-        "outDir": "build/dist",                                   /* Specify an output folder for all emitted files. */
-        // "removeComments": true,                           /* Disable emitting comments. */
-        // "noEmit": true,                                   /* Disable emitting files from a compilation. */
-        // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-        // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
-        // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-        // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-        // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-        // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-        // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-        // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-        // "newLine": "crlf",                                /* Set the newline character for emitting files. */
-        // "stripInternal": true,                            /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
-        // "noEmitHelpers": true,                            /* Disable generating custom helper functions like `__extends` in compiled output. */
-        // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
-        // "preserveConstEnums": true,                       /* Disable erasing `const enum` declarations in generated code. */
-        // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-        // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
-
-        /* Interop Constraints */
-        // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
-        // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-        "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
-        // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-        "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
-
-        /* Type Checking */
-        "strict": true /* Enable all strict type-checking options. */,
-         "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied `any` type.. */
-        "strictNullChecks": true,                         /* When type checking, take into account `null` and `undefined`. */
-       "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-        "strictBindCallApply": true,                      /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
-        "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-        "noImplicitThis": true,                           /* Enable error reporting when `this` is given the type `any`. */
-        "useUnknownInCatchVariables": true,               /* Type catch clause variables as 'unknown' instead of 'any'. */
-        "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-        "noUnusedLocals": true,                           /* Enable error reporting when a local variables aren't read. */
-        "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read */
-       "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-        "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-        "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-        "noUncheckedIndexedAccess": true,                 /* Include 'undefined' in index signature results */
-        "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-         "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type */
-        // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-        // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
-        /* Completeness */
-        // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-        "skipLibCheck": true /* Skip type checking all .d.ts files. */
-    }
-}