@osaas/cli 4.17.1 → 4.19.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/dist/vod/cmd.d.ts.map +1 -1
- package/dist/vod/cmd.js +10 -1
- package/dist/vod/cmd.js.map +1 -1
- package/package.json +3 -3
- package/src/cli.test.ts +57 -0
- package/src/cli.ts +5 -1
- package/src/vod/cmd.ts +13 -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/dist/vod/cmd.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/vod/cmd.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,wBAAgB,MAAM,
|
|
1
|
+
{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/vod/cmd.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,wBAAgB,MAAM,YAuDrB"}
|
package/dist/vod/cmd.js
CHANGED
|
@@ -11,13 +11,22 @@ function cmdVod() {
|
|
|
11
11
|
.description('Create a VOD file ready for streaming. Will setup pipeline if not already created.')
|
|
12
12
|
.argument('<name>', 'Name of VOD Pipeline')
|
|
13
13
|
.argument('<source>', 'Source URL')
|
|
14
|
+
.option('--output-bucket-name <name>', 'Name of existing output bucket')
|
|
15
|
+
.option('--access-key-id <id>', 'Access key ID for existing output bucket')
|
|
16
|
+
.option('--secret-access-key <key>', 'Secret access key for existing output bucket')
|
|
17
|
+
.option('--endpoint <url>', 'Endpoint URL for existing output bucket')
|
|
14
18
|
.action(async (name, source, options, command) => {
|
|
15
19
|
try {
|
|
16
20
|
const globalOpts = command.optsWithGlobals();
|
|
17
21
|
const environment = globalOpts?.env || 'prod';
|
|
18
22
|
const ctx = new client_core_1.Context({ environment });
|
|
19
23
|
(0, client_core_1.Log)().info('Creating VOD pipeline');
|
|
20
|
-
const pipeline = await (0, client_transcode_1.createVodPipeline)(name, ctx
|
|
24
|
+
const pipeline = await (0, client_transcode_1.createVodPipeline)(name, ctx, {
|
|
25
|
+
outputBucketName: options.outputBucketName,
|
|
26
|
+
accessKeyId: options.accessKeyId,
|
|
27
|
+
secretAccessKey: options.secretAccessKey,
|
|
28
|
+
endpoint: options.endpoint
|
|
29
|
+
});
|
|
21
30
|
(0, client_core_1.Log)().info('VOD pipeline created, starting job to create VOD');
|
|
22
31
|
const job = await (0, client_transcode_1.createVod)(pipeline, source, ctx);
|
|
23
32
|
if (job) {
|
package/dist/vod/cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/vod/cmd.ts"],"names":[],"mappings":";;;AAAA,oDAAkD;AAClD,8DAIiC;AACjC,yCAAoC;AAEpC,SAAgB,MAAM;IACpB,MAAM,GAAG,GAAG,IAAI,mBAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CACV,oFAAoF,CACrF;SACA,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC;SAC1C,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAC/C,IAAI;YACF,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,WAAW,GAAG,UAAU,EAAE,GAAG,IAAI,MAAM,CAAC;YAC9C,MAAM,GAAG,GAAG,IAAI,qBAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;YACzC,IAAA,iBAAG,GAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAiB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/vod/cmd.ts"],"names":[],"mappings":";;;AAAA,oDAAkD;AAClD,8DAIiC;AACjC,yCAAoC;AAEpC,SAAgB,MAAM;IACpB,MAAM,GAAG,GAAG,IAAI,mBAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CACV,oFAAoF,CACrF;SACA,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC;SAC1C,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC;SAClC,MAAM,CAAC,6BAA6B,EAAE,gCAAgC,CAAC;SACvE,MAAM,CAAC,sBAAsB,EAAE,0CAA0C,CAAC;SAC1E,MAAM,CACL,2BAA2B,EAC3B,8CAA8C,CAC/C;SACA,MAAM,CAAC,kBAAkB,EAAE,yCAAyC,CAAC;SACrE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAC/C,IAAI;YACF,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,WAAW,GAAG,UAAU,EAAE,GAAG,IAAI,MAAM,CAAC;YAC9C,MAAM,GAAG,GAAG,IAAI,qBAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;YACzC,IAAA,iBAAG,GAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAiB,EAAC,IAAI,EAAE,GAAG,EAAE;gBAClD,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,CAAC,CAAC;YACH,IAAA,iBAAG,GAAE,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;YAC/D,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAS,EAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YACnD,IAAI,GAAG,EAAE;gBACP,IAAA,iBAAG,GAAE,CAAC,IAAI,CAAC,oCAAoC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;aAC/D;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;IAEL,GAAG;SACA,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,wCAAwC,CAAC;SACrD,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC;SAC1C,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACvC,IAAI;YACF,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,WAAW,GAAG,UAAU,EAAE,GAAG,IAAI,MAAM,CAAC;YAC9C,MAAM,GAAG,GAAG,IAAI,qBAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;YACzC,IAAA,iBAAG,GAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACpC,MAAM,IAAA,oCAAiB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACnC,IAAA,iBAAG,GAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;SACpC;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;IACL,OAAO,GAAG,CAAC;AACb,CAAC;AAvDD,wBAuDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@osaas/cli",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.19.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",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"@osaas/client-core": "^0.18.0",
|
|
26
26
|
"@osaas/client-db": "^0.6.3",
|
|
27
27
|
"@osaas/client-intercom": "^0.3.3",
|
|
28
|
-
"@osaas/client-transcode": "^0.
|
|
28
|
+
"@osaas/client-transcode": "^0.22.0",
|
|
29
29
|
"@osaas/client-web": "^0.5.7",
|
|
30
30
|
"@types/promptly": "^3.0.5",
|
|
31
31
|
"chalk": "4.1.2",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "c61fdc3a13bc5a0809974441adf75982f25d8703"
|
|
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());
|
package/src/vod/cmd.ts
CHANGED
|
@@ -15,13 +15,25 @@ export function cmdVod() {
|
|
|
15
15
|
)
|
|
16
16
|
.argument('<name>', 'Name of VOD Pipeline')
|
|
17
17
|
.argument('<source>', 'Source URL')
|
|
18
|
+
.option('--output-bucket-name <name>', 'Name of existing output bucket')
|
|
19
|
+
.option('--access-key-id <id>', 'Access key ID for existing output bucket')
|
|
20
|
+
.option(
|
|
21
|
+
'--secret-access-key <key>',
|
|
22
|
+
'Secret access key for existing output bucket'
|
|
23
|
+
)
|
|
24
|
+
.option('--endpoint <url>', 'Endpoint URL for existing output bucket')
|
|
18
25
|
.action(async (name, source, options, command) => {
|
|
19
26
|
try {
|
|
20
27
|
const globalOpts = command.optsWithGlobals();
|
|
21
28
|
const environment = globalOpts?.env || 'prod';
|
|
22
29
|
const ctx = new Context({ environment });
|
|
23
30
|
Log().info('Creating VOD pipeline');
|
|
24
|
-
const pipeline = await createVodPipeline(name, ctx
|
|
31
|
+
const pipeline = await createVodPipeline(name, ctx, {
|
|
32
|
+
outputBucketName: options.outputBucketName,
|
|
33
|
+
accessKeyId: options.accessKeyId,
|
|
34
|
+
secretAccessKey: options.secretAccessKey,
|
|
35
|
+
endpoint: options.endpoint
|
|
36
|
+
});
|
|
25
37
|
Log().info('VOD pipeline created, starting job to create VOD');
|
|
26
38
|
const job = await createVod(pipeline, source, ctx);
|
|
27
39
|
if (job) {
|