stepzen 0.26.0 → 0.27.0-beta.1
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 +35 -9
- package/lib/commands/import.d.ts +88 -94
- package/lib/commands/import.d.ts.map +1 -1
- package/lib/commands/import.js +191 -140
- package/lib/commands/import.js.map +1 -1
- package/lib/commands/request.d.ts +4 -1
- package/lib/commands/request.d.ts.map +1 -1
- package/lib/commands/request.js +39 -26
- package/lib/commands/request.js.map +1 -1
- package/lib/generate/helpers.d.ts +1 -12
- package/lib/generate/helpers.d.ts.map +1 -1
- package/lib/generate/helpers.js +1 -149
- package/lib/generate/helpers.js.map +1 -1
- package/lib/generate/index.d.ts +0 -8
- package/lib/generate/index.d.ts.map +1 -1
- package/lib/generate/index.js +0 -100
- package/lib/generate/index.js.map +1 -1
- package/lib/generate/sql2sdl.d.ts +29 -7
- package/lib/generate/sql2sdl.d.ts.map +1 -1
- package/lib/generate/sql2sdl.js +95 -32
- package/lib/generate/sql2sdl.js.map +1 -1
- package/lib/shared/constants.d.ts +0 -3
- package/lib/shared/constants.d.ts.map +1 -1
- package/lib/shared/constants.js +2 -8
- package/lib/shared/constants.js.map +1 -1
- package/lib/shared/inquirer.d.ts +1 -1
- package/lib/shared/inquirer.d.ts.map +1 -1
- package/lib/shared/inquirer.js.map +1 -1
- package/lib/shared/request-variables-parser.d.ts +1 -1
- package/lib/shared/request-variables-parser.d.ts.map +1 -1
- package/lib/shared/request-variables-parser.js +27 -20
- package/lib/shared/request-variables-parser.js.map +1 -1
- package/lib/shared/types.d.ts +6 -0
- package/lib/shared/types.d.ts.map +1 -1
- package/lib/shared/zen-command.d.ts +3 -1
- package/lib/shared/zen-command.d.ts.map +1 -1
- package/lib/shared/zen-command.js +38 -9
- package/lib/shared/zen-command.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +7 -7
package/lib/generate/sql2sdl.js
CHANGED
|
@@ -8,17 +8,21 @@ const helpers_1 = require("./helpers");
|
|
|
8
8
|
const constants_1 = require("../shared/constants");
|
|
9
9
|
const utils_1 = require("../shared/utils");
|
|
10
10
|
const askSqlQuestions = async (dbType, defaultAnswers = {}) => {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
11
|
+
const toUpperIfSnowflake = (input) => dbType === 'snowflake' ? input.toUpperCase() : input;
|
|
12
|
+
const questions = [
|
|
13
|
+
dbType === 'mysql' || dbType === 'postgresql'
|
|
14
|
+
? {
|
|
15
|
+
name: 'host',
|
|
16
|
+
message: 'What is your host?',
|
|
17
|
+
validate: input => (0, utils_1.parseHost)(input).isValid ||
|
|
18
|
+
`Could not parse "${input}" as a hostname.`,
|
|
19
|
+
}
|
|
20
|
+
: {
|
|
21
|
+
name: 'accountId',
|
|
22
|
+
message: 'What is your Snowflake account identifier?',
|
|
23
|
+
validate: input => input.trim() !== '' ||
|
|
24
|
+
'Snowflake account identifier must not be empty',
|
|
25
|
+
},
|
|
22
26
|
{
|
|
23
27
|
name: 'user',
|
|
24
28
|
message: 'What is the username?',
|
|
@@ -29,6 +33,26 @@ const askSqlQuestions = async (dbType, defaultAnswers = {}) => {
|
|
|
29
33
|
message: 'What is the password?',
|
|
30
34
|
type: 'password',
|
|
31
35
|
},
|
|
36
|
+
{
|
|
37
|
+
name: 'database',
|
|
38
|
+
message: 'What is your database name?',
|
|
39
|
+
validate: input => input.trim() !== '' || 'Database name must not be empty',
|
|
40
|
+
filter: toUpperIfSnowflake,
|
|
41
|
+
},
|
|
42
|
+
dbType === 'postgresql' || dbType === 'snowflake'
|
|
43
|
+
? {
|
|
44
|
+
name: 'schema',
|
|
45
|
+
message: 'What is your database schema (leave blank to use defaults)?',
|
|
46
|
+
filter: toUpperIfSnowflake,
|
|
47
|
+
}
|
|
48
|
+
: undefined,
|
|
49
|
+
dbType === 'snowflake'
|
|
50
|
+
? {
|
|
51
|
+
name: 'warehouse',
|
|
52
|
+
message: 'What is your Snowflake warehouse?',
|
|
53
|
+
validate: input => input.trim() !== '' || 'Snowflake warehouse must not be empty',
|
|
54
|
+
}
|
|
55
|
+
: undefined,
|
|
32
56
|
{
|
|
33
57
|
name: 'linkTypes',
|
|
34
58
|
message: `Automatically link types based on foreign key relationships using @materializer` +
|
|
@@ -37,20 +61,25 @@ const askSqlQuestions = async (dbType, defaultAnswers = {}) => {
|
|
|
37
61
|
default: false,
|
|
38
62
|
},
|
|
39
63
|
];
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
{
|
|
43
|
-
name: 'schema',
|
|
44
|
-
message: 'What is your database schema (leave blank to use defaults)?',
|
|
45
|
-
},
|
|
46
|
-
]);
|
|
47
|
-
}
|
|
48
|
-
return inquirer.prompt(`import-${dbType}`, (0, helpers_1.overrideDefaults)(questions, defaultAnswers));
|
|
64
|
+
const validQuestions = questions.filter(value => value !== undefined);
|
|
65
|
+
return inquirer.prompt(`import-${dbType}`, (0, helpers_1.overrideDefaults)(validQuestions, defaultAnswers));
|
|
49
66
|
};
|
|
50
67
|
exports.askSqlQuestions = askSqlQuestions;
|
|
51
|
-
const sql2sdl = async (
|
|
68
|
+
const sql2sdl = async (_, options, configuration) => {
|
|
69
|
+
let driver;
|
|
70
|
+
switch (options.dbType) {
|
|
71
|
+
case 'mysql':
|
|
72
|
+
driver = 'MYSQL';
|
|
73
|
+
break;
|
|
74
|
+
case 'postgresql':
|
|
75
|
+
driver = 'POSTGRESQL';
|
|
76
|
+
break;
|
|
77
|
+
case 'snowflake':
|
|
78
|
+
driver = 'SNOWFLAKE';
|
|
79
|
+
break;
|
|
80
|
+
}
|
|
52
81
|
let inludeAsTableOptions;
|
|
53
|
-
switch (include) {
|
|
82
|
+
switch (options.include) {
|
|
54
83
|
case 'tables-only':
|
|
55
84
|
inludeAsTableOptions = 'ONLYTABLES';
|
|
56
85
|
break;
|
|
@@ -63,14 +92,36 @@ const sql2sdl = async (dbType, { name, source, host, database, user, password, l
|
|
|
63
92
|
default:
|
|
64
93
|
inludeAsTableOptions = null;
|
|
65
94
|
}
|
|
66
|
-
|
|
67
|
-
|
|
95
|
+
let naming;
|
|
96
|
+
switch (options.introspectionOptions?.naming) {
|
|
97
|
+
case '2022':
|
|
98
|
+
naming = 'USE_2022';
|
|
99
|
+
break;
|
|
100
|
+
case '2023':
|
|
101
|
+
naming = 'USE_2023';
|
|
102
|
+
break;
|
|
103
|
+
default:
|
|
104
|
+
naming = null;
|
|
105
|
+
}
|
|
106
|
+
let driverProperties;
|
|
107
|
+
if (options.dbType === 'snowflake') {
|
|
108
|
+
const [org, account] = options.accountId.split('-');
|
|
109
|
+
driverProperties = [
|
|
110
|
+
{ property: 'ORGANIZATION', value: org },
|
|
111
|
+
{ property: 'ACCOUNT', value: account },
|
|
112
|
+
{ property: 'WAREHOUSE', value: options.warehouse },
|
|
113
|
+
];
|
|
114
|
+
}
|
|
115
|
+
const effectiveName = options.name || options.dbType;
|
|
116
|
+
const hostDetails = options.dbType === 'snowflake'
|
|
117
|
+
? { host: '', port: undefined }
|
|
118
|
+
: (0, utils_1.parseHost)(options.host);
|
|
68
119
|
const response = await (0, helpers_1.queryIntrospectionService)((0, constants_1.getDBIntrospectionUrl)(configuration), {
|
|
69
120
|
operation: 'generateSDL',
|
|
70
121
|
variables: {
|
|
71
122
|
driver: {
|
|
72
123
|
type: 'DBDriver!',
|
|
73
|
-
value:
|
|
124
|
+
value: driver,
|
|
74
125
|
},
|
|
75
126
|
host: {
|
|
76
127
|
type: 'String!',
|
|
@@ -84,24 +135,34 @@ const sql2sdl = async (dbType, { name, source, host, database, user, password, l
|
|
|
84
135
|
},
|
|
85
136
|
database: {
|
|
86
137
|
type: 'String!',
|
|
87
|
-
value: database,
|
|
138
|
+
value: options.database,
|
|
88
139
|
},
|
|
89
140
|
user: {
|
|
90
141
|
type: 'String!',
|
|
91
|
-
value: user,
|
|
142
|
+
value: options.user,
|
|
92
143
|
},
|
|
93
144
|
password: {
|
|
94
145
|
type: 'String!',
|
|
95
|
-
value: password,
|
|
146
|
+
value: options.password,
|
|
96
147
|
},
|
|
97
148
|
onlyTypes: {
|
|
98
149
|
type: 'Boolean',
|
|
99
|
-
value: !linkTypes,
|
|
150
|
+
value: !options.linkTypes,
|
|
100
151
|
},
|
|
101
152
|
include: {
|
|
102
153
|
type: 'TableOptions',
|
|
103
154
|
value: inludeAsTableOptions,
|
|
104
155
|
},
|
|
156
|
+
introspectionOptions: {
|
|
157
|
+
type: 'DBIntrospectionOptionsInput',
|
|
158
|
+
value: {
|
|
159
|
+
naming,
|
|
160
|
+
},
|
|
161
|
+
},
|
|
162
|
+
driverProperties: {
|
|
163
|
+
type: '[DriverPropertyInput!]',
|
|
164
|
+
value: driverProperties,
|
|
165
|
+
},
|
|
105
166
|
schema: {
|
|
106
167
|
type: 'String',
|
|
107
168
|
// The introspection service treats the schema value '' (empty string)
|
|
@@ -109,7 +170,9 @@ const sql2sdl = async (dbType, { name, source, host, database, user, password, l
|
|
|
109
170
|
// the default, it needs to get a `null` schema value.
|
|
110
171
|
// However, when the user skips over the "schema" interactive question
|
|
111
172
|
// (by pressing <Enter>) the value of schema would be ''.
|
|
112
|
-
value:
|
|
173
|
+
value: options.dbType === 'mysql' || options.schema === ''
|
|
174
|
+
? null
|
|
175
|
+
: options.schema,
|
|
113
176
|
},
|
|
114
177
|
configName: {
|
|
115
178
|
type: 'String!',
|
|
@@ -122,9 +185,9 @@ const sql2sdl = async (dbType, { name, source, host, database, user, password, l
|
|
|
122
185
|
}
|
|
123
186
|
return (0, helpers_1.writeSdlAndConfig)({
|
|
124
187
|
name: effectiveName,
|
|
125
|
-
source,
|
|
188
|
+
source: options.source,
|
|
126
189
|
mergeTypes: true,
|
|
127
|
-
onConflict,
|
|
190
|
+
onConflict: options.onConflict,
|
|
128
191
|
response,
|
|
129
192
|
});
|
|
130
193
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql2sdl.js","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AAEnD,+BAA8B;AAE9B,+CAA8C;AAC9C,uCAIkB;AAGlB,mDAAyD;AACzD,2CAAyC;
|
|
1
|
+
{"version":3,"file":"sql2sdl.js","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,6 @@ export declare const STEPZEN_LOCAL_CONFIG_FILE: string;
|
|
|
7
7
|
export declare const STEPZEN_HISTORY_DIRECTORY: string;
|
|
8
8
|
export declare const STEPZEN_HISTORY_FILE = "{accounthash}.yaml.enc";
|
|
9
9
|
export declare const DEFAULT_STEPZEN_SERVER_URL = "https://{account}.stepzen.io";
|
|
10
|
-
export declare const STEPZEN_DIRECT_GENERATOR_ENGINES_URL: string;
|
|
11
|
-
export declare const STEPZEN_API_TEMPLATES_REPOSITORY = "https://github.com/steprz/stepzen-schemas";
|
|
12
10
|
export declare const ADMIN_DEPLOY_URL = "/cli/admin/deploy";
|
|
13
11
|
export declare const ADMIN_LIST_URL = "/cli/admin/list";
|
|
14
12
|
export declare const ADMIN_UPLOAD_URL = "/cli/admin/upload";
|
|
@@ -29,7 +27,6 @@ export declare const STEPZEN_AUTODB_PASSWORD = "stepzen-auto-metadata-password";
|
|
|
29
27
|
export declare const STEPZEN_AUTODB_DSN: string;
|
|
30
28
|
export declare const STEPZEN_DISCORD_URL = "https://discord.gg/9k2VdPn2FR";
|
|
31
29
|
export declare const DETECT_NAME_CONFLICTS = "STEPZEN_DETECT_NAME_CONFLICTS";
|
|
32
|
-
export declare const USE_GENERATOR_ENGINES = "STEPZEN_USE_GENERATOR_ENGINES";
|
|
33
30
|
/**
|
|
34
31
|
* Adds the path component to the URL if the URL is missing one.
|
|
35
32
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/shared/constants.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,oBAAoB,EAAE,4BAA4B,EAAC,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/shared/constants.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,oBAAoB,EAAE,4BAA4B,EAAC,MAAM,SAAS,CAAA;AAe1E,eAAO,MAAM,wBAAwB,QAAsC,CAAA;AAC3E,eAAO,MAAM,mCAAmC,QAG/C,CAAA;AACD,eAAO,MAAM,mBAAmB,QACsB,CAAA;AAGtD,eAAO,MAAM,+BAA+B,YAAY,CAAA;AAExD,eAAO,MAAM,yBAAyB,QAC4B,CAAA;AAElE,eAAO,MAAM,yBAAyB,QAGrC,CAAA;AACD,eAAO,MAAM,oBAAoB,2BAA2B,CAAA;AAG5D,eAAO,MAAM,0BAA0B,iCAAiC,CAAA;AAGxE,eAAO,MAAM,gBAAgB,sBAAsB,CAAA;AACnD,eAAO,MAAM,cAAc,oBAAoB,CAAA;AAC/C,eAAO,MAAM,gBAAgB,sBAAsB,CAAA;AACnD,eAAO,MAAM,iBAAiB,uBAAuB,CAAA;AACrD,eAAO,MAAM,WAAW,0BAA0B,CAAA;AAClD,eAAO,MAAM,0BAA0B,iCAAiC,CAAA;AAExE,eAAO,MAAM,mCAAmC,0EACyB,CAAA;AAEzE,eAAO,MAAM,0CAA0C,iEACS,CAAA;AAGhE,eAAO,MAAM,4BAA4B,oDACU,CAAA;AAGnD,eAAO,MAAM,0BAA0B,eAAe,CAAA;AAEtD,eAAO,MAAM,yBAAyB,oBAAoB,CAAA;AAC1D,eAAO,MAAM,sBAAsB,kBAAkB,CAAA;AAErD,eAAO,MAAM,6BAA6B,qBAAqB,CAAA;AAC/D,eAAO,MAAM,oBAAoB,gBAAgB,CAAA;AACjD,eAAO,MAAM,uBAAuB,6BAA6B,CAAA;AACjE,eAAO,MAAM,mBAAmB,+BAA+B,CAAA;AAC/D,eAAO,MAAM,uBAAuB,mCAAmC,CAAA;AACvE,eAAO,MAAM,kBAAkB,QAAkI,CAAA;AAEjK,eAAO,MAAM,mBAAmB,kCAAkC,CAAA;AAElE,eAAO,MAAM,qBAAqB,kCAAkC,CAAA;AAEpE;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,QAAS,MAAM,QAAQ,MAAM,KAAG,MAOjE,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,WAAY,oBAAoB,WAQ7D,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,WAAY,oBAAoB,WAQhE,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,WAAY,oBAAoB,WAiBjE,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY,WAAY,4BAA4B,WAGhE,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,aAAa,WAAY,oBAAoB,WAgBzD,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,WAAY,4BAA4B,WAGjE,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,WAAY,oBAAoB,WAM/D,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,WAAY,oBAAoB,WAMjE,CAAA"}
|
package/lib/shared/constants.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Copyright (c) 2020,2021,2022,2023, StepZen, Inc.
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.getDBIntrospectionUrl = exports.getIntrospectionUrl = exports.getZenServUrl = exports.getZenCtl2Url = exports.getZenCtlUrl = exports.getZenServUrlTemplate = exports.getZenCtlUrlTemplate = exports.getDeploymentType = exports.appendPathnameIfEmpty = exports.
|
|
4
|
+
exports.getDBIntrospectionUrl = exports.getIntrospectionUrl = exports.getZenServUrl = exports.getZenCtl2Url = exports.getZenCtlUrl = exports.getZenServUrlTemplate = exports.getZenCtlUrlTemplate = exports.getDeploymentType = exports.appendPathnameIfEmpty = exports.DETECT_NAME_CONFLICTS = exports.STEPZEN_DISCORD_URL = exports.STEPZEN_AUTODB_DSN = exports.STEPZEN_AUTODB_PASSWORD = exports.STEPZEN_AUTODB_USER = exports.STEPZEN_AUTODB_DATABASE = exports.STEPZEN_AUTODB_IMAGE = exports.STEPZEN_AUTODB_CONTAINER_NAME = exports.STEPZEN_CONTAINER_NAME = exports.STEPZEN_CONTAINER_NETWORK = exports.DEFAULT_STEPZEN_DOCKER_TAG = exports.DEFAULT_STEPZEN_DOCKER_IMAGE = exports.DEFAULT_STEPZEN_DBINTROSPECTION_SERVER_URL = exports.DEFAULT_STEPZEN_JSON2SDL_SERVER_URL = exports.ZENCTL2_PUBLIC_ACCOUNT_URL = exports.ZENCTL2_URL = exports.ADMIN_ACCOUNT_URL = exports.ADMIN_UPLOAD_URL = exports.ADMIN_LIST_URL = exports.ADMIN_DEPLOY_URL = exports.DEFAULT_STEPZEN_SERVER_URL = exports.STEPZEN_HISTORY_FILE = exports.STEPZEN_HISTORY_DIRECTORY = exports.STEPZEN_LOCAL_CONFIG_FILE = exports.DEFAULT_STEPZEN_DEPLOYMENT_TYPE = exports.STEPZEN_CONFIG_FILE = exports.STEPZEN_LAST_UPDATE_CHECK_TIMESTAMP = exports.STEPZEN_CONFIG_DIRECTORY = void 0;
|
|
5
5
|
// This file contains constants and all magic strings
|
|
6
6
|
const dotenv = require("dotenv");
|
|
7
7
|
const debug = require("debug");
|
|
@@ -11,7 +11,7 @@ const path = require("path");
|
|
|
11
11
|
// This file needs to be in your working directory.
|
|
12
12
|
debug('stepzen:dotenv')(`loading .env from ${process.cwd()}, at cli/src/shared/constants.ts`);
|
|
13
13
|
dotenv.config();
|
|
14
|
-
const { STEPZEN_CONFIG_FILE: ENV_VAR_STEPZEN_CONFIG_FILE, STEPZEN_LOCAL_CONFIG_FILE: ENV_VAR_STEPZEN_LOCAL_CONFIG_FILE,
|
|
14
|
+
const { STEPZEN_CONFIG_FILE: ENV_VAR_STEPZEN_CONFIG_FILE, STEPZEN_LOCAL_CONFIG_FILE: ENV_VAR_STEPZEN_LOCAL_CONFIG_FILE, } = process.env;
|
|
15
15
|
// Where your authentication details are stored locally
|
|
16
16
|
exports.STEPZEN_CONFIG_DIRECTORY = path.join(os.homedir(), '.stepzen');
|
|
17
17
|
exports.STEPZEN_LAST_UPDATE_CHECK_TIMESTAMP = path.join(exports.STEPZEN_CONFIG_DIRECTORY, 'last_update_check.timestamp');
|
|
@@ -23,11 +23,6 @@ exports.STEPZEN_HISTORY_DIRECTORY = path.join(exports.STEPZEN_CONFIG_DIRECTORY,
|
|
|
23
23
|
exports.STEPZEN_HISTORY_FILE = '{accounthash}.yaml.enc';
|
|
24
24
|
// The zenctl URL. Override with the env var `STEPZEN_SERVER_URL`
|
|
25
25
|
exports.DEFAULT_STEPZEN_SERVER_URL = 'https://{account}.stepzen.io';
|
|
26
|
-
// If defined, call the generator engines cloud function directly, skipping zenctl
|
|
27
|
-
exports.STEPZEN_DIRECT_GENERATOR_ENGINES_URL = ENV_VAR_STEPZEN_DIRECT_GENERATOR_ENGINES_URL ||
|
|
28
|
-
'https://us-central1-stepzen-functions.cloudfunctions.net/generator-engine';
|
|
29
|
-
// API Templates repository
|
|
30
|
-
exports.STEPZEN_API_TEMPLATES_REPOSITORY = 'https://github.com/steprz/stepzen-schemas';
|
|
31
26
|
// Paths to the endpoints used (only for tests)
|
|
32
27
|
exports.ADMIN_DEPLOY_URL = '/cli/admin/deploy';
|
|
33
28
|
exports.ADMIN_LIST_URL = '/cli/admin/list';
|
|
@@ -51,7 +46,6 @@ exports.STEPZEN_AUTODB_PASSWORD = 'stepzen-auto-metadata-password';
|
|
|
51
46
|
exports.STEPZEN_AUTODB_DSN = `postgres://${exports.STEPZEN_AUTODB_USER}:${exports.STEPZEN_AUTODB_PASSWORD}@${exports.STEPZEN_AUTODB_CONTAINER_NAME}:5432/${exports.STEPZEN_AUTODB_DATABASE}`;
|
|
52
47
|
exports.STEPZEN_DISCORD_URL = 'https://discord.gg/9k2VdPn2FR';
|
|
53
48
|
exports.DETECT_NAME_CONFLICTS = 'STEPZEN_DETECT_NAME_CONFLICTS';
|
|
54
|
-
exports.USE_GENERATOR_ENGINES = 'STEPZEN_USE_GENERATOR_ENGINES';
|
|
55
49
|
/**
|
|
56
50
|
* Adds the path component to the URL if the URL is missing one.
|
|
57
51
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/shared/constants.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AAEnD,qDAAqD;AACrD,iCAAgC;AAChC,+BAA8B;AAC9B,yBAAwB;AACxB,6BAA4B;AAG5B,iEAAiE;AACjE,mDAAmD;AACnD,KAAK,CAAC,gBAAgB,CAAC,CACrB,qBAAqB,OAAO,CAAC,GAAG,EAAE,kCAAkC,CACrE,CAAA;AACD,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,EACJ,mBAAmB,EAAE,2BAA2B,EAChD,yBAAyB,EAAE,iCAAiC,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/shared/constants.ts"],"names":[],"mappings":"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"}
|
package/lib/shared/inquirer.d.ts
CHANGED
|
@@ -9,6 +9,6 @@ interface HistoryKey {
|
|
|
9
9
|
export declare let historyKey: HistoryKey | undefined;
|
|
10
10
|
export declare const clearHistoryKey: () => void;
|
|
11
11
|
export declare const writeLastAnswers: (answers: any) => Promise<void>;
|
|
12
|
-
export declare const prompt: <T>(namespace: string, questions: inquirer.QuestionCollection<T>, initialAnswers?: Partial<T> | undefined) => Promise<
|
|
12
|
+
export declare const prompt: <T>(namespace: string, questions: inquirer.QuestionCollection<T>, initialAnswers?: Partial<T> | undefined) => Promise<T>;
|
|
13
13
|
export {};
|
|
14
14
|
//# sourceMappingURL=inquirer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inquirer.d.ts","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":";;AAMA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAQpC,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAGD,eAAO,IAAI,UAAU,EAAE,UAAU,GAAG,SAAS,CAAA;AAwD7C,eAAO,MAAM,eAAe,YAE3B,CAAA;AAqCD,eAAO,MAAM,gBAAgB,YAAmB,GAAG,KAAG,QAAQ,IAAI,CAoBjE,CAAA;AAED,eAAO,MAAM,MAAM,iBACN,MAAM,
|
|
1
|
+
{"version":3,"file":"inquirer.d.ts","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":";;AAMA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAQpC,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAGD,eAAO,IAAI,UAAU,EAAE,UAAU,GAAG,SAAS,CAAA;AAwD7C,eAAO,MAAM,eAAe,YAE3B,CAAA;AAqCD,eAAO,MAAM,gBAAgB,YAAmB,GAAG,KAAG,QAAQ,IAAI,CAoBjE,CAAA;AAED,eAAO,MAAM,MAAM,iBACN,MAAM,mGAqBlB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inquirer.js","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inquirer.js","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare const parseVariableValue: (value: string, typename: string) => {
|
|
|
8
8
|
};
|
|
9
9
|
value?: undefined;
|
|
10
10
|
};
|
|
11
|
-
export declare const parseRequestVariables: (variableFlags: string[], operation: OperationDefinitionNode) => {
|
|
11
|
+
export declare const parseRequestVariables: (variableFlags: string[], operation: OperationDefinitionNode, varFile?: Record<string, any>) => {
|
|
12
12
|
variables: Record<string, any>;
|
|
13
13
|
errors: string[];
|
|
14
14
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-variables-parser.d.ts","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,uBAAuB,EAAW,MAAM,SAAS,CAAA;AAK9D,eAAO,MAAM,kBAAkB,UAAW,MAAM,YAAY,MAAM;;;;;;;;CA+CjE,CAAA;AAED,eAAO,MAAM,qBAAqB,kBACjB,MAAM,EAAE,aACZ,uBAAuB;;;
|
|
1
|
+
{"version":3,"file":"request-variables-parser.d.ts","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,uBAAuB,EAAW,MAAM,SAAS,CAAA;AAK9D,eAAO,MAAM,kBAAkB,UAAW,MAAM,YAAY,MAAM;;;;;;;;CA+CjE,CAAA;AAED,eAAO,MAAM,qBAAqB,kBACjB,MAAM,EAAE,aACZ,uBAAuB,YACzB,OAAO,MAAM,EAAE,GAAG,CAAC;;;CA2E7B,CAAA"}
|
|
@@ -52,10 +52,10 @@ const parseVariableValue = (value, typename) => {
|
|
|
52
52
|
};
|
|
53
53
|
};
|
|
54
54
|
exports.parseVariableValue = parseVariableValue;
|
|
55
|
-
const parseRequestVariables = (variableFlags, operation) => {
|
|
55
|
+
const parseRequestVariables = (variableFlags, operation, varFile = {}) => {
|
|
56
56
|
// errors for duplicate vars
|
|
57
57
|
const errors = [];
|
|
58
|
-
const
|
|
58
|
+
const rawVarValues = new Map();
|
|
59
59
|
for (const variable of variableFlags || []) {
|
|
60
60
|
const idx = variable.indexOf('=');
|
|
61
61
|
if (idx < 0) {
|
|
@@ -65,40 +65,47 @@ const parseRequestVariables = (variableFlags, operation) => {
|
|
|
65
65
|
}
|
|
66
66
|
const name = variable.substring(0, idx);
|
|
67
67
|
const value = variable.substring(idx + 1);
|
|
68
|
-
if (
|
|
68
|
+
if (rawVarValues.has(name)) {
|
|
69
69
|
errors.push(chalk `Duplicate value for the variable {bold ${name}}.` +
|
|
70
70
|
chalk ` Please keep only one {bold --var} flag for the {bold ${name}} variable.`);
|
|
71
71
|
continue;
|
|
72
72
|
}
|
|
73
|
-
|
|
73
|
+
rawVarValues.set(name, value);
|
|
74
74
|
}
|
|
75
75
|
const variables = {};
|
|
76
76
|
for (const varDef of operation.variableDefinitions ?? []) {
|
|
77
77
|
const name = varDef.variable.name.value;
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
if (
|
|
78
|
+
const rawValue = rawVarValues.get(name);
|
|
79
|
+
rawVarValues.delete(name);
|
|
80
|
+
if (rawValue === undefined && varFile[name] === undefined) {
|
|
81
81
|
// errors for missing required vars
|
|
82
82
|
if (varDef.type.kind === 'NonNullType') {
|
|
83
|
-
errors.push(chalk `Missing value for a required variable {bold ${name}}
|
|
84
|
-
chalk `
|
|
83
|
+
errors.push(chalk `Missing value for a required variable {bold ${name}}. Please` +
|
|
84
|
+
chalk ` pass it with a {bold --var ${name}={underline value}} or` +
|
|
85
|
+
chalk ` {bold --var-file={underline file}} flag.`);
|
|
85
86
|
}
|
|
86
87
|
continue;
|
|
87
88
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
89
|
+
if (rawValue === undefined) {
|
|
90
|
+
variables[name] = varFile[name];
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
const unNonNullType = unNonNull(varDef.type);
|
|
94
|
+
const isList = unNonNullType.kind === 'ListType';
|
|
95
|
+
const { value, error } = (0, exports.parseVariableValue)(rawValue, isList
|
|
96
|
+
? 'JSON' // parse any list as a JSON value
|
|
97
|
+
: unNonNullType.name.value);
|
|
98
|
+
// errors for invalid values
|
|
99
|
+
if (error) {
|
|
100
|
+
errors.push(chalk `Invalid value for the variable {bold ${name}}: ` +
|
|
101
|
+
error.message);
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
variables[name] = value;
|
|
97
105
|
}
|
|
98
|
-
variables[name] = parsed;
|
|
99
106
|
}
|
|
100
107
|
// errors for extra vars
|
|
101
|
-
for (const name of
|
|
108
|
+
for (const name of rawVarValues.keys()) {
|
|
102
109
|
errors.push(chalk `Unused variable {bold ${name}}. Please remove it.`);
|
|
103
110
|
}
|
|
104
111
|
return { variables, errors };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-variables-parser.js","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AAEnD,+BAA8B;AAC9B,+BAA8B;AAI9B,MAAM,SAAS,GAAG,CAAC,IAAc,EAAE,EAAE,CACnC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;AAEzC,MAAM,kBAAkB,GAAG,CAAC,KAAa,EAAE,QAAgB,EAAE,EAAE;IACpE,QAAQ,QAAQ,EAAE;QAChB,KAAK,KAAK,CAAC,CAAC;YACV,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;gBACzB,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,CAAA;aACvB;YACD,MAAK;SACN;QACD,KAAK,OAAO,CAAC,CAAC;YACZ,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACpD,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,CAAA;aACvB;YACD,MAAK;SACN;QACD,KAAK,SAAS;YACZ,IAAI,KAAK,KAAK,MAAM,EAAE;gBACpB,OAAO,EAAC,KAAK,EAAE,IAAI,EAAC,CAAA;aACrB;YACD,IAAI,KAAK,KAAK,OAAO,EAAE;gBACrB,OAAO,EAAC,KAAK,EAAE,KAAK,EAAC,CAAA;aACtB;YACD,MAAK;QACP,KAAK,QAAQ,CAAC;QACd,KAAK,IAAI,CAAC;QACV,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,EAAC,KAAK,EAAC,CAAA;QAChB,KAAK,MAAM,CAAC;QACZ;YACE,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBAChC,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,CAAA;aACvB;YAAC,OAAO,KAAK,EAAE;gBACd,KAAK,CAAC,iBAAiB,CAAC,CACtB,8CAA8C,KAAK,IAAI,EACvD,KAAK,CACN,CAAA;aACF;KACJ;IACD,OAAO;QACL,KAAK,EAAE;YACL,OAAO,EAAE,KAAK,CAAA,WAAW,KAAK,0BAA0B,QAAQ,IAAI;SACrE;KACF,CAAA;AACH,CAAC,CAAA;AA/CY,QAAA,kBAAkB,sBA+C9B;AAEM,MAAM,qBAAqB,GAAG,CACnC,aAAuB,EACvB,SAAkC,EAClC,EAAE;IACF,4BAA4B;IAC5B,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,MAAM,
|
|
1
|
+
{"version":3,"file":"request-variables-parser.js","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"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"}
|
package/lib/shared/types.d.ts
CHANGED
|
@@ -2,6 +2,12 @@ import type { Input } from '@oclif/parser';
|
|
|
2
2
|
import type { StepZenCredentials } from '@stepzen/sdk/lib/client';
|
|
3
3
|
export { StepZenCredentials, StepZenCredentialsV2, ZenCtlResponse, } from '@stepzen/sdk/lib/client';
|
|
4
4
|
export declare type Flags<Command> = Command extends Input<infer F> ? F : never;
|
|
5
|
+
export declare type Expand<T> = T extends infer O ? {
|
|
6
|
+
[K in keyof O]: O[K];
|
|
7
|
+
} : never;
|
|
8
|
+
export declare type Defined<T> = {
|
|
9
|
+
[P in keyof T]-?: NonNullable<T[P]>;
|
|
10
|
+
};
|
|
5
11
|
export interface ServiceInstanceV1 {
|
|
6
12
|
zenctl?: string;
|
|
7
13
|
introspection?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAA;AAE/D,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,GACf,MAAM,yBAAyB,CAAA;AAGhC,oBAAY,KAAK,CAAC,OAAO,IAAI,OAAO,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAA;AAE/D,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,GACf,MAAM,yBAAyB,CAAA;AAGhC,oBAAY,KAAK,CAAC,OAAO,IAAI,OAAO,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAGvE,oBAAY,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAAG;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,KAAK,CAAA;AAG1E,oBAAY,OAAO,CAAC,CAAC,IAAI;KACtB,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACpC,CAAA;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,oBAAY,eAAe,GAAG,iBAAiB,GAAG,iBAAiB,CAAA;AAEnE,oBAAY,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,eAAe,CAAA;CAClC,CAAA;AAED,oBAAY,4BAA4B,GAAG,6BAA6B,GACtE,kBAAkB,CAAA;AAEpB;;;;;;GAMG;AACH,oBAAY,oBAAoB,GAC5B,4BAA4B,GAC5B,6BAA6B,CAAA;AAEjC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAA;CACd"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { Command } from '@oclif/command';
|
|
2
|
-
import { LoggedInMachineConfiguration, LoggedOutMachineConfiguration, MachineConfiguration, Workspace } from './types';
|
|
2
|
+
import { LoggedInMachineConfiguration, LoggedOutMachineConfiguration, MachineConfiguration, ServiceInstanceV2, Workspace } from './types';
|
|
3
3
|
export declare abstract class ZenCommand extends Command {
|
|
4
4
|
static flags: {
|
|
5
5
|
help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
|
|
6
6
|
'non-interactive': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
|
|
7
7
|
};
|
|
8
|
+
getServiceInstanceIfLocal(configuration?: MachineConfiguration): Promise<ServiceInstanceV2 | undefined>;
|
|
8
9
|
awaitStepZenServiceUpIfLocal(configuration?: MachineConfiguration): Promise<void>;
|
|
10
|
+
awaitIntrospectionServiceUpIfLocal(configuration?: MachineConfiguration): Promise<void>;
|
|
9
11
|
ensureStepZenAccount(): Promise<{
|
|
10
12
|
configuration: LoggedInMachineConfiguration;
|
|
11
13
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zen-command.d.ts","sourceRoot":"","sources":["../../src/shared/zen-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAQ,MAAM,gBAAgB,CAAA;AAY7C,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,oBAAoB,EACpB,SAAS,EACV,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"zen-command.d.ts","sourceRoot":"","sources":["../../src/shared/zen-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAQ,MAAM,gBAAgB,CAAA;AAY7C,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,oBAAoB,EACpB,iBAAiB,EACjB,SAAS,EACV,MAAM,SAAS,CAAA;AAkChB,8BAAsB,UAAW,SAAQ,OAAO;IAC9C,MAAM,CAAC,KAAK;;;MAeX;IAEK,yBAAyB,CAC7B,aAAa,CAAC,EAAE,oBAAoB,GACnC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAmBnC,4BAA4B,CAAC,aAAa,CAAC,EAAE,oBAAoB;IAmBjE,kCAAkC,CACtC,aAAa,CAAC,EAAE,oBAAoB;IA6BhC,oBAAoB;;;IAYpB,sBAAsB,CAC1B,OAAO,GAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,aAAa,CAAC,EAAE,OAAO,CAAA;QACvB,MAAM,CAAC,EAAE,OAAO,CAAA;KACZ,GACL,OAAO,CAAC,SAAS,CAAC;IAyCf,iBAAiB,CACrB,oBAAoB,EAAE,6BAA6B,GAClD,OAAO,CAAC;QACT,aAAa,EAAE,4BAA4B,CAAA;KAC5C,CAAC;CAyEH;AAED,eAAe,UAAU,CAAA"}
|
|
@@ -17,6 +17,11 @@ const constants_1 = require("./constants");
|
|
|
17
17
|
async function awaitHttp200OK(url, tries = 5) {
|
|
18
18
|
try {
|
|
19
19
|
debug('stepzen:zen-command')(chalk `fetching {cyan ${url}}`);
|
|
20
|
+
if (url.endsWith('graphql')) {
|
|
21
|
+
// Assume a graphql endpoint; a plain GET will return 200, but provokes errors in the
|
|
22
|
+
// introspection log; so send a trivial but fine introspection query
|
|
23
|
+
url += '?query={__schema {__typename}}';
|
|
24
|
+
}
|
|
20
25
|
const response = await (0, fetch_1.default)(url);
|
|
21
26
|
debug('stepzen:zen-command')(chalk `\t--> ${response.status}`);
|
|
22
27
|
if (response.status === 200) {
|
|
@@ -35,25 +40,49 @@ async function awaitHttp200OK(url, tries = 5) {
|
|
|
35
40
|
throw new errors_1.CLIError(`Could not connect to the service at ${url}.`);
|
|
36
41
|
}
|
|
37
42
|
class ZenCommand extends command_1.Command {
|
|
38
|
-
async
|
|
43
|
+
async getServiceInstanceIfLocal(configuration) {
|
|
39
44
|
configuration = configuration || (await (0, configuration_1.readConfiguration)());
|
|
40
45
|
if (!('account' in configuration)) {
|
|
41
|
-
// not logged-in => will use the StepZen cloud =>
|
|
42
|
-
return;
|
|
46
|
+
// not logged-in => will use the StepZen cloud => not local
|
|
47
|
+
return undefined;
|
|
43
48
|
}
|
|
44
49
|
if (!configuration.serviceInstance ||
|
|
45
50
|
!('deploymentType' in configuration.serviceInstance) ||
|
|
46
51
|
configuration.serviceInstance.deploymentType !== 'local') {
|
|
47
|
-
// not using a local StepZen service instance =>
|
|
52
|
+
// not using a local StepZen service instance => not local
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
return configuration.serviceInstance;
|
|
56
|
+
}
|
|
57
|
+
async awaitStepZenServiceUpIfLocal(configuration) {
|
|
58
|
+
const serviceInstance = await this.getServiceInstanceIfLocal(configuration);
|
|
59
|
+
if (serviceInstance === undefined) {
|
|
60
|
+
// not logged-in to local service => this check does not apply
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const zenctl2 = serviceInstance.zenctl2;
|
|
64
|
+
try {
|
|
65
|
+
await awaitHttp200OK(zenctl2.replace(constants_1.ZENCTL2_URL, '/healthz'));
|
|
66
|
+
}
|
|
67
|
+
catch (error) {
|
|
68
|
+
throw new errors_1.CLIError(chalk `Could not connect to the local StepZen service instance you are logged in to.` +
|
|
69
|
+
chalk ` Please make sure the local StepZen service instance is running with` +
|
|
70
|
+
chalk ` {bold stepzen service start}, or log in to the StepZen cloud with` +
|
|
71
|
+
chalk ` {bold stepzen login}.`);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
async awaitIntrospectionServiceUpIfLocal(configuration) {
|
|
75
|
+
const serviceInstance = await this.getServiceInstanceIfLocal(configuration);
|
|
76
|
+
if (serviceInstance === undefined) {
|
|
77
|
+
// not logged-in to local service => this check does not apply
|
|
48
78
|
return;
|
|
49
79
|
}
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
const dbIntrospectionUrl = configuration.serviceInstance.dbintrospection;
|
|
80
|
+
const promises = [];
|
|
81
|
+
const dbIntrospectionUrl = serviceInstance.dbintrospection;
|
|
53
82
|
if (dbIntrospectionUrl !== undefined) {
|
|
54
83
|
promises.push(awaitHttp200OK(dbIntrospectionUrl));
|
|
55
84
|
}
|
|
56
|
-
const introspectionUrl =
|
|
85
|
+
const introspectionUrl = serviceInstance.introspection;
|
|
57
86
|
if (introspectionUrl !== undefined) {
|
|
58
87
|
promises.push(awaitHttp200OK(introspectionUrl));
|
|
59
88
|
}
|
|
@@ -61,7 +90,7 @@ class ZenCommand extends command_1.Command {
|
|
|
61
90
|
await Promise.all(promises);
|
|
62
91
|
}
|
|
63
92
|
catch (error) {
|
|
64
|
-
throw new errors_1.CLIError(chalk `Could not connect to the local StepZen service
|
|
93
|
+
throw new errors_1.CLIError(chalk `Could not connect to the local StepZen introspection service.` +
|
|
65
94
|
chalk ` Please make sure the local StepZen service instance is running with` +
|
|
66
95
|
chalk ` {bold stepzen service start}, or log in to the StepZen cloud with` +
|
|
67
96
|
chalk ` {bold stepzen login}.`);
|