stepzen 0.30.0-experimental.c95ee07 → 0.30.0-experimental.da09cc6
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/README.md +10 -5
- package/lib/commands/import/mysql.js +1 -1
- package/lib/commands/import/mysql.js.map +1 -1
- package/lib/commands/import/postgresql.js +1 -1
- package/lib/commands/import/postgresql.js.map +1 -1
- package/lib/commands/import/presto.d.ts +1 -1
- package/lib/commands/import/presto.js +2 -2
- package/lib/commands/import/presto.js.map +1 -1
- package/lib/commands/import/snowflake.js +1 -1
- package/lib/commands/import/snowflake.js.map +1 -1
- package/lib/commands/login.d.ts +5 -0
- package/lib/commands/login.d.ts.map +1 -1
- package/lib/commands/login.js +103 -4
- package/lib/commands/login.js.map +1 -1
- package/lib/commands/request.d.ts.map +1 -1
- package/lib/commands/request.js +14 -4
- package/lib/commands/request.js.map +1 -1
- package/lib/commands/service.d.ts.map +1 -1
- package/lib/commands/service.js +3 -4
- package/lib/commands/service.js.map +1 -1
- package/lib/commands/start.d.ts.map +1 -1
- package/lib/commands/start.js +8 -13
- package/lib/commands/start.js.map +1 -1
- package/lib/commands/whoami.d.ts +1 -0
- package/lib/commands/whoami.d.ts.map +1 -1
- package/lib/commands/whoami.js +18 -4
- package/lib/commands/whoami.js.map +1 -1
- package/lib/shared/utils.d.ts +1 -1
- package/lib/shared/utils.d.ts.map +1 -1
- package/lib/shared/utils.js +18 -9
- package/lib/shared/utils.js.map +1 -1
- package/lib/shared/zen-command.d.ts.map +1 -1
- package/lib/shared/zen-command.js +6 -10
- package/lib/shared/zen-command.js.map +1 -1
- package/oclif.manifest.json +27 -6
- package/package.json +9 -9
- package/lib/shared/dsn-parser.d.ts +0 -3
- package/lib/shared/dsn-parser.d.ts.map +0 -1
- package/lib/shared/dsn-parser.js +0 -28
- package/lib/shared/dsn-parser.js.map +0 -1
package/README.md
CHANGED
|
@@ -30,7 +30,7 @@ $ npm install -g stepzen
|
|
|
30
30
|
$ stepzen COMMAND
|
|
31
31
|
running command...
|
|
32
32
|
$ stepzen (--version|-v)
|
|
33
|
-
stepzen/0.30.0-experimental.
|
|
33
|
+
stepzen/0.30.0-experimental.da09cc6 linux-x64 node-v18.16.0
|
|
34
34
|
$ stepzen --help [COMMAND]
|
|
35
35
|
USAGE
|
|
36
36
|
$ stepzen COMMAND
|
|
@@ -61,7 +61,7 @@ $ stepzen deploy ENDPOINT --schema=schema [--configurationsets=cs1[,cs2[,..]]]`]
|
|
|
61
61
|
* [`stepzen import snowflake [DSN]`](#stepzen-import-snowflake-dsn)
|
|
62
62
|
* [`stepzen init`](#stepzen-init)
|
|
63
63
|
* [`stepzen list [TYPE]`](#stepzen-list-type)
|
|
64
|
-
* [`stepzen login`](#stepzen-login)
|
|
64
|
+
* [`stepzen login [DOMAIN]`](#stepzen-login-domain)
|
|
65
65
|
* [`stepzen logout`](#stepzen-logout)
|
|
66
66
|
* [`stepzen request [QUERY]`](#stepzen-request-query)
|
|
67
67
|
* [`stepzen service [ACTION]`](#stepzen-service-action)
|
|
@@ -684,13 +684,17 @@ DESCRIPTION
|
|
|
684
684
|
List endpoints, schemas and configuration sets in your StepZen account.
|
|
685
685
|
```
|
|
686
686
|
|
|
687
|
-
## `stepzen login`
|
|
687
|
+
## `stepzen login [DOMAIN]`
|
|
688
688
|
|
|
689
689
|
Log in to StepZen.
|
|
690
690
|
|
|
691
691
|
```
|
|
692
692
|
USAGE
|
|
693
|
-
$ stepzen login [-h] [--non-interactive] [-a <value> | | --public] [-k <value> | | ]
|
|
693
|
+
$ stepzen login [DOMAIN] [-h] [--non-interactive] [-a <value> | | --public] [-k <value> | | ]
|
|
694
|
+
|
|
695
|
+
ARGUMENTS
|
|
696
|
+
DOMAIN Domain of the StepZen service to login to (e.g. stepzen.acme.com). If no domain is provided, stepzen.net is
|
|
697
|
+
used by default.
|
|
694
698
|
|
|
695
699
|
FLAGS
|
|
696
700
|
-a, --account=<value> StepZen account name (copy from https://stepzen.com/account). If not provided, the CLI prompts
|
|
@@ -931,13 +935,14 @@ View your StepZen credentials.
|
|
|
931
935
|
|
|
932
936
|
```
|
|
933
937
|
USAGE
|
|
934
|
-
$ stepzen whoami [-h] [--non-interactive] [--showkeys | --account | --adminkey | --apikey]
|
|
938
|
+
$ stepzen whoami [-h] [--non-interactive] [--showkeys | --account | --adminkey | --apikey | --domain]
|
|
935
939
|
|
|
936
940
|
FLAGS
|
|
937
941
|
-h, --help Show CLI help
|
|
938
942
|
--account
|
|
939
943
|
--adminkey
|
|
940
944
|
--apikey
|
|
945
|
+
--domain
|
|
941
946
|
--non-interactive Disable all interactive prompts
|
|
942
947
|
--showkeys
|
|
943
948
|
|
|
@@ -10,7 +10,7 @@ const import_command_1 = require("../../generate/import-command");
|
|
|
10
10
|
const questions_1 = require("../../generate/questions");
|
|
11
11
|
const sql2sdl_1 = require("../../generate/sql2sdl");
|
|
12
12
|
const configuration_1 = require("../../shared/configuration");
|
|
13
|
-
const dsn_parser_1 = require("
|
|
13
|
+
const dsn_parser_1 = require("@soluble/dsn-parser");
|
|
14
14
|
const inquirer = require("../../shared/inquirer");
|
|
15
15
|
const utils_1 = require("../../shared/utils");
|
|
16
16
|
class ImportMySQL extends import_command_1.ImportCommandBase {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.js","sourceRoot":"","sources":["../../../src/commands/import/mysql.ts"],"names":[],"mappings":";AAAA,mDAAmD;;AAEnD,sCAAgC;AAChC,mDAA+C;AAC/C,+BAA8B;AAC9B,mCAA6B;AAE7B,gDAAgD;AAChD,kEAA+D;AAC/D,wDAAwD;AACxD,oDAA8C;AAC9C,8DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"mysql.js","sourceRoot":"","sources":["../../../src/commands/import/mysql.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const import_command_1 = require("../../generate/import-command");
|
|
|
10
10
|
const questions_1 = require("../../generate/questions");
|
|
11
11
|
const sql2sdl_1 = require("../../generate/sql2sdl");
|
|
12
12
|
const configuration_1 = require("../../shared/configuration");
|
|
13
|
-
const dsn_parser_1 = require("
|
|
13
|
+
const dsn_parser_1 = require("@soluble/dsn-parser");
|
|
14
14
|
const inquirer = require("../../shared/inquirer");
|
|
15
15
|
const utils_1 = require("../../shared/utils");
|
|
16
16
|
class ImportPostgreSQL extends import_command_1.ImportCommandBase {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgresql.js","sourceRoot":"","sources":["../../../src/commands/import/postgresql.ts"],"names":[],"mappings":";AAAA,mDAAmD;;AAEnD,sCAAgC;AAChC,mDAA+C;AAC/C,+BAA8B;AAC9B,mCAA6B;AAE7B,gDAAgD;AAChD,kEAA+D;AAC/D,wDAAwD;AACxD,oDAA8C;AAC9C,8DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"postgresql.js","sourceRoot":"","sources":["../../../src/commands/import/postgresql.ts"],"names":[],"mappings":";AAAA,mDAAmD;;AAEnD,sCAAgC;AAChC,mDAA+C;AAC/C,+BAA8B;AAC9B,mCAA6B;AAE7B,gDAAgD;AAChD,kEAA+D;AAC/D,wDAAwD;AACxD,oDAA8C;AAC9C,8DAA4D;AAC5D,oDAA4C;AAC5C,kDAAiD;AACjD,8CAAgE;AAchE,MAAqB,gBAAiB,SAAQ,kCAAiB;IAS7D,IAAI,MAAM;QACR,OAAO,YAAqB,CAAA;IAC9B,CAAC;IA2BS,KAAK,CAAC,MAAM,CAAC,aAAkC;QACvD,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QAExD,MAAM,qBAAqB,GAAG;YAC5B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;SACzC,CAAA;QAED,MAAM,eAAe,GAA8C;YACjE,MAAM;YACN,MAAM;YACN,UAAU;YACV,UAAU;SACX,CAAA;QACD,MAAM,kBAAkB,GAAG,eAAe,CAAC,KAAK,CAC9C,MAAM,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,SAAS,CACtD,CAAA;QAED,IAAI,cAAuC,CAAA;QAC3C,IAAI,kBAAkB,EAAE;YACtB,oFAAoF;YACpF,MAAM,0BAA0B,GAC9B,qBAMG,CAAA;YAEL,wBAAwB;YACxB,cAAc,GAAG;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,aAAa;gBAChB,GAAG,0BAA0B;aAC9B,CAAA;SACF;aAAM;YACL,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE;gBAC5B,MAAM,IAAI,iBAAQ,CAChB,2EAA2E;oBACzE,KAAK,CAAA,8DAA8D,CACtE,CAAA;aACF;YAED,mDAAmD;YACnD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACjB,IAAI,CAAC,GAAG,EAAE,CAAA;gBACV,IAAI,CAAC,GAAG,CACN,KAAK,CAAA,qCAAqC;oBACxC,KAAK,CAAC,GAAG,CACP,iEAAiE;wBAC/D,iEAAiE;wBACjE,iBAAiB,CACpB,CACJ,CAAA;gBACD,IAAI,CAAC,GAAG,EAAE,CAAA;aACX;YAED,2EAA2E;YAC3E,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CACjE,qBAAqB,CACtB,CAAA;YAED,cAAc,GAAG;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,aAAa;gBAChB,oEAAoE;gBACpE,sEAAsE;gBACtE,0DAA0D;gBAC1D,GAAG,qBAAqB;gBACxB,GAAG,kBAAkB;aACtB,CAAA;SACF;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAiB,GAAE,CAAA;QAC/C,cAAc,CAAC,IAAI,GAAG,IAAA,qCAA6B,EACjD,aAAa,EACb,cAAc,CAAC,IAAI,CACpB,CAAA;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC,IAAA,iBAAO,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAA;IAC9E,CAAC;IAED,yBAAyB,CAAC,KAAsC;QAC9D,MAAM,OAAO,GAAG;YACd,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;YACtB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;YACtB,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC;YAC9B,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC;YAC9B,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC;YAC1B,SAAS,EAAE,KAAK,CAAC,eAAe,CAAC;YACjC,OAAO,EAAE,KAAK,CAAC,YAAY,CAAuC;YAClE,oBAAoB,EAAE;gBACpB,iEAAiE;gBACjE,uDAAuD;gBACvD,MAAM,EAAE,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;aACvC;SAC5B,CAAA;QAED,uCAAuC;QACvC,OAAO,IAAA,eAAM,EAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,SAAS,CAAmB,CAAA;IACxE,CAAC;IAED,uBAAuB,CAAC,WAAmB;QACzC,MAAM,MAAM,GAAG,IAAA,qBAAQ,EAAC,WAAW,CAAC,CAAA;QACpC,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;YAC1B,MAAM,OAAO,GAAG;gBACd,IAAI,EAAE,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvD,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,QAAQ,EAAE,KAAK,CAAC,IAAI;gBACpB,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAClB,MAAM,EACJ,KAAK,CAAC,MAAM,EAAE,MAAM,KAAK,SAAS;oBAChC,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE;aAChC,CAAA;YAED,uCAAuC;YACvC,OAAO,IAAA,eAAM,EAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,SAAS,CAAmB,CAAA;SACvE;QAED,MAAM,IAAI,iBAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,6BAA6B,CACjC,WAAuC,EAAE;QAEzC,MAAM,SAAS,GAAG,QAAQ,CAAC,gBAAgB,CACzC;YACE,2BAAe,CAAC,MAAM,EAAE;YACxB,2BAAe,CAAC,MAAM,EAAE;YACxB,2BAAe,CAAC,UAAU,EAAE;YAC5B,2BAAe,CAAC,UAAU,EAAE;YAC5B,2BAAe,CAAC,QAAQ,EAAE;YAC1B,2BAAe,CAAC,WAAW,EAAE;SAC9B,EACD,QAAQ,CACT,CAAA;QAED,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,CAAA;IAC5D,CAAC;;AAnLH,mCAoLC;AAnLQ,4BAAW,GAChB,qEAAqE;IACrE,IAAI;IACJ,KAAK,CAAA,gEAAgE;IACrE,qEAAqE;IACrE,kEAAkE;IAClE,kDAAkD,CAAA;AAM7C,wBAAO,GAAG,CAAC,iBAAiB,CAAC,CAAA;AAE7B,sBAAK,GAAG;IACb,GAAG,kCAAiB,CAAC,KAAK;IAC1B,SAAS,EAAE,mBAAW,CAAC,MAAM,EAAE;IAC/B,SAAS,EAAE,mBAAW,CAAC,MAAM,EAAE;IAC/B,aAAa,EAAE,mBAAW,CAAC,UAAU,EAAE;IACvC,aAAa,EAAE,mBAAW,CAAC,UAAU,EAAE;IACvC,WAAW,EAAE,mBAAW,CAAC,QAAQ,EAAE;IACnC,eAAe,EAAE,mBAAW,CAAC,WAAW,EAAE;IAC1C,YAAY,EAAE,mBAAW,CAAC,SAAS,EAAE;IACrC,+BAA+B,EAAE,mBAAW,CAAC,qBAAqB,EAAE;CACrE,CAAA;AAEM,qBAAI,GAAG;IACZ,GAAG,EAAE,WAAI,CAAC,MAAM,CAAC;QACf,WAAW,EACT,KAAK,CAAA,sEAAsE;YAC3E,KAAK,CAAA,+EAA+E;YACpF,KAAK,CAAA,IAAI;YACT,KAAK,CAAA,+DAA+D;YACpE,KAAK,CAAA,2CAA2C;KACnD,CAAC;CACH,CAAA"}
|
|
@@ -40,7 +40,7 @@ export default class ImportPresto extends ImportCommandBase {
|
|
|
40
40
|
getImportOptionsFromDsn(possibleDsn: string): {
|
|
41
41
|
host: string;
|
|
42
42
|
user: string | undefined;
|
|
43
|
-
password: string
|
|
43
|
+
password: string;
|
|
44
44
|
catalog: string | undefined;
|
|
45
45
|
schema: string | number | boolean | undefined;
|
|
46
46
|
};
|
|
@@ -11,7 +11,7 @@ const questions_1 = require("../../generate/questions");
|
|
|
11
11
|
const sql2sdl_1 = require("../../generate/sql2sdl");
|
|
12
12
|
const configuration_1 = require("../../shared/configuration");
|
|
13
13
|
const constants_1 = require("../../shared/constants");
|
|
14
|
-
const dsn_parser_1 = require("
|
|
14
|
+
const dsn_parser_1 = require("@soluble/dsn-parser");
|
|
15
15
|
const inquirer = require("../../shared/inquirer");
|
|
16
16
|
const utils_1 = require("../../shared/utils");
|
|
17
17
|
class ImportPresto extends import_command_1.ImportCommandBase {
|
|
@@ -93,7 +93,7 @@ class ImportPresto extends import_command_1.ImportCommandBase {
|
|
|
93
93
|
const options = {
|
|
94
94
|
host: value.host + (value.port ? `:${value.port}` : ''),
|
|
95
95
|
user: value.user,
|
|
96
|
-
password: value.pass,
|
|
96
|
+
password: value.pass || '',
|
|
97
97
|
catalog: value.db,
|
|
98
98
|
schema: value.params?.schema,
|
|
99
99
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presto.js","sourceRoot":"","sources":["../../../src/commands/import/presto.ts"],"names":[],"mappings":";AAAA,mDAAmD;;AAEnD,sCAAuC;AACvC,mDAA+C;AAC/C,+BAA8B;AAC9B,mCAA6B;AAE7B,gDAAgD;AAChD,kEAA+D;AAC/D,wDAAwD;AACxD,oDAA8C;AAC9C,8DAA4D;AAC5D,sDAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"presto.js","sourceRoot":"","sources":["../../../src/commands/import/presto.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const import_command_1 = require("../../generate/import-command");
|
|
|
10
10
|
const questions_1 = require("../../generate/questions");
|
|
11
11
|
const sql2sdl_1 = require("../../generate/sql2sdl");
|
|
12
12
|
const configuration_1 = require("../../shared/configuration");
|
|
13
|
-
const dsn_parser_1 = require("
|
|
13
|
+
const dsn_parser_1 = require("@soluble/dsn-parser");
|
|
14
14
|
const inquirer = require("../../shared/inquirer");
|
|
15
15
|
const utils_1 = require("../../shared/utils");
|
|
16
16
|
class ImportSnowflake extends import_command_1.ImportCommandBase {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snowflake.js","sourceRoot":"","sources":["../../../src/commands/import/snowflake.ts"],"names":[],"mappings":";AAAA,mDAAmD;;AAEnD,sCAAuC;AACvC,mDAA+C;AAC/C,+BAA8B;AAC9B,mCAA6B;AAE7B,gDAAgD;AAChD,kEAA+D;AAC/D,wDAAwD;AACxD,oDAA8C;AAC9C,8DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"snowflake.js","sourceRoot":"","sources":["../../../src/commands/import/snowflake.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/login.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { ErrorOr, ServiceInstanceV2 } from '../shared/types';
|
|
1
2
|
import ZenCommand from '../shared/zen-command';
|
|
3
|
+
export declare const getServiceInstanceForDomain: (domainOrUrl?: string) => ErrorOr<ServiceInstanceV2 | undefined>;
|
|
2
4
|
export default class Login extends ZenCommand {
|
|
3
5
|
static description: string;
|
|
4
6
|
static flags: {
|
|
@@ -9,6 +11,9 @@ export default class Login extends ZenCommand {
|
|
|
9
11
|
help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
|
|
10
12
|
'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
11
13
|
};
|
|
14
|
+
static args: {
|
|
15
|
+
domain: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
|
|
16
|
+
};
|
|
12
17
|
run(): Promise<void>;
|
|
13
18
|
}
|
|
14
19
|
//# sourceMappingURL=login.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAC,OAAO,EAAwB,iBAAiB,EAAC,MAAM,iBAAiB,CAAA;AAEhF,OAAO,UAAU,MAAM,uBAAuB,CAAA;AA0C9C,eAAO,MAAM,2BAA2B,iBACxB,MAAM,KACnB,QAAQ,iBAAiB,GAAG,SAAS,CAsEvC,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,UAAU;IAC3C,MAAM,CAAC,WAAW,SAAuB;IAEzC,MAAM,CAAC,KAAK;;;;;;;MA2BX;IAED,MAAM,CAAC,IAAI;;MAQV;IAEK,GAAG;CA2GV"}
|
package/lib/commands/login.js
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Copyright (c) 2020,2021,2022,2023, StepZen, Inc.
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.getServiceInstanceForDomain = void 0;
|
|
4
5
|
// This file contains the code for the `stepzen login` command.
|
|
5
6
|
// Stepzen login checks that credentials presented are good and
|
|
6
7
|
// subsequently changes the identity of the logged in account.
|
|
7
8
|
const core_1 = require("@oclif/core");
|
|
9
|
+
const errors_1 = require("@oclif/core/lib/errors");
|
|
8
10
|
const chalk = require("chalk");
|
|
11
|
+
const debug = require("debug");
|
|
9
12
|
const configuration_1 = require("../shared/configuration");
|
|
10
13
|
const constants_1 = require("../shared/constants");
|
|
11
14
|
const stepzen_sdk_1 = require("../shared/stepzen-sdk");
|
|
15
|
+
const utils_1 = require("../shared/utils");
|
|
12
16
|
const zen_command_1 = require("../shared/zen-command");
|
|
13
17
|
// If the `--config` file defines a custom service instance, the `login`
|
|
14
18
|
// command should authenticate against the ZenCtl2 API of _that_ service
|
|
@@ -38,15 +42,90 @@ async function tryCustomZenCtl2ThenDefaultZenCtl2ThenDefaultZenCtl1(configuratio
|
|
|
38
42
|
}
|
|
39
43
|
return (0, stepzen_sdk_1.tryZenCtl2ThenZenCtl1)(configuration, fn);
|
|
40
44
|
}
|
|
45
|
+
const getServiceInstanceForDomain = (domainOrUrl) => {
|
|
46
|
+
if (domainOrUrl === undefined) {
|
|
47
|
+
return { result: undefined };
|
|
48
|
+
}
|
|
49
|
+
// Test with a regex first because `new URL('localhost:9000')` succeeds and
|
|
50
|
+
// considers `localhost:` to be a scheme, and `9000` to be a hostname, which
|
|
51
|
+
// is not expected here.
|
|
52
|
+
let port;
|
|
53
|
+
const HOST_AND_PORT_REGEX = /^(?<hostname>[a-z0-9\-._~%]+|\[[a-f0-9:.]+\]):(?<port>\d+)$/i;
|
|
54
|
+
const match = HOST_AND_PORT_REGEX.exec(domainOrUrl);
|
|
55
|
+
if (match && match.groups?.hostname && match.groups?.port) {
|
|
56
|
+
port = match.groups.port;
|
|
57
|
+
domainOrUrl = match.groups.hostname;
|
|
58
|
+
}
|
|
59
|
+
let url;
|
|
60
|
+
try {
|
|
61
|
+
url = new URL(domainOrUrl);
|
|
62
|
+
if (url.pathname === '/') {
|
|
63
|
+
url.pathname = constants_1.ZENCTL2_URL;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
const zenctl2 = `http${(0, utils_1.isLocalhost)(domainOrUrl) ? '' : 's'}://${domainOrUrl}${port ? `:${port}` : ''}${constants_1.ZENCTL2_URL}`;
|
|
68
|
+
// ensure the inferred zenctl2 URL is valid
|
|
69
|
+
try {
|
|
70
|
+
url = new URL(zenctl2);
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
debug('stepzen:login')(`the inferred zenctl2 URL is invalid: ${zenctl2}`);
|
|
74
|
+
return {
|
|
75
|
+
error: {
|
|
76
|
+
message: error.message || 'Invalid URL',
|
|
77
|
+
},
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
// special case since stepzen.net is the default
|
|
82
|
+
if (url.hostname === 'stepzen.net' || url.hostname.endsWith('.stepzen.net')) {
|
|
83
|
+
return { result: undefined };
|
|
84
|
+
}
|
|
85
|
+
// special case since steprz.net uses ZenCtl v1 (and is the default)
|
|
86
|
+
// disallow x.steprz.net but do allow us.ibm.steprz.net
|
|
87
|
+
if (url.hostname.match(/^([A-Za-z0-9]+\.)?steprz\.net$/)) {
|
|
88
|
+
return {
|
|
89
|
+
error: {
|
|
90
|
+
message: chalk `Not currently supported - {bold stepzen login steprz.net}` +
|
|
91
|
+
chalk ` requires {bold steprz.net} to use ZenCtl v2.`,
|
|
92
|
+
},
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
// ZenCtl v2 endpoint is deployed to the `stepzen` account
|
|
96
|
+
if (!(0, utils_1.isLocalhost)(url) && url.hostname.includes('.')) {
|
|
97
|
+
url.hostname = `stepzen.${url.hostname}`;
|
|
98
|
+
}
|
|
99
|
+
debug('stepzen:login')(`using zenctl2 URL ${url}`);
|
|
100
|
+
return {
|
|
101
|
+
result: {
|
|
102
|
+
deploymentType: 'local',
|
|
103
|
+
zenctl2: url.href,
|
|
104
|
+
},
|
|
105
|
+
};
|
|
106
|
+
};
|
|
107
|
+
exports.getServiceInstanceForDomain = getServiceInstanceForDomain;
|
|
41
108
|
class Login extends zen_command_1.default {
|
|
42
109
|
async run() {
|
|
43
|
-
const { flags } = await this.parse(Login);
|
|
110
|
+
const { flags, args } = await this.parse(Login);
|
|
111
|
+
if (flags.public && args.domain) {
|
|
112
|
+
throw new errors_1.CLIError(chalk `Public accounts are only supported in the {bold stepzen.net} StepZen service instance.` +
|
|
113
|
+
chalk ` Please remove either {bold --public} or {bold ${args.domain}}.`);
|
|
114
|
+
}
|
|
115
|
+
const { result: claimedServiceInstance, error } = (0, exports.getServiceInstanceForDomain)(args.domain);
|
|
116
|
+
if (error) {
|
|
117
|
+
const message = error.message === 'Invalid URL'
|
|
118
|
+
? chalk `Could not parse {bold ${args.domain}} as a StepZen service` +
|
|
119
|
+
chalk ` instance domain name or URL. Please make sure it's correct.`
|
|
120
|
+
: error.message;
|
|
121
|
+
throw new errors_1.CLIError(message);
|
|
122
|
+
}
|
|
44
123
|
const initialConfig = await (0, configuration_1.readConfiguration)();
|
|
45
124
|
let claimedConfig = {
|
|
46
125
|
uuid: initialConfig.uuid,
|
|
47
126
|
account: undefined,
|
|
48
127
|
adminkey: undefined,
|
|
49
|
-
serviceInstance:
|
|
128
|
+
serviceInstance: claimedServiceInstance,
|
|
50
129
|
};
|
|
51
130
|
if (flags.config) {
|
|
52
131
|
// If the --config flag is provided, try and log in using the credentials
|
|
@@ -56,7 +135,12 @@ class Login extends zen_command_1.default {
|
|
|
56
135
|
...claimedConfig,
|
|
57
136
|
account: referenceConfig.account,
|
|
58
137
|
adminkey: referenceConfig.adminkey,
|
|
59
|
-
serviceInstance:
|
|
138
|
+
serviceInstance: claimedConfig.serviceInstance
|
|
139
|
+
? {
|
|
140
|
+
...claimedConfig.serviceInstance,
|
|
141
|
+
...referenceConfig.serviceInstance,
|
|
142
|
+
}
|
|
143
|
+
: referenceConfig.serviceInstance,
|
|
60
144
|
};
|
|
61
145
|
}
|
|
62
146
|
let loggedInConfig;
|
|
@@ -96,7 +180,14 @@ class Login extends zen_command_1.default {
|
|
|
96
180
|
// This call alone won't remove the service instance from config file
|
|
97
181
|
await (0, configuration_1.writeCredentialsAndServiceToConfigFile)(credentials);
|
|
98
182
|
}
|
|
99
|
-
|
|
183
|
+
const host = serviceInstance
|
|
184
|
+
? new URL(serviceInstance.zenctl2).host.replace(/^stepzen\./, '')
|
|
185
|
+
: 'stepzen.net';
|
|
186
|
+
const toInstanceMsg = host.endsWith('stepzen.net')
|
|
187
|
+
? ''
|
|
188
|
+
: chalk ` to {bold ${host}}`;
|
|
189
|
+
this.log(`You have successfully logged in${toInstanceMsg} with the` +
|
|
190
|
+
chalk ` {bold ${credentials.account}} account.`);
|
|
100
191
|
}
|
|
101
192
|
}
|
|
102
193
|
exports.default = Login;
|
|
@@ -126,4 +217,12 @@ Login.flags = {
|
|
|
126
217
|
hidden: true,
|
|
127
218
|
}),
|
|
128
219
|
};
|
|
220
|
+
Login.args = {
|
|
221
|
+
domain: core_1.Args.string({
|
|
222
|
+
required: false,
|
|
223
|
+
description: chalk `Domain of the StepZen service to login to (e.g.` +
|
|
224
|
+
chalk ` {bold stepzen.acme.com}). If no domain is provided,` +
|
|
225
|
+
chalk ` {bold stepzen.net} is used by default.`,
|
|
226
|
+
}),
|
|
227
|
+
};
|
|
129
228
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":";AAAA,mDAAmD
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/commands/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/commands/request.ts"],"names":[],"mappings":"AAmBA,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAI9C,OAAO,KAAK,EAIV,uBAAuB,EACxB,MAAM,SAAS,CAAA;AA2BhB,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,UAAU;IAC7C,MAAM,CAAC,WAAW,SAGH;IAEf,MAAM,CAAC,KAAK;;;;;;;;;;MA+DX;IAED,MAAM,CAAC,IAAI;;MAMV;IAEK,GAAG;IA2JT,eAAe,CACb,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM;IA8BT,mBAAmB,CACjB,KAAK,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,GACrB,uBAAuB;IA2C1B,mBAAmB,CACjB,KAAK,EAAE,uBAAuB,EAC9B,aAAa,CAAC,EAAE,MAAM,EAAE,EACxB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAgCtB,2BAA2B,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG;QACxD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC7B,OAAO,EAAE,MAAM,EAAE,CAAA;KAClB;CA8BF"}
|
package/lib/commands/request.js
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
// in the current / given StepZen workspace.
|
|
7
7
|
// The endpoint needs to be deployed first for this command to work.
|
|
8
8
|
const chalk = require("chalk");
|
|
9
|
+
const debug = require("debug");
|
|
9
10
|
const fs = require("fs");
|
|
10
11
|
const core_1 = require("@oclif/core");
|
|
11
12
|
const errors_1 = require("@oclif/core/lib/errors");
|
|
@@ -81,14 +82,18 @@ class Request extends zen_command_1.default {
|
|
|
81
82
|
let count = 0;
|
|
82
83
|
let lastTimestamp = new Date().getTime();
|
|
83
84
|
let lastResult;
|
|
84
|
-
|
|
85
|
+
const payload = {
|
|
85
86
|
query,
|
|
86
87
|
variables,
|
|
87
88
|
operationName: flags['operation-name'],
|
|
88
|
-
}
|
|
89
|
+
};
|
|
90
|
+
debug('stepzen:request')(`opening a web socket connection to ${url}` +
|
|
91
|
+
`\nheaders: ${JSON.stringify(headers, undefined, 2)}` +
|
|
92
|
+
`\npayload: ${JSON.stringify(payload, undefined, 2)}`);
|
|
93
|
+
client.subscribe(payload, {
|
|
89
94
|
next: result => {
|
|
90
95
|
if (count === 0) {
|
|
91
|
-
// Avoid printing this message before the
|
|
96
|
+
// Avoid printing this message before the first non-error response
|
|
92
97
|
this.log(chalk `Subscribed to {bold ${url}}`);
|
|
93
98
|
}
|
|
94
99
|
const timestamp = new Date().getTime();
|
|
@@ -101,8 +106,13 @@ class Request extends zen_command_1.default {
|
|
|
101
106
|
this.log((0, utils_1.prependEachLine)(JSON.stringify(result, undefined, 2), prefix));
|
|
102
107
|
},
|
|
103
108
|
error: (error) => {
|
|
104
|
-
if (
|
|
109
|
+
if (error?.error instanceof Error) {
|
|
110
|
+
// a web socket connection issue
|
|
111
|
+
reject(error.error);
|
|
112
|
+
}
|
|
113
|
+
else if (Array.isArray(error) &&
|
|
105
114
|
error.every(e => 'message' in e)) {
|
|
115
|
+
// graphql error
|
|
106
116
|
const errors = error;
|
|
107
117
|
reject(new Error(formatErrorMessage(errors)));
|
|
108
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/commands/request.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/commands/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/commands/service.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/commands/service.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/service.js
CHANGED
|
@@ -13,7 +13,7 @@ const shescape_1 = require("shescape");
|
|
|
13
13
|
const configuration_1 = require("../shared/configuration");
|
|
14
14
|
const constants_1 = require("../shared/constants");
|
|
15
15
|
const docker_1 = require("../shared/docker");
|
|
16
|
-
const dsn_parser_1 = require("
|
|
16
|
+
const dsn_parser_1 = require("@soluble/dsn-parser");
|
|
17
17
|
const inquirer = require("../shared/inquirer");
|
|
18
18
|
const utils_1 = require("../shared/utils");
|
|
19
19
|
const zen_command_1 = require("../shared/zen-command");
|
|
@@ -142,10 +142,9 @@ class Service extends zen_command_1.default {
|
|
|
142
142
|
async getPorts(flags) {
|
|
143
143
|
const config = await (0, configuration_1.readConfiguration)();
|
|
144
144
|
const legacyPorts = new Set();
|
|
145
|
-
if (
|
|
146
|
-
config.serviceInstance &&
|
|
145
|
+
if (config.serviceInstance &&
|
|
147
146
|
'zenctl2' in config.serviceInstance &&
|
|
148
|
-
config.serviceInstance.zenctl2) {
|
|
147
|
+
(0, utils_1.isLocalhost)(config.serviceInstance.zenctl2)) {
|
|
149
148
|
const zenservPort = (0, utils_1.getPortFromUrl)(config.serviceInstance.zenctl2);
|
|
150
149
|
if (!flags.port && zenservPort !== DEFAULT_ZEN_PORT) {
|
|
151
150
|
// see https://github.com/steprz/stepzen-cli/issues/956
|