build sandbox docker-compose file without error

sourcefuse · Feb 28, 2024 · 4e46b52 · 4e46b52
1 parent 93a7f91
commit 4e46b52
Show file tree

Hide file tree

Showing 56 changed files with 10,054 additions and 3,242 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,6 +53,7 @@
     "packages/cache",
     "packages/feature-toggle",
     "packages/custom-sf-changelog/",
-    "services/*"
+    "services/*",
+    "sandbox/*"
   ]
 }
diff --git a/packages/cli/README.md b/packages/cli/README.md
@@ -18,7 +18,7 @@ $ npm install -g @sourceloop/cli
 $ sl COMMAND
 running command...
 $ sl (-v|--version|version)
-@sourceloop/cli/7.2.1 linux-x64 node-v18.19.0
+@sourceloop/cli/7.2.1 darwin-arm64 node-v18.17.0
 $ sl --help [COMMAND]
 USAGE
   $ sl COMMAND

diff --git a/sandbox/audit-ms-example/Dockerfile b/sandbox/audit-ms-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/auth-ms-basic-example/Dockerfile b/sandbox/auth-ms-basic-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/chat-notification-pubnub-example/facade/Dockerfile b/sandbox/chat-notification-pubnub-example/facade/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/chat-notification-pubnub-example/services/chat-service/Dockerfile b/sandbox/chat-notification-pubnub-example/services/chat-service/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/chat-notification-pubnub-example/services/notifications-service/Dockerfile b/sandbox/chat-notification-pubnub-example/services/notifications-service/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/chat-notification-pubnub-example/services/notifications-service/package.json b/sandbox/chat-notification-pubnub-example/services/notifications-service/package.json
@@ -61,6 +61,7 @@
     "@loopback/service-proxy": "^6.1.5",
     "@sourceloop/core": "^11.0.3",
     "@sourceloop/notification-service": "^11.0.5",
+    "aws-sdk": "^2.1565.0",
     "db-migrate": "^1.0.0-beta.21",
     "db-migrate-pg": "^1.3.0",
     "dotenv": "^16.0.3",
@@ -79,6 +80,7 @@
     "@loopback/eslint-config": "^14.0.4",
     "@loopback/testlab": "^6.1.5",
     "@types/node": "^18.11.9",
+    "@types/pubnub": "^7.4.2",
     "eslint": "^8.44.0",
     "source-map-support": "^0.5.21",
     "typescript": "~4.9.5"

diff --git a/sandbox/chat-notification-socketio-example/facade/Dockerfile b/sandbox/chat-notification-socketio-example/facade/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/chat-notification-socketio-example/services/chat-service/Dockerfile b/sandbox/chat-notification-socketio-example/services/chat-service/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/chat-notification-socketio-example/services/notifications-service/Dockerfile b/sandbox/chat-notification-socketio-example/services/notifications-service/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/docker-compose.yml b/sandbox/docker-compose.yml
@@ -430,58 +430,6 @@ services:
       - audit-ms-migration
     restart: on-failure
 
-  search-ms-example:
-    image: ${REGISTRY:-localhost:32000}/search-ms-example
-    build:
-      context: ./search-ms-example
-      dockerfile: Dockerfile
-    ports:
-      - '3037:3000'
-    networks:
-      - sandbox
-    environment: *search-ms-variables
-    depends_on:
-      - postgres
-      - postgres_orchestrator
-      - search-ms-migration
-    restart: on-failure
-
-  search-ms-migration:
-    image: ${REGISTRY:-localhost:32000}/search-ms-example
-    command: sh -c "sleep 60 && npm run db:migrate"
-    build:
-      context: ./search-ms-example
-      dockerfile: Dockerfile
-    environment: *search-ms-variables
-    depends_on:
-      - postgres
-      - postgres_orchestrator
-    networks:
-      - sandbox
-    restart: on-failure
-
-  search-client-example:
-    image: ${REGISTRY:-localhost:32000}/search-client-example
-    build:
-      context: ./search-client-example
-      dockerfile: Dockerfile
-    ports:
-      - '4200:4200'
-    networks:
-      - sandbox
-    restart: on-failure
-
-  user-onboarding-example:
-    image: ${REGISTRY:-localhost:32000}/user-onboarding-example
-    build:
-      context: ./user-onboarding-example
-      dockerfile: Dockerfile
-    ports:
-      - '4201:4200'
-    networks:
-      - sandbox
-    restart: on-failure
-
   audit-ms-migration:
     image: ${REGISTRY:-localhost:32000}/audit-ms-example
     command: sh -c "sleep 60 && npm run db:migrate"
@@ -616,9 +564,9 @@ services:
     restart: on-failure
 
   payment-backend-example:
-    image: ${REGISTRY:-localhost:32000}/payment-example/backend
+    image: ${REGISTRY:-localhost:32000}/payment-example
     build:
-      context: ./payment-example/backend
+      context: ./payment-example
       dockerfile: Dockerfile
     ports:
       - '3042:3000'
@@ -632,9 +580,9 @@ services:
     restart: on-failure
 
   payment-backend-migration:
-    image: ${REGISTRY:-localhost:32000}/payment-example/backend
+    image: ${REGISTRY:-localhost:32000}/payment-example
     build:
-      context: ./payment-example/backend
+      context: ./payment-example
       dockerfile: Dockerfile
     command: sh -c "sleep 60 && npm run db:migrate"
     environment: *payment-backend-variables
@@ -676,21 +624,6 @@ services:
       - sandbox
     restart: on-failure
 
-  user-tenant-example:
-    image: ${REGISTRY:-localhost:32000}/user-tenant-example
-    build:
-      context: ./user-tenant-example
-      dockerfile: Dockerfile
-    ports:
-      - '3043:3000'
-    networks:
-      - sandbox
-    environment: *user-tenant-variables
-    depends_on:
-      - postgres
-      - postgres_orchestrator
-    restart: on-failure
-
   redis:
     image: 'redis:alpine'
     ports:

diff --git a/sandbox/feature-toggle-example/Dockerfile b/sandbox/feature-toggle-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/in-mail-example/Dockerfile b/sandbox/in-mail-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/oauth-example/Dockerfile b/sandbox/oauth-example/Dockerfile
@@ -14,7 +14,7 @@ WORKDIR /home/node/app
 # where available (npm@5+)
 COPY --chown=node package*.json ./
 
-RUN npm ci
+RUN npm i
 
 # Bundle app source code
 COPY --chown=node . .

diff --git a/sandbox/payment-example/Dockerfile b/sandbox/payment-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node
@@ -14,7 +14,7 @@ WORKDIR /home/node/app
 # where available (npm@5+)
 COPY --chown=node package*.json ./
 
-RUN npm ci
+RUN npm i
 
 # Bundle app source code
 COPY --chown=node . .

diff --git a/sandbox/pubnub-example/Dockerfile b/sandbox/pubnub-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/scheduler-example/Dockerfile b/sandbox/scheduler-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/search-ms-example/Dockerfile b/sandbox/search-ms-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/video-conferencing-ms-example/Dockerfile b/sandbox/video-conferencing-ms-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/workflow-ms-example/Dockerfile b/sandbox/workflow-ms-example/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/sandbox/workflow-ms-example/tsconfig.json b/sandbox/workflow-ms-example/tsconfig.json
@@ -4,10 +4,9 @@
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": "src",
-    "composite": true
+    "composite": true,
+    "experimentalDecorators": true
   },
-  "include": [
-    "src"
-  ],
+  "include": ["src"],
   "references": []
 }
diff --git a/services/audit-service/src/__tests__/unit/audit.controller.unit.ts b/services/audit-service/src/__tests__/unit/audit.controller.unit.ts
@@ -108,8 +108,9 @@ describe('AuditController(unit) ', () => {
       );
       sinon.assert.calledOnce(logFetch);
       expect(controllerResult).to.have.length(1);
-      const controllerResultWithoutFilter =
-        await controller.find(includeArchivedLogs);
+      const controllerResultWithoutFilter = await controller.find(
+        includeArchivedLogs,
+      );
       expect(controllerResultWithoutFilter).to.have.length(2);
     });
   });

diff --git a/services/authentication-service/src/modules/auth/controllers/login.controller.ts b/services/authentication-service/src/modules/auth/controllers/login.controller.ts
@@ -442,10 +442,12 @@ export class LoginController {
       let oldPassword = prevPassword;
       let newPassword = password;
       if (process.env.PRIVATE_DECRYPTION_KEY) {
-        const decryptedOldPassword =
-          await this.userRepo.decryptPassword(oldPassword);
-        const decryptedNewPassword =
-          await this.userRepo.decryptPassword(password);
+        const decryptedOldPassword = await this.userRepo.decryptPassword(
+          oldPassword,
+        );
+        const decryptedNewPassword = await this.userRepo.decryptPassword(
+          password,
+        );
         oldPassword = decryptedOldPassword;
         newPassword = decryptedNewPassword;
       }

diff --git a/services/authentication-service/src/providers/user-validation.provider.ts b/services/authentication-service/src/providers/user-validation.provider.ts
@@ -38,8 +38,9 @@ export class UserValidationProvider implements Provider<UserValidationFn> {
         isAuthenticated = await this.googleAuthenticationProvider(accessToken);
         break;
       case SignUpProviderKey.Keycloak:
-        isAuthenticated =
-          await this.keycloakAuthenticationProvider(accessToken);
+        isAuthenticated = await this.keycloakAuthenticationProvider(
+          accessToken,
+        );
         break;
       default:
         isAuthenticated = await this.defaultAuthneticationProvider(accessToken);

diff --git a/services/bpmn-service/src/controllers/workflow.controller.ts b/services/bpmn-service/src/controllers/workflow.controller.ts
@@ -85,8 +85,9 @@ export class WorkflowController {
     workflowDto: WorkflowDto,
   ): Promise<Workflow> {
     try {
-      const workflowResponse =
-        await this.workflowManagerService.createWorkflow(workflowDto);
+      const workflowResponse = await this.workflowManagerService.createWorkflow(
+        workflowDto,
+      );
 
       const entity = new Workflow({
         workflowVersion: workflowResponse.version,
@@ -140,8 +141,9 @@ export class WorkflowController {
     workflowDto: WorkflowDto,
     @param.path.string('id') id: string,
   ): Promise<void> {
-    const workflowResponse =
-      await this.workflowManagerService.updateWorkflow(workflowDto);
+    const workflowResponse = await this.workflowManagerService.updateWorkflow(
+      workflowDto,
+    );
 
     const entity = new Workflow({
       workflowVersion: workflowResponse.version,

diff --git a/services/feature-toggle-service/Dockerfile b/services/feature-toggle-service/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/services/notification-service/src/services/process-notification.service.ts b/services/notification-service/src/services/process-notification.service.ts
@@ -293,8 +293,9 @@ export class ProcessNotificationService {
     }
     //Create filter using criteria given in request
     const filterUsers = this._createFilterBuilder(notificationSettings).build();
-    const notificationUsers =
-      await this.notificationUserRepository.find(filterUsers);
+    const notificationUsers = await this.notificationUserRepository.find(
+      filterUsers,
+    );
     if (notificationUsers.length === 0) {
       throw new HttpErrors.UnprocessableEntity(
         ErrorKeys.NoUserFoundToSendNotification,

diff --git a/services/payment-service/Dockerfile b/services/payment-service/Dockerfile
@@ -1,5 +1,5 @@
 # Check out https://hub.docker.com/_/node to select a new base image
-FROM node:16-alpine
+FROM node:18-alpine
 
 # Set to a non-root built-in user `node`
 USER node

diff --git a/services/payment-service/openapi.json b/services/payment-service/openapi.json
@@ -2,7 +2,7 @@
   "openapi": "3.0.0",
   "info": {
     "title": "@sourceloop/payment-service",
-    "version": "10.0.2",
+    "version": "11.1.3",
     "description": "payment microservice.",
     "contact": {
       "name": "Sourcefuse"

diff --git a/services/payment-service/openapi.md b/services/payment-service/openapi.md
@@ -1,5 +1,5 @@
 ---
-title: "@sourceloop/payment-service v10.0.2"
+title: "@sourceloop/payment-service v11.1.3"
 language_tabs:
   - javascript: JavaScript
   - javascript--nodejs: Node.JS
@@ -16,7 +16,7 @@ headingLevel: 2
 
 <!-- Generator: Widdershins v4.0.1 -->
 
-<h1 id="-sourceloop-payment-service">@sourceloop/payment-service v10.0.2</h1>
+<h1 id="-sourceloop-payment-service">@sourceloop/payment-service v11.1.3</h1>
 
 > Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.