@osaas/cli 4.17.1 → 4.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/package.json +2 -2
- package/src/cli.test.ts +57 -0
- package/src/cli.ts +5 -1
package/dist/cli.js
CHANGED
|
@@ -47,7 +47,7 @@ const packageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(__dirname
|
|
|
47
47
|
cli.version(packageJson.version, '-v, --version', 'Output the current version');
|
|
48
48
|
cli
|
|
49
49
|
.configureHelp({ showGlobalOptions: true })
|
|
50
|
-
.option('--env <environment>', 'Environment to use');
|
|
50
|
+
.option('--env <environment>', 'Environment to use (overrides ENVIRONMENT env var)', process.env.ENVIRONMENT || 'prod');
|
|
51
51
|
cli.addCommand((0, cmd_1.default)());
|
|
52
52
|
cli.addCommand(cmdUser.cmdList());
|
|
53
53
|
cli.addCommand(cmdUser.cmdCreate());
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,2BAAkC;AAClC,+BAA4B;AAC5B,yCAAoC;AACpC,sDAAmC;AACnC,oDAAsC;AACtC,qDAAoC;AACpC,yDAAyC;AACzC,qDAAiC;AACjC,yDAAyC;AACzC,2DAA6C;AAC7C,mDAA6B;AAC7B,yCAA0C;AAC1C,mCAAmC;AACnC,oCAAmC;AAEnC,MAAM,GAAG,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE1B,oBAAoB;AACpB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAC5D,CAAC;AAEF,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,4BAA4B,CAAC,CAAC;AAEhF,GAAG;KACA,aAAa,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;KAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,2BAAkC;AAClC,+BAA4B;AAC5B,yCAAoC;AACpC,sDAAmC;AACnC,oDAAsC;AACtC,qDAAoC;AACpC,yDAAyC;AACzC,qDAAiC;AACjC,yDAAyC;AACzC,2DAA6C;AAC7C,mDAA6B;AAC7B,yCAA0C;AAC1C,mCAAmC;AACnC,oCAAmC;AAEnC,MAAM,GAAG,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE1B,oBAAoB;AACpB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAC5D,CAAC;AAEF,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,4BAA4B,CAAC,CAAC;AAEhF,GAAG;KACA,aAAa,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;KAC1C,MAAM,CACL,qBAAqB,EACrB,oDAAoD,EACpD,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,MAAM,CAClC,CAAC;AAEJ,GAAG,CAAC,UAAU,CAAC,IAAA,aAAQ,GAAE,CAAC,CAAC;AAC3B,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAClC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AACpC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;AACtC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AACpC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAClC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;AACrC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC;AAChD,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;AAC3C,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;AACrC,GAAG,CAAC,UAAU,CAAC,IAAA,aAAW,GAAE,CAAC,CAAC;AAC9B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAU,GAAE,CAAC,CAAC;AAC7B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAO,GAAE,CAAC,CAAC;AAC1B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAW,GAAE,CAAC,CAAC;AAC9B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAa,GAAE,CAAC,CAAC;AAChC,GAAG,CAAC,UAAU,CAAC,IAAA,aAAK,GAAE,CAAC,CAAC;AACxB,GAAG,CAAC,UAAU,CAAC,IAAA,aAAO,GAAE,CAAC,CAAC;AAC1B,GAAG,CAAC,UAAU,CAAC,IAAA,YAAM,GAAE,CAAC,CAAC;AACzB,GAAG,CAAC,UAAU,CAAC,IAAA,aAAM,GAAE,CAAC,CAAC;AACzB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@osaas/cli",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.18.0",
|
|
4
4
|
"description": "Open Source Cloud CLI",
|
|
5
5
|
"author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
|
|
6
6
|
"homepage": "https://www.osaas.io",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "998a2323e0999de18913e61e6d786bddd72d4cbb"
|
|
41
41
|
}
|
package/src/cli.test.ts
ADDED
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { Command } from 'commander';
|
|
2
|
+
|
|
3
|
+
describe('CLI environment option', () => {
|
|
4
|
+
let originalEnv: NodeJS.ProcessEnv;
|
|
5
|
+
|
|
6
|
+
beforeEach(() => {
|
|
7
|
+
originalEnv = { ...process.env };
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
afterEach(() => {
|
|
11
|
+
process.env = originalEnv;
|
|
12
|
+
});
|
|
13
|
+
|
|
14
|
+
const createTestCli = () => {
|
|
15
|
+
const cli = new Command();
|
|
16
|
+
cli
|
|
17
|
+
.configureHelp({ showGlobalOptions: true })
|
|
18
|
+
.option(
|
|
19
|
+
'--env <environment>',
|
|
20
|
+
'Environment to use (overrides ENVIRONMENT env var)',
|
|
21
|
+
process.env.ENVIRONMENT || 'prod'
|
|
22
|
+
);
|
|
23
|
+
return cli;
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
test('defaults to prod when no ENVIRONMENT env var is set', () => {
|
|
27
|
+
delete process.env.ENVIRONMENT;
|
|
28
|
+
const cli = createTestCli();
|
|
29
|
+
cli.parse(['node', 'cli.js']);
|
|
30
|
+
|
|
31
|
+
expect(cli.opts().env).toBe('prod');
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
test('uses ENVIRONMENT env var when set', () => {
|
|
35
|
+
process.env.ENVIRONMENT = 'dev';
|
|
36
|
+
const cli = createTestCli();
|
|
37
|
+
cli.parse(['node', 'cli.js']);
|
|
38
|
+
|
|
39
|
+
expect(cli.opts().env).toBe('dev');
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
test('--env flag overrides ENVIRONMENT env var', () => {
|
|
43
|
+
process.env.ENVIRONMENT = 'dev';
|
|
44
|
+
const cli = createTestCli();
|
|
45
|
+
cli.parse(['node', 'cli.js', '--env', 'staging']);
|
|
46
|
+
|
|
47
|
+
expect(cli.opts().env).toBe('staging');
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
test('--env flag works when no ENVIRONMENT env var is set', () => {
|
|
51
|
+
delete process.env.ENVIRONMENT;
|
|
52
|
+
const cli = createTestCli();
|
|
53
|
+
cli.parse(['node', 'cli.js', '--env', 'staging']);
|
|
54
|
+
|
|
55
|
+
expect(cli.opts().env).toBe('staging');
|
|
56
|
+
});
|
|
57
|
+
});
|
package/src/cli.ts
CHANGED
|
@@ -26,7 +26,11 @@ cli.version(packageJson.version, '-v, --version', 'Output the current version');
|
|
|
26
26
|
|
|
27
27
|
cli
|
|
28
28
|
.configureHelp({ showGlobalOptions: true })
|
|
29
|
-
.option(
|
|
29
|
+
.option(
|
|
30
|
+
'--env <environment>',
|
|
31
|
+
'Environment to use (overrides ENVIRONMENT env var)',
|
|
32
|
+
process.env.ENVIRONMENT || 'prod'
|
|
33
|
+
);
|
|
30
34
|
|
|
31
35
|
cli.addCommand(cmdAdmin());
|
|
32
36
|
cli.addCommand(cmdUser.cmdList());
|