Merge branch 'develop' into snyk-fix-0f1c519328b7215f7772ef7dec88ba98

tmobile · May 12, 2020 · 65ec5ea · 65ec5ea
2 parents 93f6473 + 53d2f92
commit 65ec5ea
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,7 @@ env:
  - PLATFORM_SERVICE=core/jazz_email
  - PLATFORM_SERVICE=core/jazz_environment-event-handler
  - PLATFORM_SERVICE=core/jazz_environments
+ - PLATFORM_SERVICE=core/jazz_es-kinesis-log-streamer
  - PLATFORM_SERVICE=core/jazz_events
  - PLATFORM_SERVICE=core/jazz_events-handler
  - PLATFORM_SERVICE=core/jazz_is-service-available

diff --git a/core/jazz_assets/package.json b/core/jazz_assets/package.json
@@ -16,7 +16,7 @@
     "lodash": "*",
     "moment": "*",
     "request": "*",
-    "uuid": "*"
+    "uuid": "^3.3.2"
   },
   "devDependencies": {
     "aws-lambda-mock-context": "^3.1.1",
@@ -28,4 +28,4 @@
     "mocha": "^v3.0.0",
     "sinon": "^5.0.10"
   }
-}
+}
diff --git a/core/jazz_codeq/test/test.js b/core/jazz_codeq/test/test.js
@@ -329,7 +329,7 @@ describe('validation tests', () => {
   });
 
   it('should return null when from date is invalid', () => {
-    const validFrom = validation.validateFromDate(1234);
+    const validFrom = validation.validateFromDate('BAD 123 - 1date');
 
     expect(validFrom).to.eql(null);
   });
@@ -351,7 +351,7 @@ describe('validation tests', () => {
   });
 
   it('should return null when to date is invalid', () => {
-    const validFrom = validation.validateToDate(1234);
+    const validFrom = validation.validateToDate('BAD 123 - 1date');
 
     expect(validFrom).to.eql(null);
   });

diff --git a/core/jazz_deployments/package.json b/core/jazz_deployments/package.json
@@ -15,7 +15,7 @@
         "lodash": "*",
         "moment": "*",
         "request": "*",
-        "uuid": "*"
+        "uuid": "^3.3.2"
     },
     "devDependencies": {
         "aws-lambda-mock-context": "^3.1.1",
@@ -26,4 +26,4 @@
         "mocha": "^v3.0.0",
         "sinon": "^5.0.7"
     }
-}
+}
diff --git a/core/jazz_es-kinesis-log-streamer/package.json b/core/jazz_es-kinesis-log-streamer/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "unicode-byte-truncate": "*",
     "request": "*",
-    "uuid": "*"
+    "uuid": "^3.3.2"
   },
   "devDependencies": {
     "aws-lambda-mock-context": "^3.2.1",
@@ -24,4 +24,4 @@
     "nyc": "^13.3.0",
     "mocha": "^v3.0.0"
   }
-}
+}
diff --git a/core/jazz_es-kinesis-log-streamer/test/test.js b/core/jazz_es-kinesis-log-streamer/test/test.js
@@ -150,9 +150,8 @@ describe('jazz_es-kinesis-log-stream', function () {
     let payload, expected, response, request, data;
     beforeEach(function () {
       payload = {
-        "host": config.ES_ENDPOINT,
+        "url": 'https://' + config.ES_ENDPOINT + '/_bulk',
         "method": "POST",
-        "path": "/_bulk",
         "body": "Sample data",
         "headers": {
           "Content-Type": "application/json",
@@ -221,11 +220,12 @@ describe('jazz_es-kinesis-log-stream', function () {
       response.write(JSON.stringify(expected));
       response.end();
 
+      let buildRequest = sinon.stub(utils, "buildRequest").returns(payload);
       this.request = sinon.stub(https, 'request');
       this.request.callsArgWith(1, response)
         .returns(request);
 
-      let buildRequest = sinon.stub(utils, "buildRequest").returns(payload);
+
       index.post(config, "hello world", (error, success, response, failedItems) => {
 
         expect(error).to.have.all.keys('statusCode', 'responseBody');
@@ -418,7 +418,7 @@ describe('jazz_es-kinesis-log-stream', function () {
     describe('buildRequest', () => {
       it('should successfully return build request payload', () => {
         let res = utils.buildRequest(config.ES_ENDPOINT, "sample text");
-        expect(res).to.have.all.keys('host', 'method', 'path', 'body', 'headers');
+        expect(res).to.have.all.keys('url', 'method', 'body', 'headers');
       })
     })
 

diff --git a/core/jazz_events/package.json b/core/jazz_events/package.json
@@ -12,7 +12,7 @@
     "dependencies": {
         "moment": "*",
         "request": "*",
-        "uuid": "*"
+        "uuid": "^3.3.2"
     },
     "devDependencies": {
         "chai": "^3.5.0",
@@ -27,4 +27,4 @@
         "lambda-local": "^1.4.2",
         "sinon": "^1.17.7"
     }
-}
+}