Skip to content

Commit

Permalink
Merge pull request #27 from screwdriver-cd/sec
Browse files Browse the repository at this point in the history
fix: Update dependencies for security
  • Loading branch information
minzcmu authored Jan 9, 2019
2 parents 3d13f37 + 5309430 commit 3289bed
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ class JenkinsExecutor extends Executor {
// To pass arguments as an array, we need to use apply
this.jenkinsClient[options.module][options.action].apply(
this.jenkinsClient[options.module],
options.params.concat([callback]));
options.params.concat([callback])
);
}

/**
Expand Down Expand Up @@ -107,9 +108,7 @@ class JenkinsExecutor extends Executor {
// delay between retry attempts
return new Promise((resolve) => {
setTimeout(resolve, this.cleanupWatchInterval * 1000);
}).then(() =>
this._jenkinsJobWaitStop(jobName, timeConsumed + this.cleanupWatchInterval)
);
}).then(() => this._jenkinsJobWaitStop(jobName, timeConsumed + this.cleanupWatchInterval));
}

/**
Expand Down Expand Up @@ -273,7 +272,8 @@ class JenkinsExecutor extends Executor {
const jobName = this._jobName(config.buildId);
const xml = this._loadJobXml(config);
const annotations = this.parseAnnotations(
hoek.reach(config, 'annotations', { default: {} }));
hoek.reach(config, 'annotations', { default: {} })
);

const buildTimeout = annotations[ANNOTATE_BUILD_TIMEOUT]
? Math.min(annotations[ANNOTATE_BUILD_TIMEOUT], this.maxBuildTimeout)
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@
"Tiffany Kyi <tiffanykyi@gmail.com>"
],
"devDependencies": {
"chai": "^3.5.0",
"eslint": "^4.3.0",
"eslint-config-screwdriver": "^3.0.0",
"jenkins-mocha": "^5.0.0",
"chai": "^4.2.0",
"eslint": "^4.19.0",
"eslint-config-screwdriver": "^4.0.0",
"jenkins-mocha": "^6.0.0",
"mockery": "^2.0.0",
"sinon": "^2.3.8"
"sinon": "^7.1.0"
},
"dependencies": {
"circuit-fuses": "^2.2.1",
"hoek": "^5.0.3",
"hoek": "^5.0.4",
"jenkins": "^0.20.0",
"request": "^2.72.0",
"request": "^2.88.0",
"screwdriver-executor-base": "^6.1.0",
"tinytim": "^0.1.1",
"xml-escape": "^1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion test/index.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const assert = require('chai').assert;
const { assert } = require('chai');
const sinon = require('sinon');
const mockery = require('mockery');
const tinytim = require('tinytim');
Expand Down

0 comments on commit 3289bed

Please sign in to comment.