Skip to content

Commit 5d46100

Browse files
committed
adding username and access key to the info and stop commands as arg option
1 parent 87ab6e4 commit 5d46100

File tree

4 files changed

+56
-0
lines changed

4 files changed

+56
-0
lines changed

bin/commands/info.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ module.exports = function info(args) {
1010
let bsConfigPath = process.cwd() + args.cf;
1111

1212
return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
13+
// accept the username from command line if provided
14+
utils.setUsername(bsConfig, args);
15+
16+
// accept the access key from command line if provided
17+
utils.setAccessKey(bsConfig, args);
18+
1319
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
1420

1521
let buildId = args._[1];

bin/commands/stop.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ module.exports = function stop(args) {
1010
let bsConfigPath = process.cwd() + args.cf;
1111

1212
return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
13+
// accept the username from command line if provided
14+
utils.setUsername(bsConfig, args);
15+
16+
// accept the access key from command line if provided
17+
utils.setAccessKey(bsConfig, args);
18+
1319
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
1420

1521
let buildId = args._[1];

test/unit/bin/commands/info.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ describe("buildInfo", () => {
2222

2323
beforeEach(() => {
2424
sandbox = sinon.createSandbox();
25+
setUsernameStub = sandbox.stub();
26+
setAccessKeyStub = sandbox.stub();
2527
validateBstackJsonStub = sandbox.stub();
2628
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
2729
getUserAgentStub = sandbox.stub().returns("random user-agent");
@@ -45,6 +47,8 @@ describe("buildInfo", () => {
4547

4648
const info = proxyquire("../../../../bin/commands/info", {
4749
"../helpers/utils": {
50+
setUsername: setUsernameStub,
51+
setAccessKey: setAccessKeyStub,
4852
validateBstackJson: validateBstackJsonStub,
4953
getErrorCodeFromErr: getErrorCodeFromErrStub,
5054
sendUsageReport: sendUsageReportStub,
@@ -77,6 +81,8 @@ describe("buildInfo", () => {
7781

7882
const info = proxyquire("../../../../bin/commands/info", {
7983
"../helpers/utils": {
84+
setUsername: setUsernameStub,
85+
setAccessKey: setAccessKeyStub,
8086
validateBstackJson: validateBstackJsonStub,
8187
getErrorCodeFromErr: getErrorCodeFromErrStub,
8288
sendUsageReport: sendUsageReportStub,
@@ -103,6 +109,8 @@ describe("buildInfo", () => {
103109
describe("Handle statusCode != 200", () => {
104110
beforeEach(() => {
105111
sandbox = sinon.createSandbox();
112+
setUsernameStub = sandbox.stub();
113+
setAccessKeyStub = sandbox.stub();
106114
validateBstackJsonStub = sandbox.stub();
107115
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
108116
getUserAgentStub = sandbox.stub().returns("random user-agent");
@@ -128,6 +136,8 @@ describe("buildInfo", () => {
128136

129137
const info = proxyquire("../../../../bin/commands/info", {
130138
"../helpers/utils": {
139+
setUsername: setUsernameStub,
140+
setAccessKey: setAccessKeyStub,
131141
validateBstackJson: validateBstackJsonStub,
132142
getErrorCodeFromErr: getErrorCodeFromErrStub,
133143
sendUsageReport: sendUsageReportStub,
@@ -166,6 +176,8 @@ describe("buildInfo", () => {
166176

167177
const info = proxyquire("../../../../bin/commands/info", {
168178
"../helpers/utils": {
179+
setUsername: setUsernameStub,
180+
setAccessKey: setAccessKeyStub,
169181
validateBstackJson: validateBstackJsonStub,
170182
getErrorCodeFromErr: getErrorCodeFromErrStub,
171183
sendUsageReport: sendUsageReportStub,
@@ -199,6 +211,8 @@ describe("buildInfo", () => {
199211

200212
const info = proxyquire("../../../../bin/commands/info", {
201213
"../helpers/utils": {
214+
setUsername: setUsernameStub,
215+
setAccessKey: setAccessKeyStub,
202216
validateBstackJson: validateBstackJsonStub,
203217
getErrorCodeFromErr: getErrorCodeFromErrStub,
204218
sendUsageReport: sendUsageReportStub,
@@ -227,6 +241,8 @@ describe("buildInfo", () => {
227241

228242
beforeEach(() => {
229243
sandbox = sinon.createSandbox();
244+
setUsernameStub = sandbox.stub();
245+
setAccessKeyStub = sandbox.stub();
230246
validateBstackJsonStub = sandbox.stub();
231247
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
232248
getUserAgentStub = sandbox.stub().returns("random user-agent");
@@ -250,6 +266,8 @@ describe("buildInfo", () => {
250266

251267
const info = proxyquire("../../../../bin/commands/info", {
252268
"../helpers/utils": {
269+
setUsername: setUsernameStub,
270+
setAccessKey: setAccessKeyStub,
253271
validateBstackJson: validateBstackJsonStub,
254272
getErrorCodeFromErr: getErrorCodeFromErrStub,
255273
sendUsageReport: sendUsageReportStub,
@@ -277,6 +295,8 @@ describe("buildInfo", () => {
277295

278296
beforeEach(() => {
279297
sandbox = sinon.createSandbox();
298+
setUsernameStub = sandbox.stub();
299+
setAccessKeyStub = sandbox.stub();
280300
validateBstackJsonStub = sandbox.stub();
281301
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
282302
sendUsageReportStub = sandbox.stub().callsFake(function () {
@@ -293,6 +313,8 @@ describe("buildInfo", () => {
293313
it("send usage report if validateBstackJson fails", () => {
294314
const info = proxyquire("../../../../bin/commands/info", {
295315
"../helpers/utils": {
316+
setUsername: setUsernameStub,
317+
setAccessKey: setAccessKeyStub,
296318
validateBstackJson: validateBstackJsonStub,
297319
getErrorCodeFromErr: getErrorCodeFromErrStub,
298320
sendUsageReport: sendUsageReportStub,

test/unit/bin/commands/stop.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ describe("buildStop", () => {
2323
beforeEach(() => {
2424
sandbox = sinon.createSandbox();
2525
validateBstackJsonStub = sandbox.stub();
26+
setUsernameStub = sandbox.stub();
27+
setAccessKeyStub = sandbox.stub();
2628
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
2729
getUserAgentStub = sandbox.stub().returns("random user-agent");
2830
sendUsageReportStub = sandbox.stub().callsFake(function () {
@@ -48,6 +50,8 @@ describe("buildStop", () => {
4850
const stop = proxyquire("../../../../bin/commands/stop", {
4951
"../helpers/utils": {
5052
validateBstackJson: validateBstackJsonStub,
53+
setUsername: setUsernameStub,
54+
setAccessKey: setAccessKeyStub,
5155
getErrorCodeFromErr: getErrorCodeFromErrStub,
5256
sendUsageReport: sendUsageReportStub,
5357
setUsageReportingFlag: setUsageReportingFlagStub,
@@ -82,6 +86,8 @@ describe("buildStop", () => {
8286
"../helpers/utils": {
8387
validateBstackJson: validateBstackJsonStub,
8488
getErrorCodeFromErr: getErrorCodeFromErrStub,
89+
setUsername: setUsernameStub,
90+
setAccessKey: setAccessKeyStub,
8591
sendUsageReport: sendUsageReportStub,
8692
setUsageReportingFlag: setUsageReportingFlagStub,
8793
getUserAgent: getUserAgentStub,
@@ -106,6 +112,8 @@ describe("buildStop", () => {
106112
describe("Handle statusCode != 200", () => {
107113
beforeEach(() => {
108114
sandbox = sinon.createSandbox();
115+
setUsernameStub = sandbox.stub();
116+
setAccessKeyStub = sandbox.stub();
109117
validateBstackJsonStub = sandbox.stub();
110118
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
111119
getUserAgentStub = sandbox.stub().returns("random user-agent");
@@ -134,6 +142,8 @@ describe("buildStop", () => {
134142
validateBstackJson: validateBstackJsonStub,
135143
getErrorCodeFromErr: getErrorCodeFromErrStub,
136144
sendUsageReport: sendUsageReportStub,
145+
setUsername: setUsernameStub,
146+
setAccessKey: setAccessKeyStub,
137147
setUsageReportingFlag: setUsageReportingFlagStub,
138148
getUserAgent: getUserAgentStub,
139149
},
@@ -174,6 +184,8 @@ describe("buildStop", () => {
174184
validateBstackJson: validateBstackJsonStub,
175185
getErrorCodeFromErr: getErrorCodeFromErrStub,
176186
sendUsageReport: sendUsageReportStub,
187+
setUsername: setUsernameStub,
188+
setAccessKey: setAccessKeyStub,
177189
setUsageReportingFlag: setUsageReportingFlagStub,
178190
getUserAgent: getUserAgentStub,
179191
},
@@ -209,6 +221,8 @@ describe("buildStop", () => {
209221
validateBstackJson: validateBstackJsonStub,
210222
getErrorCodeFromErr: getErrorCodeFromErrStub,
211223
sendUsageReport: sendUsageReportStub,
224+
setUsername: setUsernameStub,
225+
setAccessKey: setAccessKeyStub,
212226
setUsageReportingFlag: setUsageReportingFlagStub,
213227
getUserAgent: getUserAgentStub,
214228
},
@@ -234,6 +248,8 @@ describe("buildStop", () => {
234248

235249
beforeEach(() => {
236250
sandbox = sinon.createSandbox();
251+
setUsernameStub = sandbox.stub();
252+
setAccessKeyStub = sandbox.stub();
237253
validateBstackJsonStub = sandbox.stub();
238254
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
239255
getUserAgentStub = sandbox.stub().returns("random user-agent");
@@ -262,6 +278,8 @@ describe("buildStop", () => {
262278
validateBstackJson: validateBstackJsonStub,
263279
getErrorCodeFromErr: getErrorCodeFromErrStub,
264280
sendUsageReport: sendUsageReportStub,
281+
setUsername: setUsernameStub,
282+
setAccessKey: setAccessKeyStub,
265283
setUsageReportingFlag: setUsageReportingFlagStub,
266284
getUserAgent: getUserAgentStub,
267285
},
@@ -287,6 +305,8 @@ describe("buildStop", () => {
287305

288306
beforeEach(() => {
289307
sandbox = sinon.createSandbox();
308+
setUsernameStub = sandbox.stub();
309+
setAccessKeyStub = sandbox.stub();
290310
validateBstackJsonStub = sandbox.stub();
291311
setUsageReportingFlagStub = sandbox.stub().returns(undefined);
292312
sendUsageReportStub = sandbox.stub().callsFake(function () {
@@ -306,6 +326,8 @@ describe("buildStop", () => {
306326
validateBstackJson: validateBstackJsonStub,
307327
getErrorCodeFromErr: getErrorCodeFromErrStub,
308328
sendUsageReport: sendUsageReportStub,
329+
setUsername: setUsernameStub,
330+
setAccessKey: setAccessKeyStub,
309331
setUsageReportingFlag: setUsageReportingFlagStub,
310332
},
311333
});

0 commit comments

Comments
 (0)