fixup 2

Author: SylvainSenechal

.github/docker-compose.backbeat.yml

@@ -1,8 +1,5 @@
 version: '3.8'
 
-# This docker-compose is meant to be copied to your client test codebase
-# It sets up Backbeat with all required services using published images
-
 networks:
   backbeat-net:
     driver: bridge
@@ -35,30 +32,30 @@ services:
       - zookeeper
 
   mongodb:
-    image: mongo:5.0
+    image: mongo:4.4
     platform: linux/amd64
     ports:
       - "27018:27018"
     networks:
       - backbeat-net
     command: mongod --port 27018 --replSet rs0 --bind_ip_all
     healthcheck:
-      test: echo 'db.runCommand("ping").ok' | mongosh --port 27018 --quiet
+      test: echo 'db.runCommand("ping").ok' | mongo --port 27018 --quiet
       interval: 10s
       timeout: 5s
       retries: 5
       start_period: 10s
 
   mongodb-init:
-    image: mongo:5.0
+    image: mongo:4.4
     platform: linux/amd64
     networks:
       - backbeat-net
     depends_on:
       mongodb:
         condition: service_healthy
     command: >
-      mongosh --host mongodb:27018 --eval
+      mongo --host mongodb:27018 --eval
       'rs.initiate({_id: "rs0", members: [{_id: 0, host: "mongodb:27018"}]})'
     restart: "no"
 
@@ -85,9 +82,13 @@ services:
       - MONGODB_RS=rs0
       - REMOTE_MANAGEMENT_DISABLE=true
       - LOG_LEVEL=info
+      - CRR_METRICS_HOST=backbeat-api
+      - CRR_METRICS_PORT=8900
     depends_on:
       mongodb-init:
         condition: service_completed_successfully
+      backbeat-api:
+        condition: service_started
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8000/"]
       interval: 5s

tests/testBackbeatApis.test.ts

@@ -35,11 +35,6 @@ import {
 import { createTestClient, testConfig } from './testSetup';
 import assert from 'assert';
 
-
-//
-// const AWS = require('aws-sdk');
-// const { Service } = require('aws-sdk');
-
 // Note : these tests are relatively simple, as it's not straightforward to setup 
 // backbeat with locations, and real pause/resume tests scenarios.
 // The tests in Zenko are also using these apis, and will represent an opportunity to 
@@ -122,7 +117,7 @@ describe('CloudServer Check Status API Tests', () => {
 
     it('should test pauseSite', async () => {
         const input: PauseSiteInput = {
-            Site: 'zenko', // todo : justify
+            Site: 'zenko', // Value from backbeat default config.json, destination.bootstrapList
         };
         const cmd = new PauseSiteCommand(input);
         const result = await client.send(cmd);
@@ -132,7 +127,7 @@ describe('CloudServer Check Status API Tests', () => {
     // No site available for ingestion on our test setup
     it.skip('should test pauseIngestionSite', async () => {
         const input: PauseIngestionSiteInput = {
-            Site: 'a-zenko-location',
+            Site: 'a-zenko-location', // Value from backbeat default config.json, extensions.ingestion.sources
         };
         const cmd = new PauseIngestionSiteCommand(input);
         const result = await client.send(cmd);
@@ -155,7 +150,7 @@ describe('CloudServer Check Status API Tests', () => {
 
     it('should test resumeSite', async () => {
         const input: ResumeSiteInput = {
-            Site: 'zenko', // todo : justify
+            Site: 'zenko',
         };
         const cmd = new ResumeSiteCommand(input);
         const result = await client.send(cmd);
@@ -165,7 +160,7 @@ describe('CloudServer Check Status API Tests', () => {
     // No site available for ingestion on our test setup
     it.skip('should test resumeIngestionSite', async () => {
         const input: ResumeIngestionSiteInput = {
-            Site: 'a-zenko-location', // todo : justify
+            Site: 'a-zenko-location',
         };
         const cmd = new ResumeIngestionSiteCommand(input);
         const result = await client.send(cmd);
@@ -175,7 +170,7 @@ describe('CloudServer Check Status API Tests', () => {
     it('should test scheduleSiteResume', async () => {
         const bodyData = JSON.stringify({ hours: 24 });
         const input: ScheduleSiteResumeInput = {
-            Site: 'zenko', // todo : justify
+            Site: 'zenko',
             Body: new TextEncoder().encode(bodyData)
         };
         const cmd = new ScheduleSiteResumeCommand(input);
@@ -187,54 +182,11 @@ describe('CloudServer Check Status API Tests', () => {
     it.skip('should test scheduleIngestionSiteResume', async () => {
         const bodyData = JSON.stringify({ hours: 24 });
         const input: ScheduleIngestionSiteResumeInput = {
-            Site: 'zenko', // todo : justify
+            Site: 'zenko',
             Body: new TextEncoder().encode(bodyData)
         };
         const cmd = new ScheduleIngestionSiteResumeCommand(input);
         const result = await client.send(cmd);
         assert.strictEqual(result.$metadata.httpStatusCode, 200);
     });
-
-    // it.skip('test old client', async () => {
-    //     AWS.apiLoader.services.backbeat = {};
-    //     Object.defineProperty(AWS.apiLoader.services.backbeat, '2017-07-01', {
-    //         get: function get() {
-    //             const model = require('../legacy/zenko-2018-07-08-json.api.json');
-    //             return model;
-    //         },
-    //         enumerable: true,
-    //         configurable: true,
-    //     });
-    //     const BackbeatClient = Service.defineService('backbeat', ['2017-07-01']);
-
-    //     BackbeatClient.prototype.validateService = function validateService() {
-    //         if (!this.config.region) {
-    //             this.config.region = 'us-east-1';
-    //         }
-    //     };
-    //     const conf = {
-    //         accessKeyId: 'accessKey1',
-    //         secretAccessKey: 'verySecretKey1',
-    //         endpoint: 'http://localhost:8000',
-    //         region: 'us-east-1',
-    //         sslEnabled: false,
-    //         s3ForcePathStyle: true,
-    //         apiVersions: { s3: '2006-03-01' },
-    //         signatureVersion: 'v4',
-    //         signatureCache: false,
-    //     };
-    //     const c = new BackbeatClient(conf)
-        
-    //     await new Promise((resolve, reject) => {
-    //         c.checkConnection({}, (err: any, data: any) => {
-    //             if (err) {
-    //                 console.log('Error:', err);
-    //                 reject(err);
-    //             } else {
-    //                 console.log('Success:', data);
-    //                 resolve(data);
-    //             }
-    //         });
-    //     });
-    // });
 });