stepzen 0.34.0-experimental.c2191de → 0.34.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/LICENSE +1 -1
- package/README.md +3 -2
- package/lib/commands/delete.js +1 -1
- package/lib/commands/deploy.js +1 -1
- package/lib/commands/import/curl.js +1 -1
- package/lib/commands/import/graphql.js +1 -1
- package/lib/commands/import/index.js +1 -1
- package/lib/commands/import/mysql.d.ts +2 -2
- package/lib/commands/import/mysql.js +3 -3
- package/lib/commands/import/mysql.js.map +1 -1
- package/lib/commands/import/openapi.d.ts +31 -0
- package/lib/commands/import/openapi.d.ts.map +1 -0
- package/lib/commands/import/openapi.js +123 -0
- package/lib/commands/import/openapi.js.map +1 -0
- package/lib/commands/import/postgresql.d.ts +2 -2
- package/lib/commands/import/postgresql.js +3 -3
- package/lib/commands/import/postgresql.js.map +1 -1
- package/lib/commands/import/presto.d.ts +2 -2
- package/lib/commands/import/presto.js +3 -3
- package/lib/commands/import/presto.js.map +1 -1
- package/lib/commands/import/snowflake.d.ts +2 -2
- package/lib/commands/import/snowflake.js +3 -3
- package/lib/commands/import/snowflake.js.map +1 -1
- package/lib/commands/init.js +2 -2
- package/lib/commands/init.js.map +1 -1
- package/lib/commands/lint.js +1 -1
- package/lib/commands/list.d.ts.map +1 -1
- package/lib/commands/list.js +36 -4
- package/lib/commands/list.js.map +1 -1
- package/lib/commands/login.js +1 -1
- package/lib/commands/logout.js +1 -1
- package/lib/commands/request.js +1 -1
- package/lib/commands/service.d.ts.map +1 -1
- package/lib/commands/service.js +6 -11
- package/lib/commands/service.js.map +1 -1
- package/lib/commands/start.js +1 -1
- package/lib/commands/transpile.js +1 -1
- package/lib/commands/upload.js +1 -1
- package/lib/commands/validate.js +1 -1
- package/lib/commands/whoami.js +1 -1
- package/lib/generate/curl2sdl.js +1 -1
- package/lib/generate/flags.js +1 -1
- package/lib/generate/graphql2sdl.js +1 -1
- package/lib/generate/helpers.d.ts.map +1 -1
- package/lib/generate/helpers.js +31 -19
- package/lib/generate/helpers.js.map +1 -1
- package/lib/generate/import-command.d.ts +1 -1
- package/lib/generate/import-command.d.ts.map +1 -1
- package/lib/generate/import-command.js +2 -2
- package/lib/generate/import-command.js.map +1 -1
- package/lib/generate/openapi2sdl.d.ts +8 -0
- package/lib/generate/openapi2sdl.d.ts.map +1 -0
- package/lib/generate/openapi2sdl.js +19 -0
- package/lib/generate/openapi2sdl.js.map +1 -0
- package/lib/generate/questions.js +1 -1
- package/lib/generate/sql2sdl.js +1 -1
- package/lib/hooks/init/version.js +1 -1
- package/lib/hooks/prerun/check-upgrade.js +1 -1
- package/lib/hooks/prerun/ensure-config-file.js +1 -1
- package/lib/hooks/prerun/ensure-permissions.js +1 -1
- package/lib/index.js +1 -1
- package/lib/shared/actions.js +1 -1
- package/lib/shared/configuration.js +1 -1
- package/lib/shared/constants.js +1 -1
- package/lib/shared/curl-parser.js +1 -1
- package/lib/shared/docker.js +1 -1
- package/lib/shared/errors.js +1 -1
- package/lib/shared/header-params-parser.js +1 -1
- package/lib/shared/header.js +1 -1
- package/lib/shared/inquirer.js +1 -1
- package/lib/shared/moniker.js +1 -1
- package/lib/shared/path-params-parser.js +1 -1
- package/lib/shared/request-variables-parser.js +1 -1
- package/lib/shared/rmtemp.js +1 -1
- package/lib/shared/stepzen-sdk.js +1 -1
- package/lib/shared/url-helpers.js +1 -1
- package/lib/shared/utils.js +2 -2
- package/lib/shared/utils.js.map +1 -1
- package/lib/shared/validation.js +1 -1
- package/lib/shared/workspace.js +1 -1
- package/lib/shared/zen-command.d.ts.map +1 -1
- package/lib/shared/zen-command.js +5 -2
- package/lib/shared/zen-command.js.map +1 -1
- package/oclif.manifest.json +62 -3
- package/package.json +11 -11
package/LICENSE
CHANGED
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.34.0
|
|
33
|
+
stepzen/0.34.0 linux-x64 node-v18.19.0
|
|
34
34
|
$ stepzen --help [COMMAND]
|
|
35
35
|
USAGE
|
|
36
36
|
$ stepzen COMMAND
|
|
@@ -671,7 +671,7 @@ USAGE
|
|
|
671
671
|
|
|
672
672
|
FLAGS
|
|
673
673
|
-h, --help Show CLI help
|
|
674
|
-
--endpoint=<value> Endpoint name (e.g.
|
|
674
|
+
--endpoint=<value> Endpoint name (e.g. api/myapp)
|
|
675
675
|
--non-interactive Disable all interactive prompts
|
|
676
676
|
--yes Accept default answers to interactive prompts
|
|
677
677
|
|
|
@@ -702,6 +702,7 @@ FLAGS
|
|
|
702
702
|
|
|
703
703
|
DESCRIPTION
|
|
704
704
|
List endpoints, schemas and configuration sets in your StepZen account.
|
|
705
|
+
All timestamps displayed by stepzen list endpoints are in your local time zone.
|
|
705
706
|
```
|
|
706
707
|
|
|
707
708
|
## `stepzen login [DOMAIN]`
|
package/lib/commands/delete.js
CHANGED
package/lib/commands/deploy.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
// Copyright IBM Corp. 2020,
|
|
3
|
+
// Copyright IBM Corp. 2020, 2024
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const chalk = require("chalk");
|
|
6
6
|
const graphql2sdl_1 = require("../../generate/graphql2sdl");
|
|
@@ -39,8 +39,8 @@ export default class ImportMySQL extends ImportCommandBase {
|
|
|
39
39
|
};
|
|
40
40
|
getImportOptionsFromDsn(possibleDsn: string): {
|
|
41
41
|
host: string;
|
|
42
|
-
user: string | undefined;
|
|
43
|
-
password: string | undefined;
|
|
42
|
+
user: string | number | boolean | undefined;
|
|
43
|
+
password: string | number | boolean | undefined;
|
|
44
44
|
database: string | undefined;
|
|
45
45
|
};
|
|
46
46
|
getImportOptionsInteractively(defaults?: Partial<MySQLAnswers>): Promise<MySQLAnswers>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2020,
|
|
2
|
+
// Copyright IBM Corp. 2020, 2024
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const errors_1 = require("@oclif/core/lib/errors");
|
|
@@ -94,8 +94,8 @@ class ImportMySQL extends import_command_1.ImportCommandBase {
|
|
|
94
94
|
const value = parsed.value;
|
|
95
95
|
const options = {
|
|
96
96
|
host: value.host + (value.port ? `:${value.port}` : ''),
|
|
97
|
-
user: value.user,
|
|
98
|
-
password: value.pass,
|
|
97
|
+
user: value.user ?? value.params?.user,
|
|
98
|
+
password: value.pass ?? value.params?.password,
|
|
99
99
|
database: value.db,
|
|
100
100
|
};
|
|
101
101
|
// Remove `undefined`-valued properties
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.js","sourceRoot":"","sources":["../../../src/commands/import/mysql.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mysql.js","sourceRoot":"","sources":["../../../src/commands/import/mysql.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { ImportCommandBase } from '../../generate/import-command';
|
|
2
|
+
import type { CommonImportOptions } from '../../generate/import-command';
|
|
3
|
+
import type { OpenApi2SdlOptions } from '../../generate/openapi2sdl';
|
|
4
|
+
import { Workspace } from '../../shared/types';
|
|
5
|
+
declare type InteractiveOpenApi2SdlOptions = Pick<OpenApi2SdlOptions, 'openapi'>;
|
|
6
|
+
declare type OpenApiAnswers = {
|
|
7
|
+
openapi: string;
|
|
8
|
+
};
|
|
9
|
+
export default class ImportOpenApi extends ImportCommandBase {
|
|
10
|
+
static description: string;
|
|
11
|
+
get source(): "openapi";
|
|
12
|
+
static hidden: boolean;
|
|
13
|
+
static flags: {
|
|
14
|
+
dir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
15
|
+
silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
16
|
+
name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
17
|
+
overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
18
|
+
help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
|
|
19
|
+
'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
20
|
+
};
|
|
21
|
+
static args: {
|
|
22
|
+
openapi: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
|
|
23
|
+
};
|
|
24
|
+
ensureOpenApiSpecFile(openapi: string, basedir: string): void;
|
|
25
|
+
protected import(commonOptions: CommonImportOptions, workspace: Workspace): Promise<import("../../shared/types").ErrorOr<import("../../generate/helpers").IntrospectionServiceResponse, {
|
|
26
|
+
message: string;
|
|
27
|
+
}>>;
|
|
28
|
+
getImportOptionsInteractively(defaults: Partial<OpenApiAnswers> | undefined, basedir: string): Promise<InteractiveOpenApi2SdlOptions>;
|
|
29
|
+
}
|
|
30
|
+
export {};
|
|
31
|
+
//# sourceMappingURL=openapi.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openapi.d.ts","sourceRoot":"","sources":["../../../src/commands/import/openapi.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAA;AAM/D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAU,SAAS,EAAC,MAAM,oBAAoB,CAAA;AAGrD,aAAK,6BAA6B,GAAG,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAA;AAExE,aAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,iBAAiB;IAC1D,MAAM,CAAC,WAAW,SAQkC;IAEpD,IAAI,MAAM,cAET;IAGD,MAAM,CAAC,MAAM,UAAO;IAEpB,MAAM,CAAC,KAAK;;;;;;;MAEX;IAED,MAAM,CAAC,IAAI;;MAIV;IAED,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;cAwBtC,MAAM,CACpB,aAAa,EAAE,mBAAmB,EAClC,SAAS,EAAE,SAAS;;;IA4EhB,6BAA6B,CACjC,QAAQ,qCAA8B,EACtC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,6BAA6B,CAAC;CAyB1C"}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
// Copyright IBM Corp. 2020, 2024
|
|
4
|
+
const core_1 = require("@oclif/core");
|
|
5
|
+
const chalk = require("chalk");
|
|
6
|
+
const fs = require("fs");
|
|
7
|
+
const path = require("path");
|
|
8
|
+
const import_command_1 = require("../../generate/import-command");
|
|
9
|
+
const openapi2sdl_1 = require("../../generate/openapi2sdl");
|
|
10
|
+
const configuration_1 = require("../../shared/configuration");
|
|
11
|
+
const inquirer = require("../../shared/inquirer");
|
|
12
|
+
const errors_1 = require("@oclif/core/lib/errors");
|
|
13
|
+
const constants_1 = require("../../shared/constants");
|
|
14
|
+
class ImportOpenApi extends import_command_1.ImportCommandBase {
|
|
15
|
+
get source() {
|
|
16
|
+
return 'openapi';
|
|
17
|
+
}
|
|
18
|
+
ensureOpenApiSpecFile(openapi, basedir) {
|
|
19
|
+
const abspath = path.resolve(basedir, openapi);
|
|
20
|
+
if (!fs.existsSync(abspath)) {
|
|
21
|
+
throw new errors_1.CLIError(`File does not exist: cannot find the OpenAPI spec file ${openapi}` +
|
|
22
|
+
` in the workspace directory ${basedir}. Please make sure the file` +
|
|
23
|
+
` name is correct and the file exists.`);
|
|
24
|
+
}
|
|
25
|
+
const extension = path.extname(openapi);
|
|
26
|
+
if (extension !== '.yaml' &&
|
|
27
|
+
extension !== '.yml' &&
|
|
28
|
+
extension !== '.json') {
|
|
29
|
+
throw new errors_1.CLIError(chalk `The {bold ${extension}} file type is not supported.` +
|
|
30
|
+
chalk ` {bold stepzen import openapi} currently supports only YAML` +
|
|
31
|
+
chalk ` and JSON files.`);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
async import(commonOptions, workspace) {
|
|
35
|
+
const { args, flags } = await this.parse(ImportOpenApi);
|
|
36
|
+
this.warn(chalk `\n{yellow {bold stepzen import openapi} is in preview and} ` +
|
|
37
|
+
chalk `{yellow does not support all OpenAPI features yet.}` +
|
|
38
|
+
`\n` +
|
|
39
|
+
chalk `{yellow We welcome your feedback on Discord (${constants_1.STEPZEN_DISCORD_URL})}`);
|
|
40
|
+
this.log();
|
|
41
|
+
if (args.openapi) {
|
|
42
|
+
this.ensureOpenApiSpecFile(args.openapi, workspace.directory);
|
|
43
|
+
}
|
|
44
|
+
const nonInteractiveOptions = {
|
|
45
|
+
openapi: args.openapi,
|
|
46
|
+
};
|
|
47
|
+
let openapi2sdlOptions;
|
|
48
|
+
if (nonInteractiveOptions.openapi) {
|
|
49
|
+
// an ugly hint for the TS compiler because it is not smart enough to figure this :(
|
|
50
|
+
const typedNonInteractiveOptions = nonInteractiveOptions;
|
|
51
|
+
// run non-interactively
|
|
52
|
+
openapi2sdlOptions = {
|
|
53
|
+
...commonOptions,
|
|
54
|
+
...typedNonInteractiveOptions,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
if (flags['non-interactive']) {
|
|
59
|
+
throw new errors_1.CLIError('Please provide an OpenAPI spec file.' +
|
|
60
|
+
chalk `\nSee more help with {bold stepzen import openapi --help}`);
|
|
61
|
+
}
|
|
62
|
+
// no parameters given: start an interactive prompt
|
|
63
|
+
if (!flags.silent) {
|
|
64
|
+
this.log();
|
|
65
|
+
this.log(chalk `{bold stepzen import openapi} - ` +
|
|
66
|
+
chalk.dim('introspect an OpenAPI spec file and extend your GraphQL schema' +
|
|
67
|
+
' with the types, queries and mutations for accessing this' +
|
|
68
|
+
' REST API through a StepZen API.'));
|
|
69
|
+
this.log();
|
|
70
|
+
}
|
|
71
|
+
// no parameters given: start an interactive prompt
|
|
72
|
+
const interactiveOptions = await this.getImportOptionsInteractively(nonInteractiveOptions, workspace.directory);
|
|
73
|
+
openapi2sdlOptions = {
|
|
74
|
+
...commonOptions,
|
|
75
|
+
...interactiveOptions,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
openapi2sdlOptions.openapi = fs.readFileSync(openapi2sdlOptions.openapi, 'utf-8');
|
|
79
|
+
const configuration = await (0, configuration_1.readConfiguration)();
|
|
80
|
+
return this.wrapInProgressAndTimeout((0, openapi2sdl_1.openapi2sdl)(openapi2sdlOptions, configuration));
|
|
81
|
+
}
|
|
82
|
+
async getImportOptionsInteractively(defaults = {}, basedir) {
|
|
83
|
+
const questions = inquirer.overrideDefaults([
|
|
84
|
+
{
|
|
85
|
+
name: 'openapi',
|
|
86
|
+
message: 'Path to an OpenAPI spec file on your local machine',
|
|
87
|
+
validate: input => {
|
|
88
|
+
try {
|
|
89
|
+
this.ensureOpenApiSpecFile(input, basedir);
|
|
90
|
+
return true;
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
return error.message;
|
|
94
|
+
}
|
|
95
|
+
},
|
|
96
|
+
},
|
|
97
|
+
], defaults);
|
|
98
|
+
const answers = await inquirer.prompt('import-openapi', questions);
|
|
99
|
+
return {
|
|
100
|
+
openapi: answers.openapi,
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
exports.default = ImportOpenApi;
|
|
105
|
+
ImportOpenApi.description = `Import a REST API from an OpenAPI spec as a subgraph into your GraphQL` +
|
|
106
|
+
` API.` +
|
|
107
|
+
`\n` +
|
|
108
|
+
chalk `\n{bold stepzen import openapi} automatically introspects an` +
|
|
109
|
+
` OpenAPI spec file, generates a GraphQL schema for accessing the REST` +
|
|
110
|
+
` API it describes through a StepZen API, and adds the generated types,` +
|
|
111
|
+
` queries, mutations and subscriptions for accessing this REST API` +
|
|
112
|
+
` through a StepZen API into your GraphQL schema.`;
|
|
113
|
+
// OpenAPI import is not yet GA
|
|
114
|
+
ImportOpenApi.hidden = true;
|
|
115
|
+
ImportOpenApi.flags = {
|
|
116
|
+
...import_command_1.ImportCommandBase.flags,
|
|
117
|
+
};
|
|
118
|
+
ImportOpenApi.args = {
|
|
119
|
+
openapi: core_1.Args.string({
|
|
120
|
+
name: 'OpenAPI spec file (YAML or JSON)',
|
|
121
|
+
}),
|
|
122
|
+
};
|
|
123
|
+
//# sourceMappingURL=openapi.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../../src/commands/import/openapi.ts"],"names":[],"mappings":";;AAAA,iCAAiC;AACjC,sCAAgC;AAChC,+BAA8B;AAC9B,yBAAwB;AACxB,6BAA4B;AAE5B,kEAA+D;AAC/D,4DAAsD;AACtD,8DAA4D;AAC5D,kDAAiD;AAEjD,mDAA+C;AAI/C,sDAA0D;AAQ1D,MAAqB,aAAc,SAAQ,kCAAiB;IAW1D,IAAI,MAAM;QACR,OAAO,SAAkB,CAAA;IAC3B,CAAC;IAeD,qBAAqB,CAAC,OAAe,EAAE,OAAe;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YAC3B,MAAM,IAAI,iBAAQ,CAChB,0DAA0D,OAAO,EAAE;gBACjE,+BAA+B,OAAO,6BAA6B;gBACnE,uCAAuC,CAC1C,CAAA;SACF;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACvC,IACE,SAAS,KAAK,OAAO;YACrB,SAAS,KAAK,MAAM;YACpB,SAAS,KAAK,OAAO,EACrB;YACA,MAAM,IAAI,iBAAQ,CAChB,KAAK,CAAA,aAAa,SAAS,+BAA+B;gBACxD,KAAK,CAAA,6DAA6D;gBAClE,KAAK,CAAA,kBAAkB,CAC1B,CAAA;SACF;IACH,CAAC;IAES,KAAK,CAAC,MAAM,CACpB,aAAkC,EAClC,SAAoB;QAEpB,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAErD,IAAI,CAAC,IAAI,CACP,KAAK,CAAA,6DAA6D;YAChE,KAAK,CAAA,qDAAqD;YAC1D,IAAI;YACJ,KAAK,CAAA,gDAAgD,+BAAmB,IAAI,CAC/E,CAAA;QACD,IAAI,CAAC,GAAG,EAAE,CAAA;QAEV,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;SAC9D;QAED,MAAM,qBAAqB,GAAG;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAA;QAED,IAAI,kBAAsC,CAAA;QAC1C,IAAI,qBAAqB,CAAC,OAAO,EAAE;YACjC,oFAAoF;YACpF,MAAM,0BAA0B,GAC9B,qBACwD,CAAA;YAE1D,wBAAwB;YACxB,kBAAkB,GAAG;gBACnB,GAAG,aAAa;gBAChB,GAAG,0BAA0B;aAC9B,CAAA;SACF;aAAM;YACL,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE;gBAC5B,MAAM,IAAI,iBAAQ,CAChB,sCAAsC;oBACpC,KAAK,CAAA,2DAA2D,CACnE,CAAA;aACF;YAED,mDAAmD;YACnD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACjB,IAAI,CAAC,GAAG,EAAE,CAAA;gBACV,IAAI,CAAC,GAAG,CACN,KAAK,CAAA,kCAAkC;oBACrC,KAAK,CAAC,GAAG,CACP,gEAAgE;wBAC9D,2DAA2D;wBAC3D,kCAAkC,CACrC,CACJ,CAAA;gBACD,IAAI,CAAC,GAAG,EAAE,CAAA;aACX;YAED,mDAAmD;YACnD,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CACjE,qBAAqB,EACrB,SAAS,CAAC,SAAS,CACpB,CAAA;YACD,kBAAkB,GAAG;gBACnB,GAAG,aAAa;gBAChB,GAAG,kBAAkB;aACtB,CAAA;SACF;QAED,kBAAkB,CAAC,OAAO,GAAG,EAAE,CAAC,YAAY,CAC1C,kBAAkB,CAAC,OAAO,EAC1B,OAAO,CACR,CAAA;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAiB,GAAE,CAAA;QAC/C,OAAO,IAAI,CAAC,wBAAwB,CAClC,IAAA,yBAAW,EAAC,kBAAkB,EAAE,aAAa,CAAC,CAC/C,CAAA;IACH,CAAC;IAED,KAAK,CAAC,6BAA6B,CACjC,WAAoC,EAAE,EACtC,OAAe;QAEf,MAAM,SAAS,GAAG,QAAQ,CAAC,gBAAgB,CACzC;YACE;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,oDAAoD;gBAC7D,QAAQ,EAAE,KAAK,CAAC,EAAE;oBAChB,IAAI;wBACF,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;wBAC1C,OAAO,IAAI,CAAA;qBACZ;oBAAC,OAAO,KAAU,EAAE;wBACnB,OAAO,KAAK,CAAC,OAAO,CAAA;qBACrB;gBACH,CAAC;aACF;SACF,EACD,QAAQ,CACT,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAA;QAElE,OAAO;YACL,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAA;IACH,CAAC;;AA7JH,gCA8JC;AA7JQ,yBAAW,GAChB,wEAAwE;IACxE,OAAO;IACP,IAAI;IACJ,KAAK,CAAA,8DAA8D;IACnE,uEAAuE;IACvE,wEAAwE;IACxE,mEAAmE;IACnE,kDAAkD,CAAA;AAMpD,+BAA+B;AACxB,oBAAM,GAAG,IAAI,CAAA;AAEb,mBAAK,GAAG;IACb,GAAG,kCAAiB,CAAC,KAAK;CAC3B,CAAA;AAEM,kBAAI,GAAG;IACZ,OAAO,EAAE,WAAI,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,kCAAkC;KACzC,CAAC;CACH,CAAA"}
|
|
@@ -41,8 +41,8 @@ export default class ImportPostgreSQL extends ImportCommandBase {
|
|
|
41
41
|
};
|
|
42
42
|
getImportOptionsFromDsn(possibleDsn: string): {
|
|
43
43
|
host: string;
|
|
44
|
-
user: string | undefined;
|
|
45
|
-
password: string | undefined;
|
|
44
|
+
user: string | number | boolean | undefined;
|
|
45
|
+
password: string | number | boolean | undefined;
|
|
46
46
|
database: string | undefined;
|
|
47
47
|
schema: string | undefined;
|
|
48
48
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2020,
|
|
2
|
+
// Copyright IBM Corp. 2020, 2024
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const errors_1 = require("@oclif/core/lib/errors");
|
|
@@ -95,8 +95,8 @@ class ImportPostgreSQL extends import_command_1.ImportCommandBase {
|
|
|
95
95
|
const value = parsed.value;
|
|
96
96
|
const options = {
|
|
97
97
|
host: value.host + (value.port ? `:${value.port}` : ''),
|
|
98
|
-
user: value.user,
|
|
99
|
-
password: value.pass,
|
|
98
|
+
user: value.user ?? value.params?.user,
|
|
99
|
+
password: value.pass ?? value.params?.password,
|
|
100
100
|
database: value.db,
|
|
101
101
|
schema: value.params?.schema === undefined
|
|
102
102
|
? undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgresql.js","sourceRoot":"","sources":["../../../src/commands/import/postgresql.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"postgresql.js","sourceRoot":"","sources":["../../../src/commands/import/postgresql.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,8 +39,8 @@ export default class ImportPresto extends ImportCommandBase {
|
|
|
39
39
|
};
|
|
40
40
|
getImportOptionsFromDsn(possibleDsn: string): {
|
|
41
41
|
host: string;
|
|
42
|
-
user: string | undefined;
|
|
43
|
-
password: string;
|
|
42
|
+
user: string | number | boolean | undefined;
|
|
43
|
+
password: string | number | true;
|
|
44
44
|
catalog: string | undefined;
|
|
45
45
|
schema: string | number | boolean | undefined;
|
|
46
46
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2020,
|
|
2
|
+
// Copyright IBM Corp. 2020, 2024
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const errors_1 = require("@oclif/core/lib/errors");
|
|
@@ -92,8 +92,8 @@ class ImportPresto extends import_command_1.ImportCommandBase {
|
|
|
92
92
|
const value = parsed.value;
|
|
93
93
|
const options = {
|
|
94
94
|
host: value.host + (value.port ? `:${value.port}` : ''),
|
|
95
|
-
user: value.user,
|
|
96
|
-
password: value.pass || '',
|
|
95
|
+
user: value.user ?? value.params?.user,
|
|
96
|
+
password: value.pass || value.params?.password || '',
|
|
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":"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
|
|
1
|
+
{"version":3,"file":"presto.js","sourceRoot":"","sources":["../../../src/commands/import/presto.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,8 +42,8 @@ export default class ImportSnowflake extends ImportCommandBase {
|
|
|
42
42
|
};
|
|
43
43
|
getImportOptionsFromDsn(possibleDsn: string): {
|
|
44
44
|
accountId: string;
|
|
45
|
-
user: string | undefined;
|
|
46
|
-
password: string | undefined;
|
|
45
|
+
user: string | number | boolean | undefined;
|
|
46
|
+
password: string | number | boolean | undefined;
|
|
47
47
|
database: string | undefined;
|
|
48
48
|
schema: string | undefined;
|
|
49
49
|
warehouse: string | undefined;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2020,
|
|
2
|
+
// Copyright IBM Corp. 2020, 2024
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const errors_1 = require("@oclif/core/lib/errors");
|
|
@@ -101,8 +101,8 @@ class ImportSnowflake extends import_command_1.ImportCommandBase {
|
|
|
101
101
|
const value = parsed.value;
|
|
102
102
|
const options = {
|
|
103
103
|
accountId: value.host,
|
|
104
|
-
user: value.user,
|
|
105
|
-
password: value.pass,
|
|
104
|
+
user: value.user ?? value.params?.user,
|
|
105
|
+
password: value.pass ?? value.params?.password,
|
|
106
106
|
database: value.db,
|
|
107
107
|
schema: value.params?.schema === undefined
|
|
108
108
|
? undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snowflake.js","sourceRoot":"","sources":["../../../src/commands/import/snowflake.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"snowflake.js","sourceRoot":"","sources":["../../../src/commands/import/snowflake.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/init.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2020,
|
|
2
|
+
// Copyright IBM Corp. 2020, 2024
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const workspace_1 = require("../shared/workspace");
|
|
@@ -22,7 +22,7 @@ Init.description = 'Initialize a StepZen workspace in the current directory.';
|
|
|
22
22
|
Init.flags = {
|
|
23
23
|
...zen_command_1.default.flags,
|
|
24
24
|
endpoint: core_1.Flags.string({
|
|
25
|
-
description: 'Endpoint name (e.g.
|
|
25
|
+
description: 'Endpoint name (e.g. api/myapp)',
|
|
26
26
|
}),
|
|
27
27
|
yes: core_1.Flags.boolean({
|
|
28
28
|
description: 'Accept default answers to interactive prompts',
|
package/lib/commands/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAEjC,sCAAuC;AAEvC,mDAAiD;AACjD,uDAA8C;AAE9C,MAAqB,IAAK,SAAQ,qBAAU;IAmB1C,KAAK,CAAC,GAAG;QACP,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAE5C,MAAM,OAAO,GAAG,MAAM,IAAA,yBAAa,EAAC;YAClC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC;SACzC,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,kCAAkC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QAC/D,OAAO,OAAO,CAAA;IAChB,CAAC;;AA/BH,uBAgCC;AA/BQ,gBAAW,GAChB,0DAA0D,CAAA;AAErD,UAAK,GAAG;IACb,GAAG,qBAAU,CAAC,KAAK;IACnB,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAEjC,sCAAuC;AAEvC,mDAAiD;AACjD,uDAA8C;AAE9C,MAAqB,IAAK,SAAQ,qBAAU;IAmB1C,KAAK,CAAC,GAAG;QACP,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAE5C,MAAM,OAAO,GAAG,MAAM,IAAA,yBAAa,EAAC;YAClC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC;SACzC,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,kCAAkC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QAC/D,OAAO,OAAO,CAAA;IAChB,CAAC;;AA/BH,uBAgCC;AA/BQ,gBAAW,GAChB,0DAA0D,CAAA;AAErD,UAAK,GAAG;IACb,GAAG,qBAAU,CAAC,KAAK;IACnB,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EAAE,gCAAgC;KAC9C,CAAC;IACF,GAAG,EAAE,YAAK,CAAC,OAAO,CAAC;QACjB,WAAW,EAAE,+CAA+C;QAC5D,OAAO,EAAE,KAAK;KACf,CAAC;CACH,CAAA;AAEM,SAAI,GAAG;IACZ,SAAS,EAAE,WAAI,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;CACvC,CAAA"}
|
package/lib/commands/lint.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AASA,OAAO,UAAU,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AASA,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAO9C,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,UAAU;IAC1C,MAAM,CAAC,WAAW,SAGyB;IAE3C,MAAM,CAAC,KAAK;;;MAEX;IAED,MAAM,CAAC,IAAI;;MAWV;IAEK,GAAG;CAuGV"}
|
package/lib/commands/list.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2020,
|
|
2
|
+
// Copyright IBM Corp. 2020, 2024
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const chalk = require("chalk");
|
|
5
5
|
const debug = require("debug");
|
|
@@ -35,7 +35,14 @@ class List extends zen_command_1.default {
|
|
|
35
35
|
adminKey: configuration.adminkey,
|
|
36
36
|
deploymentType: (0, constants_1.getDeploymentType)(configuration),
|
|
37
37
|
});
|
|
38
|
-
|
|
38
|
+
const response = await client.list.endpoints();
|
|
39
|
+
// filter out the internal properties so that they are not printed out
|
|
40
|
+
response.data?.forEach((endpoint) => {
|
|
41
|
+
delete endpoint.public;
|
|
42
|
+
delete endpoint.deploymentType;
|
|
43
|
+
delete endpoint.endpointType;
|
|
44
|
+
});
|
|
45
|
+
return response;
|
|
39
46
|
}
|
|
40
47
|
// the zenctl2 API is not available => using zenctl1
|
|
41
48
|
const response = await (0, actions_1.list)(type);
|
|
@@ -58,10 +65,33 @@ class List extends zen_command_1.default {
|
|
|
58
65
|
// Success, but no results
|
|
59
66
|
this.log('No results.');
|
|
60
67
|
}
|
|
61
|
-
else {
|
|
68
|
+
else if (typeof data[0] === 'string') {
|
|
62
69
|
// Success. The server returns a list of results.
|
|
70
|
+
// zenctl v1
|
|
63
71
|
this.log(`${JSON.stringify(data, null, ' ')}`);
|
|
64
72
|
}
|
|
73
|
+
else {
|
|
74
|
+
// zenctl v2
|
|
75
|
+
const endpoints = data;
|
|
76
|
+
// eslint-disable-next-line new-cap
|
|
77
|
+
const dtf = new Intl.DateTimeFormat(undefined, {
|
|
78
|
+
dateStyle: 'medium',
|
|
79
|
+
timeStyle: 'short',
|
|
80
|
+
});
|
|
81
|
+
core_1.ux.table(endpoints, {
|
|
82
|
+
endpoint: {
|
|
83
|
+
get: row => `${row.folderName}/${row.endpointName} `,
|
|
84
|
+
},
|
|
85
|
+
createdAt: {
|
|
86
|
+
header: 'Created at',
|
|
87
|
+
get: row => `${dtf.format(new Date(row.createdAt))} `,
|
|
88
|
+
},
|
|
89
|
+
updatedAt: {
|
|
90
|
+
header: 'Updated at',
|
|
91
|
+
get: row => dtf.format(new Date(row.updatedAt)),
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
}
|
|
65
95
|
}
|
|
66
96
|
else {
|
|
67
97
|
debug('stepzen:list')('failed to execute stepzen.list: ' + error.message);
|
|
@@ -70,7 +100,9 @@ class List extends zen_command_1.default {
|
|
|
70
100
|
}
|
|
71
101
|
}
|
|
72
102
|
exports.default = List;
|
|
73
|
-
List.description =
|
|
103
|
+
List.description = `List endpoints, schemas and configuration sets in your StepZen account.` +
|
|
104
|
+
chalk `\nAll timestamps displayed by {bold stepzen list endpoints} are in` +
|
|
105
|
+
chalk ` your {underline local time zone}.`;
|
|
74
106
|
List.flags = {
|
|
75
107
|
...zen_command_1.default.flags,
|
|
76
108
|
};
|
package/lib/commands/list.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAEjC,+BAA8B;AAC9B,+BAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/login.js
CHANGED
package/lib/commands/logout.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2020,
|
|
2
|
+
// Copyright IBM Corp. 2020, 2024
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
// This file contains the code for the `stepzen logout` command.
|
|
5
5
|
// The logout command removes the entry in the login file.
|
package/lib/commands/request.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Copyright IBM Corp. 2020,
|
|
2
|
+
// Copyright IBM Corp. 2020, 2024
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
// This file contains the code for the `stepzen request` command.
|
|
5
5
|
// The request command sends a GraphQL request to the StepZen endpoint
|