Skip to content

Commit

Permalink
adding username and access key to the info and stop commands as arg o…
Browse files Browse the repository at this point in the history
…ption
  • Loading branch information
suryart committed Jun 29, 2020
1 parent 87ab6e4 commit 5d46100
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 0 deletions.
6 changes: 6 additions & 0 deletions bin/commands/info.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ module.exports = function info(args) {
let bsConfigPath = process.cwd() + args.cf;

return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
// accept the username from command line if provided
utils.setUsername(bsConfig, args);

// accept the access key from command line if provided
utils.setAccessKey(bsConfig, args);

utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);

let buildId = args._[1];
Expand Down
6 changes: 6 additions & 0 deletions bin/commands/stop.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ module.exports = function stop(args) {
let bsConfigPath = process.cwd() + args.cf;

return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
// accept the username from command line if provided
utils.setUsername(bsConfig, args);

// accept the access key from command line if provided
utils.setAccessKey(bsConfig, args);

utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);

let buildId = args._[1];
Expand Down
22 changes: 22 additions & 0 deletions test/unit/bin/commands/info.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ describe("buildInfo", () => {

beforeEach(() => {
sandbox = sinon.createSandbox();
setUsernameStub = sandbox.stub();
setAccessKeyStub = sandbox.stub();
validateBstackJsonStub = sandbox.stub();
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
getUserAgentStub = sandbox.stub().returns("random user-agent");
Expand All @@ -45,6 +47,8 @@ describe("buildInfo", () => {

const info = proxyquire("../../../../bin/commands/info", {
"../helpers/utils": {
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
Expand Down Expand Up @@ -77,6 +81,8 @@ describe("buildInfo", () => {

const info = proxyquire("../../../../bin/commands/info", {
"../helpers/utils": {
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
Expand All @@ -103,6 +109,8 @@ describe("buildInfo", () => {
describe("Handle statusCode != 200", () => {
beforeEach(() => {
sandbox = sinon.createSandbox();
setUsernameStub = sandbox.stub();
setAccessKeyStub = sandbox.stub();
validateBstackJsonStub = sandbox.stub();
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
getUserAgentStub = sandbox.stub().returns("random user-agent");
Expand All @@ -128,6 +136,8 @@ describe("buildInfo", () => {

const info = proxyquire("../../../../bin/commands/info", {
"../helpers/utils": {
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
Expand Down Expand Up @@ -166,6 +176,8 @@ describe("buildInfo", () => {

const info = proxyquire("../../../../bin/commands/info", {
"../helpers/utils": {
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
Expand Down Expand Up @@ -199,6 +211,8 @@ describe("buildInfo", () => {

const info = proxyquire("../../../../bin/commands/info", {
"../helpers/utils": {
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
Expand Down Expand Up @@ -227,6 +241,8 @@ describe("buildInfo", () => {

beforeEach(() => {
sandbox = sinon.createSandbox();
setUsernameStub = sandbox.stub();
setAccessKeyStub = sandbox.stub();
validateBstackJsonStub = sandbox.stub();
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
getUserAgentStub = sandbox.stub().returns("random user-agent");
Expand All @@ -250,6 +266,8 @@ describe("buildInfo", () => {

const info = proxyquire("../../../../bin/commands/info", {
"../helpers/utils": {
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
Expand Down Expand Up @@ -277,6 +295,8 @@ describe("buildInfo", () => {

beforeEach(() => {
sandbox = sinon.createSandbox();
setUsernameStub = sandbox.stub();
setAccessKeyStub = sandbox.stub();
validateBstackJsonStub = sandbox.stub();
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
sendUsageReportStub = sandbox.stub().callsFake(function () {
Expand All @@ -293,6 +313,8 @@ describe("buildInfo", () => {
it("send usage report if validateBstackJson fails", () => {
const info = proxyquire("../../../../bin/commands/info", {
"../helpers/utils": {
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
Expand Down
22 changes: 22 additions & 0 deletions test/unit/bin/commands/stop.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ describe("buildStop", () => {
beforeEach(() => {
sandbox = sinon.createSandbox();
validateBstackJsonStub = sandbox.stub();
setUsernameStub = sandbox.stub();
setAccessKeyStub = sandbox.stub();
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
getUserAgentStub = sandbox.stub().returns("random user-agent");
sendUsageReportStub = sandbox.stub().callsFake(function () {
Expand All @@ -48,6 +50,8 @@ describe("buildStop", () => {
const stop = proxyquire("../../../../bin/commands/stop", {
"../helpers/utils": {
validateBstackJson: validateBstackJsonStub,
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
setUsageReportingFlag: setUsageReportingFlagStub,
Expand Down Expand Up @@ -82,6 +86,8 @@ describe("buildStop", () => {
"../helpers/utils": {
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
sendUsageReport: sendUsageReportStub,
setUsageReportingFlag: setUsageReportingFlagStub,
getUserAgent: getUserAgentStub,
Expand All @@ -106,6 +112,8 @@ describe("buildStop", () => {
describe("Handle statusCode != 200", () => {
beforeEach(() => {
sandbox = sinon.createSandbox();
setUsernameStub = sandbox.stub();
setAccessKeyStub = sandbox.stub();
validateBstackJsonStub = sandbox.stub();
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
getUserAgentStub = sandbox.stub().returns("random user-agent");
Expand Down Expand Up @@ -134,6 +142,8 @@ describe("buildStop", () => {
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
setUsageReportingFlag: setUsageReportingFlagStub,
getUserAgent: getUserAgentStub,
},
Expand Down Expand Up @@ -174,6 +184,8 @@ describe("buildStop", () => {
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
setUsageReportingFlag: setUsageReportingFlagStub,
getUserAgent: getUserAgentStub,
},
Expand Down Expand Up @@ -209,6 +221,8 @@ describe("buildStop", () => {
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
setUsageReportingFlag: setUsageReportingFlagStub,
getUserAgent: getUserAgentStub,
},
Expand All @@ -234,6 +248,8 @@ describe("buildStop", () => {

beforeEach(() => {
sandbox = sinon.createSandbox();
setUsernameStub = sandbox.stub();
setAccessKeyStub = sandbox.stub();
validateBstackJsonStub = sandbox.stub();
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
getUserAgentStub = sandbox.stub().returns("random user-agent");
Expand Down Expand Up @@ -262,6 +278,8 @@ describe("buildStop", () => {
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
setUsageReportingFlag: setUsageReportingFlagStub,
getUserAgent: getUserAgentStub,
},
Expand All @@ -287,6 +305,8 @@ describe("buildStop", () => {

beforeEach(() => {
sandbox = sinon.createSandbox();
setUsernameStub = sandbox.stub();
setAccessKeyStub = sandbox.stub();
validateBstackJsonStub = sandbox.stub();
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
sendUsageReportStub = sandbox.stub().callsFake(function () {
Expand All @@ -306,6 +326,8 @@ describe("buildStop", () => {
validateBstackJson: validateBstackJsonStub,
getErrorCodeFromErr: getErrorCodeFromErrStub,
sendUsageReport: sendUsageReportStub,
setUsername: setUsernameStub,
setAccessKey: setAccessKeyStub,
setUsageReportingFlag: setUsageReportingFlagStub,
},
});
Expand Down

0 comments on commit 5d46100

Please sign in to comment.