stepzen 0.60.0-experimental.7feedbc → 0.60.0-experimental.8b8a89f
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 +3 -3
- package/lib/commands/login.d.ts +22 -0
- package/lib/commands/login.d.ts.map +1 -1
- package/lib/commands/login.js +71 -22
- package/lib/commands/login.js.map +1 -1
- package/lib/generate/helpers.d.ts.map +1 -1
- package/lib/generate/helpers.js +22 -4
- package/lib/generate/helpers.js.map +1 -1
- package/lib/shared/client-wrapper.d.ts.map +1 -1
- package/lib/shared/client-wrapper.js +1 -0
- package/lib/shared/client-wrapper.js.map +1 -1
- package/lib/shared/stepzen-sdk.d.ts +10 -1
- package/lib/shared/stepzen-sdk.d.ts.map +1 -1
- package/lib/shared/stepzen-sdk.js +39 -15
- package/lib/shared/stepzen-sdk.js.map +1 -1
- package/lib/shared/utils.d.ts +2 -1
- package/lib/shared/utils.d.ts.map +1 -1
- package/lib/shared/utils.js +13 -4
- package/lib/shared/utils.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +7 -14
package/README.md
CHANGED
|
@@ -36,7 +36,7 @@ $ npm install -g stepzen
|
|
|
36
36
|
$ stepzen COMMAND
|
|
37
37
|
running command...
|
|
38
38
|
$ stepzen (--version|-v)
|
|
39
|
-
stepzen/0.60.0-experimental.
|
|
39
|
+
stepzen/0.60.0-experimental.8b8a89f linux-x64 node-v22.23.3
|
|
40
40
|
$ stepzen --help [COMMAND]
|
|
41
41
|
USAGE
|
|
42
42
|
$ stepzen COMMAND
|
|
@@ -176,7 +176,7 @@ DESCRIPTION
|
|
|
176
176
|
Display help for stepzen.
|
|
177
177
|
```
|
|
178
178
|
|
|
179
|
-
_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.
|
|
179
|
+
_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.55/src/commands/help.ts)_
|
|
180
180
|
|
|
181
181
|
## `stepzen import [SOURCE]`
|
|
182
182
|
|
|
@@ -1144,7 +1144,7 @@ FLAG DESCRIPTIONS
|
|
|
1144
1144
|
Additionally shows the architecture, node version, operating system, and versions of plugins that the CLI is using.
|
|
1145
1145
|
```
|
|
1146
1146
|
|
|
1147
|
-
_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/2.2.
|
|
1147
|
+
_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/2.2.52/src/commands/version.ts)_
|
|
1148
1148
|
|
|
1149
1149
|
## `stepzen whoami`
|
|
1150
1150
|
|
package/lib/commands/login.d.ts
CHANGED
|
@@ -13,6 +13,28 @@ export default class Login extends ZenCommand {
|
|
|
13
13
|
};
|
|
14
14
|
private getInstanceOrAccount;
|
|
15
15
|
private getAdminKey;
|
|
16
|
+
/**
|
|
17
|
+
* For iPaaS JWT login the introspection endpoint requires an account name.
|
|
18
|
+
* Resolves it from flags, existing config, or an interactive prompt.
|
|
19
|
+
*
|
|
20
|
+
*
|
|
21
|
+
* @param {LoginFlags} flags - parsed CLI flags
|
|
22
|
+
* @param {object} claimedConfig - mutable config being built
|
|
23
|
+
* @param {boolean} hasLegacyLogin - true when using admin-key / account login
|
|
24
|
+
* @param {boolean} isIPaaS - true when the service instance is an iPaaS domain
|
|
25
|
+
* @returns {Promise<string | undefined>} account name, or undefined for non-iPaaS / legacy flows
|
|
26
|
+
*/
|
|
27
|
+
private resolveIPaaSAccount;
|
|
28
|
+
/**
|
|
29
|
+
* Probes the introspection endpoint (passing Tenant-ID for iPaaS) and
|
|
30
|
+
* throws on failure.
|
|
31
|
+
*
|
|
32
|
+
* @param {string} introspectionBaseUrl - normalised base URL (scheme already present)
|
|
33
|
+
* @param {ServiceInstanceV2} serviceInstance - the resolved service instance
|
|
34
|
+
* @param {string | undefined} credentialsAccount - account name from login credentials
|
|
35
|
+
* @returns {Promise<void>} resolves if reachable, rejects otherwise
|
|
36
|
+
*/
|
|
37
|
+
private probeIntrospectionEndpoint;
|
|
16
38
|
run(): Promise<void>;
|
|
17
39
|
}
|
|
18
40
|
//# sourceMappingURL=login.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAmCA,OAAO,UAAyC,MAAM,0BAA0B,CAAA;AAiDhF,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,UAAU;IAC3C,MAAM,CAAC,WAAW,SAAuB;IAEzC,MAAM,CAAC,KAAK;;;;;;MAmCX;IAED,MAAM,CAAC,IAAI;;MAWV;YAEa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAmCA,OAAO,UAAyC,MAAM,0BAA0B,CAAA;AAiDhF,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,UAAU;IAC3C,MAAM,CAAC,WAAW,SAAuB;IAEzC,MAAM,CAAC,KAAK;;;;;;MAmCX;IAED,MAAM,CAAC,IAAI;;MAWV;YAEa,oBAAoB;YA0CpB,WAAW;IA2BzB;;;;;;;;;;OAUG;YACW,mBAAmB;IAwBjC;;;;;;;;OAQG;YACW,0BAA0B;IAmBlC,GAAG;CAwJV"}
|
package/lib/commands/login.js
CHANGED
|
@@ -6,7 +6,7 @@ import inquirer from 'inquirer';
|
|
|
6
6
|
import { importConfiguration, readConfiguration, removeCredentialsAndServiceFromConfigFile, writeCredentialsAndServiceToConfigFile, } from '../shared/configuration.js';
|
|
7
7
|
import { DEFAULT_STEPZEN_DEPLOYMENT_TYPE, INTROSPECTION_URL_PATH, } from '../shared/constants.js';
|
|
8
8
|
import { trackLoginEvent } from '../shared/segment.js';
|
|
9
|
-
import { getStepzenSDK, tryZenCtl } from '../shared/stepzen-sdk.js';
|
|
9
|
+
import { getStepzenSDK, isIPaaSDomain, tryZenCtl } from '../shared/stepzen-sdk.js';
|
|
10
10
|
import { appendPathnameIfEmpty } from '../shared/url-helpers.js';
|
|
11
11
|
import { probeEndpoint } from '../shared/utils.js';
|
|
12
12
|
import { isValidInstanceId, validateLoginType } from '../shared/validation.js';
|
|
@@ -92,16 +92,22 @@ export default class Login extends ZenCommand {
|
|
|
92
92
|
if (!flags.account && !flags.instanceId && flags['non-interactive']) {
|
|
93
93
|
throw new CLIError(chalk `Please provide either an account with {bold --account} or an instance ID with {bold --instanceId}.`);
|
|
94
94
|
}
|
|
95
|
-
|
|
96
|
-
|
|
95
|
+
// Set both flags if provided
|
|
96
|
+
if (flags.instanceId) {
|
|
97
|
+
claimedConfig.instanceId = flags.instanceId;
|
|
98
|
+
}
|
|
99
|
+
if (flags.account) {
|
|
100
|
+
claimedConfig.account = flags.account;
|
|
101
|
+
}
|
|
102
|
+
// Prioritize instanceId over account when both are provided
|
|
103
|
+
const accountOrInstance = flags.instanceId ||
|
|
104
|
+
flags.account ||
|
|
97
105
|
(await inquirer.prompt({
|
|
98
106
|
name: 'account',
|
|
99
107
|
message: 'What is your account name / instance id ?',
|
|
100
108
|
})).account;
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
}
|
|
104
|
-
else {
|
|
109
|
+
// For interactive mode, store the value
|
|
110
|
+
if (!flags.instanceId && !flags.account) {
|
|
105
111
|
claimedConfig.instanceId = accountOrInstance;
|
|
106
112
|
}
|
|
107
113
|
return accountOrInstance;
|
|
@@ -124,6 +130,49 @@ export default class Login extends ZenCommand {
|
|
|
124
130
|
});
|
|
125
131
|
return adminkey;
|
|
126
132
|
}
|
|
133
|
+
/**
|
|
134
|
+
* For iPaaS JWT login the introspection endpoint requires an account name.
|
|
135
|
+
* Resolves it from flags, existing config, or an interactive prompt.
|
|
136
|
+
*
|
|
137
|
+
*
|
|
138
|
+
* @param {LoginFlags} flags - parsed CLI flags
|
|
139
|
+
* @param {object} claimedConfig - mutable config being built
|
|
140
|
+
* @param {boolean} hasLegacyLogin - true when using admin-key / account login
|
|
141
|
+
* @param {boolean} isIPaaS - true when the service instance is an iPaaS domain
|
|
142
|
+
* @returns {Promise<string | undefined>} account name, or undefined for non-iPaaS / legacy flows
|
|
143
|
+
*/
|
|
144
|
+
async resolveIPaaSAccount(flags, claimedConfig, hasLegacyLogin, isIPaaS) {
|
|
145
|
+
if (hasLegacyLogin || !isIPaaS)
|
|
146
|
+
return undefined;
|
|
147
|
+
if (claimedConfig.account)
|
|
148
|
+
return claimedConfig.account;
|
|
149
|
+
if (flags['non-interactive']) {
|
|
150
|
+
throw new CLIError('Account name must be provided using --account when logging into an iPaaS environment with an instance ID.');
|
|
151
|
+
}
|
|
152
|
+
const { account } = await inquirer.prompt({
|
|
153
|
+
name: 'account',
|
|
154
|
+
message: 'What is your account name?',
|
|
155
|
+
});
|
|
156
|
+
claimedConfig.account = account;
|
|
157
|
+
return account;
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* Probes the introspection endpoint (passing Tenant-ID for iPaaS) and
|
|
161
|
+
* throws on failure.
|
|
162
|
+
*
|
|
163
|
+
* @param {string} introspectionBaseUrl - normalised base URL (scheme already present)
|
|
164
|
+
* @param {ServiceInstanceV2} serviceInstance - the resolved service instance
|
|
165
|
+
* @param {string | undefined} credentialsAccount - account name from login credentials
|
|
166
|
+
* @returns {Promise<void>} resolves if reachable, rejects otherwise
|
|
167
|
+
*/
|
|
168
|
+
async probeIntrospectionEndpoint(introspectionBaseUrl, serviceInstance, credentialsAccount) {
|
|
169
|
+
// For iPaaS domains the introspection endpoint requires the account
|
|
170
|
+
// name to be forwarded as a Tenant-ID header.
|
|
171
|
+
const introspectionHeaders = isIPaaSDomain(serviceInstance.zenctl2) && credentialsAccount
|
|
172
|
+
? { 'Tenant-ID': credentialsAccount }
|
|
173
|
+
: undefined;
|
|
174
|
+
await probeEndpoint(appendPathnameIfEmpty(introspectionBaseUrl, INTROSPECTION_URL_PATH), 1, introspectionHeaders);
|
|
175
|
+
}
|
|
127
176
|
async run() {
|
|
128
177
|
const { flags, args } = await this.parse(Login);
|
|
129
178
|
const { result: claimedServiceInstance, error = null } = flags.config
|
|
@@ -162,41 +211,41 @@ export default class Login extends ZenCommand {
|
|
|
162
211
|
};
|
|
163
212
|
}
|
|
164
213
|
const instanceOrAccount = await this.getInstanceOrAccount(flags, claimedConfig);
|
|
165
|
-
|
|
166
|
-
const hasAccountFlag = Boolean(flags.account);
|
|
214
|
+
// Determine login type: if -i flag is present, it's JWT login; otherwise legacy
|
|
167
215
|
const hasInstanceIdFlag = Boolean(flags.instanceId);
|
|
216
|
+
const hasLegacyLogin = hasInstanceIdFlag
|
|
217
|
+
? false
|
|
218
|
+
: await validateLoginType(instanceOrAccount);
|
|
168
219
|
if (hasLegacyLogin) {
|
|
169
|
-
if (hasInstanceIdFlag) {
|
|
170
|
-
throw new Error('Account must be provided using the -a flag. Please check in SaaS console (https://console.saas.ibm.com)');
|
|
171
|
-
}
|
|
172
220
|
claimedConfig.account = instanceOrAccount;
|
|
173
221
|
}
|
|
174
222
|
else {
|
|
175
|
-
if (hasAccountFlag) {
|
|
176
|
-
throw new Error('Instance ID must be provided using the -i flag. Please check in SaaS console (https://console.saas.ibm.com)');
|
|
177
|
-
}
|
|
178
223
|
const isValid = await isValidInstanceId(instanceOrAccount);
|
|
179
224
|
if (!isValid) {
|
|
180
225
|
throw new Error('Invalid instanceId, Please check in SaaS console (https://console.saas.ibm.com)');
|
|
181
226
|
}
|
|
182
227
|
claimedConfig.instanceId = instanceOrAccount;
|
|
183
228
|
}
|
|
229
|
+
// Detect iPaaS environment
|
|
230
|
+
const isIPaaS = Boolean(claimedConfig.serviceInstance?.zenctl2 &&
|
|
231
|
+
isIPaaSDomain(claimedConfig.serviceInstance.zenctl2));
|
|
232
|
+
// For iPaaS JWT login, we need an account name
|
|
233
|
+
const accountForIPaaS = await this.resolveIPaaSAccount(flags, claimedConfig, hasLegacyLogin, isIPaaS);
|
|
184
234
|
claimedConfig.adminKey = await this.getAdminKey(flags, claimedConfig, hasLegacyLogin);
|
|
185
235
|
const loggedInConfig = await tryDefaultZenCtl(claimedConfig, stepzen => hasLegacyLogin
|
|
186
236
|
? stepzen.login(claimedConfig.adminKey, claimedConfig.account)
|
|
187
|
-
: stepzen.jwtLogin(claimedConfig.adminKey, // it
|
|
188
|
-
claimedConfig.instanceId, claimedConfig.serviceInstance?.zenctl2));
|
|
237
|
+
: stepzen.jwtLogin(claimedConfig.adminKey, // it contains mcsp's APIKey when login using instanceID
|
|
238
|
+
claimedConfig.instanceId, claimedConfig.serviceInstance?.zenctl2, accountForIPaaS));
|
|
189
239
|
const { result: credentials, serviceInstance } = loggedInConfig;
|
|
190
240
|
if (serviceInstance) {
|
|
191
241
|
if (flags.introspection) {
|
|
192
242
|
// a custom introspection URL was passed: probe it and display an informative
|
|
193
243
|
// failure message
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
}
|
|
244
|
+
const introspectionBaseUrl = /^https?:/.test(flags.introspection)
|
|
245
|
+
? flags.introspection
|
|
246
|
+
: `https://${flags.introspection}`;
|
|
198
247
|
try {
|
|
199
|
-
await
|
|
248
|
+
await this.probeIntrospectionEndpoint(introspectionBaseUrl, serviceInstance, credentials.account);
|
|
200
249
|
serviceInstance.introspection = introspectionBaseUrl;
|
|
201
250
|
this.log(chalk `Using the introspection service at {bold ${introspectionBaseUrl}}.`);
|
|
202
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAejC,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAA;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,yCAAyC,EACzC,sCAAsC,GACvC,MAAM,4BAA4B,CAAA;AACnC,OAAO,EACL,+BAA+B,EAC/B,sBAAsB,GACvB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAC,aAAa,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/generate/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAS,WAAW,EAAC,MAAM,qBAAqB,CAAA;AAC5D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/generate/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAS,WAAW,EAAC,MAAM,qBAAqB,CAAA;AAC5D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAA;AAoB/C,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE;QAAC,CAAC,EAAE,EAAE,MAAM,GAAG;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;SAAC,CAAA;KAAC,CAAA;CACjE,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,yBAAyB,GACpC,WAAW,MAAM,EACjB,OAAO,yBAAyB,KAC/B,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAkJ/C,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAU,qDAMrC;IACD,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,EAAE,WAAW,GAAG,QAAQ,CAAA;IAClC,QAAQ,EAAE,4BAA4B,CAAA;CACvC;;EA0CA,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,mBAAmB,MAAM,EAAE,EAC3B,wBAAwB,MAAM,EAAE,KAC/B,WAAW,EAwBb,CAAA"}
|
package/lib/generate/helpers.js
CHANGED
|
@@ -8,20 +8,22 @@ import { mapValues } from 'lodash-es';
|
|
|
8
8
|
import os from 'node:os';
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import prettier from 'prettier';
|
|
11
|
+
import { readConfiguration } from '../shared/configuration.js';
|
|
11
12
|
import { PERMANENT_STEPZEN_ERROR } from '../shared/errors.js';
|
|
12
13
|
import { parseHeader } from '../shared/header.js';
|
|
13
14
|
import { makeHeaders } from '../shared/header-params-parser.js';
|
|
14
15
|
import { rmtemp } from '../shared/rmtemp.js';
|
|
16
|
+
import { isIPaaSDomain } from '../shared/stepzen-sdk.js';
|
|
15
17
|
import { getStepZenExtensions } from '../shared/utils.js';
|
|
16
18
|
export const queryIntrospectionService = async (serverUrl, query) => {
|
|
17
19
|
debug('stepzen:introspection')(serverUrl);
|
|
18
20
|
const queryString = `query (
|
|
19
|
-
${Object.entries(query.variables).map(([id, { type }]) => `$${id}: ${type}`)}
|
|
20
|
-
) {
|
|
21
|
+
${Object.entries(query.variables).map(([id, { type }]) => `$${id}: ${type}`)}
|
|
22
|
+
) {
|
|
21
23
|
${query.operation}(${Object.keys(query.variables).map(id => `${id}: $${id}`)}) {
|
|
22
24
|
sdl
|
|
23
25
|
config
|
|
24
|
-
}
|
|
26
|
+
}
|
|
25
27
|
}`;
|
|
26
28
|
debug('stepzen:introspection')(queryString);
|
|
27
29
|
debug('stepzen:introspection')(query.variables);
|
|
@@ -30,11 +32,27 @@ export const queryIntrospectionService = async (serverUrl, query) => {
|
|
|
30
32
|
variables: mapValues(query.variables, ({ value }) => value),
|
|
31
33
|
});
|
|
32
34
|
debug('stepzen:introspection')(payload);
|
|
35
|
+
// For iPaaS deployments the introspection service requires a Bearer token
|
|
36
|
+
// and a Tenant-ID header (same pattern as fetchZenCtlGraphQLQuery in the SDK).
|
|
37
|
+
const requestHeaders = {
|
|
38
|
+
'Content-Type': 'application/json',
|
|
39
|
+
};
|
|
40
|
+
if (isIPaaSDomain(serverUrl)) {
|
|
41
|
+
const config = await readConfiguration();
|
|
42
|
+
if ('accessToken' in config && config.accessToken) {
|
|
43
|
+
requestHeaders.Authorization = `Bearer ${config.accessToken}`;
|
|
44
|
+
debug('stepzen:introspection')('Added Authorization header for iPaaS');
|
|
45
|
+
}
|
|
46
|
+
if ('account' in config && config.account) {
|
|
47
|
+
requestHeaders['Tenant-ID'] = config.account; // hyphenated, can't use dot notation
|
|
48
|
+
debug('stepzen:introspection')(`Added Tenant-ID header: ${config.account}`);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
33
51
|
let response;
|
|
34
52
|
try {
|
|
35
53
|
response = await fetch(serverUrl, {
|
|
36
54
|
method: 'POST',
|
|
37
|
-
headers:
|
|
55
|
+
headers: requestHeaders,
|
|
38
56
|
body: payload,
|
|
39
57
|
});
|
|
40
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/generate/helpers.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAKjC,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,MAAM,gBAAgB,CAAA;AAClC,OAAO,EAAC,KAAK,EAAC,MAAM,qBAAqB,CAAA;AACzC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,GAAG,MAAM,UAAU,CAAA;AAC1B,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAC,uBAAuB,EAAC,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAA;AAC7D,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;AAYvD,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,SAAiB,EACjB,KAAgC,EACgB,EAAE;IAClD,KAAK,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,WAAW,GAAG;MAChB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAC,IAAI,EAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;;UAEpE,KAAK,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CACzD,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CACtB;;;;UAIO,CAAA;IACR,KAAK,CAAC,uBAAuB,CAAC,CAAC,WAAW,CAAC,CAAA;IAC3C,KAAK,CAAC,uBAAuB,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAE/C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7B,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,KAAK,CAAC;KAC1D,CAAC,CAAA;IACF,KAAK,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,CAAA;IAEvC,IAAI,QAAQ,CAAA;IACZ,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;YAChC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/generate/helpers.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAKjC,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,MAAM,gBAAgB,CAAA;AAClC,OAAO,EAAC,KAAK,EAAC,MAAM,qBAAqB,CAAA;AACzC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,GAAG,MAAM,UAAU,CAAA;AAC1B,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAC,uBAAuB,EAAC,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAA;AAC7D,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;AAYvD,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,SAAiB,EACjB,KAAgC,EACgB,EAAE;IAClD,KAAK,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,WAAW,GAAG;MAChB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAC,IAAI,EAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;;UAEpE,KAAK,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CACzD,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CACtB;;;;UAIO,CAAA;IACR,KAAK,CAAC,uBAAuB,CAAC,CAAC,WAAW,CAAC,CAAA;IAC3C,KAAK,CAAC,uBAAuB,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAE/C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7B,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,KAAK,CAAC;KAC1D,CAAC,CAAA;IACF,KAAK,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,CAAA;IAEvC,0EAA0E;IAC1E,+EAA+E;IAC/E,MAAM,cAAc,GAA2B;QAC7C,cAAc,EAAE,kBAAkB;KACnC,CAAA;IACD,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,iBAAiB,EAAE,CAAA;QACxC,IAAI,aAAa,IAAI,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAClD,cAAc,CAAC,aAAa,GAAG,UAAU,MAAM,CAAC,WAAW,EAAE,CAAA;YAC7D,KAAK,CAAC,uBAAuB,CAAC,CAAC,sCAAsC,CAAC,CAAA;QACxE,CAAC;QAED,IAAI,SAAS,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC1C,cAAc,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,OAAO,CAAA,CAAC,qCAAqC;YAClF,KAAK,CAAC,uBAAuB,CAAC,CAC5B,2BAA2B,MAAM,CAAC,OAAO,EAAE,CAC5C,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,CAAA;IACZ,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;YAChC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,OAAO;SACd,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,CAAC,uBAAuB,CAAC,CAC5B,yDAAyD,KAAK,EAAE,CACjE,CAAA;QACD,MAAM,IAAI,QAAQ,CAAC,uBAAuB,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,KAAK,CAAC,uBAAuB,CAAC,CAC5B,uDAAuD;YACrD,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC/C,CAAA;QACD,MAAM,IAAI,QAAQ,CAAC,uBAAuB,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI,IAAwD,CAAA;IAC5D,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,KAAK,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,CAAA;QAEpC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,CAAC,uBAAuB,CAAC,CAC5B,yDAAyD,KAAK,EAAE,CACjE,CAAA;QACD,MAAM,IAAI,QAAQ,CAAC,uBAAuB,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAC/B,KAAK,CAAC,uBAAuB,CAAC,CAC5B,4DAA4D;YAC1D,sCAAsC,CACzC,CAAA;QACD,MAAM,IAAI,QAAQ,CAAC,uBAAuB,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,8DAA8D;QAC9D,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE;YAClC,0CAA0C;YAC1C,IACE,KAAK,CAAC,UAAU,EAAE,SAAS;gBACzB,iDAAiD;gBACnD,KAAK,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,2BAA2B,CAAC,EAC3D,CAAC;gBACD,OAAO,oDAAoD,CAAA;YAC7D,CAAC;YAED,IACE,KAAK,CAAC,UAAU,EAAE,SAAS;gBACzB,iDAAiD;gBACnD,KAAK,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CAC5B,+CAA+C,CAChD,EACD,CAAC;gBACD,OAAO,2CAA2C,CAAA;YACpD,CAAC;YAED,OAAO,CACL,KAAK,CAAC,OAAO;gBACb,uEAAuE;gBACvE,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClE,8EAA8E;gBAC9E,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO;oBACxB,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;oBACjD,CAAC,CAAC,EAAE,CAAC;gBACP,qGAAqG;gBACrG,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK;oBACtB,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;oBAC/C,CAAC,CAAC,EAAE,CAAC,CACR,CAAA;QACH,CAAC,CAAA;QAED,OAAO,EAAC,KAAK,EAAE,EAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC,EAAC,CAAA;IAC7E,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAChC,KAAK,CAAC,uBAAuB,CAAC,CAC5B,uDAAuD;YACrD,kBAAkB,KAAK,CAAC,SAAS,WAAW,CAC/C,CAAA;QACD,MAAM,IAAI,QAAQ,CAAC,uBAAuB,CAAC,CAAA;IAC7C,CAAC;IAED,MAAM,EAAC,MAAM,EAAE,GAAG,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAG9C,CAAA;IACD,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QACpB,KAAK,CAAC,uBAAuB,CAAC,CAC5B,uDAAuD;YACrD,gCAAgC,KAAK,CAAC,SAAS,eAAe;YAC9D,KAAK,KAAK,CAAC,SAAS,mBAAmB,CAC1C,CAAA;QACD,MAAM,IAAI,QAAQ,CAAC,uBAAuB,CAAC,CAAA;IAC7C,CAAC;IAED,OAAO,EAAC,MAAM,EAAE,EAAC,MAAM,EAAE,GAAG,EAAC,EAAC,CAAA;AAChC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,IAAI,EACJ,MAAM,EACN,UAAU,GAAG,KAAK,EAClB,UAAU,EACV,QAAQ,GAOT,EAAE,EAAE;IACH,MAAM,EAAC,MAAM,EAAE,GAAG,EAAC,GAAG,QAAQ,CAAA;IAE9B,kDAAkD;IAClD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,yBAAyB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IACzE,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAE7B,IAAI,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,CAAC,aAAa,CACf,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAC7B,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,EAC/C,EAAC,IAAI,EAAE,KAAK,EAAC,CACd,CAAA;QACH,CAAC;QAED,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,aAAa,CACf,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,EAC/B,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,SAAS,EAAC,CAAC,CAChD,CAAA;QACH,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,KAAK,CACxB,MAAM,EACN;YACE,IAAI;YACJ,MAAM,EAAE,GAAG;SACZ,EACD;YACE,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;YACZ,UAAU;YACV,UAAU;YACV,UAAU,EAAE,MAAM,oBAAoB,EAAE;SACzC,CACF,CAAA;QACD,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,CAAA;IAC1B,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,GAAG,CAAC,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,gBAA2B,EAC3B,qBAAgC,EACjB,EAAE;IACjB,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,IAAI,gBAAgB,EAAE,CAAC;QACrB,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE,CAAC;YACrC,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACnC,CAAC;YAED,2DAA2D;YAC3D,qEAAqE;YACrE,uCAAuC;YACvC,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,SAAS;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,GAAG,WAAW,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAA;IACnE,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-wrapper.d.ts","sourceRoot":"","sources":["../../src/shared/client-wrapper.ts"],"names":[],"mappings":"AAIA,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,mBAAmB,GAAG;IACvE,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,cAAc,CAAC,EAAE,MAAM,CAAA;KACxB,CAAA;CACF,
|
|
1
|
+
{"version":3,"file":"client-wrapper.d.ts","sourceRoot":"","sources":["../../src/shared/client-wrapper.ts"],"names":[],"mappings":"AAIA,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,mBAAmB,GAAG;IACvE,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,cAAc,CAAC,EAAE,MAAM,CAAA;KACxB,CAAA;CACF,CAsBA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-wrapper.js","sourceRoot":"","sources":["../../src/shared/client-wrapper.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAShD,MAAM,UAAU,mBAAmB,CAAC,aAAkC;IAQpE,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;IAEnD,MAAM,IAAI,GAAG,QAAQ;QACnB,CAAC,CAAC;YACE,WAAW,EAAE,aAAa,CAAC,WAAY;YACvC,cAAc,EAAE,iBAAiB,CAAC,aAAa,CAAC;SACjD;QACH,CAAC,CAAC;YACE,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,cAAc,EAAE,iBAAiB,CAAC,aAAa,CAAC;SACjD,CAAA;IACL,IACE,CAAC,IAAI,CAAC,WAAW;QACjB,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC,EACvD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IAED,OAAO,EAAC,IAAI,EAAC,CAAA;AACf,CAAC"}
|
|
1
|
+
{"version":3,"file":"client-wrapper.js","sourceRoot":"","sources":["../../src/shared/client-wrapper.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAShD,MAAM,UAAU,mBAAmB,CAAC,aAAkC;IAQpE,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;IAEnD,MAAM,IAAI,GAAG,QAAQ;QACnB,CAAC,CAAC;YACE,WAAW,EAAE,aAAa,CAAC,WAAY;YACvC,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,cAAc,EAAE,iBAAiB,CAAC,aAAa,CAAC;SACjD;QACH,CAAC,CAAC;YACE,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,cAAc,EAAE,iBAAiB,CAAC,aAAa,CAAC;SACjD,CAAA;IACL,IACE,CAAC,IAAI,CAAC,WAAW;QACjB,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC,EACvD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IAED,OAAO,EAAC,IAAI,EAAC,CAAA;AACf,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { MachineConfiguration, ServiceInstanceV2 } from './types.js';
|
|
2
2
|
export declare const getStepzenSDK: (zenctlApiUrl: string, deploymentType: string) => {
|
|
3
3
|
login(adminKey: string, account?: string): Promise<import("@stepzen/sdk").StepZenAccountV2>;
|
|
4
|
-
jwtLogin(apiKey: string, instanceId: string, zenctlApiUrl?: string): Promise<{
|
|
4
|
+
jwtLogin(apiKey: string, instanceId: string, zenctlApiUrl?: string, account?: string): Promise<{
|
|
5
5
|
instanceId: string;
|
|
6
6
|
accessToken: any;
|
|
7
7
|
deploymentType: string;
|
|
@@ -67,6 +67,15 @@ export declare const fetchMCSPJWToken: (apiKey: string, instanceId: string, scop
|
|
|
67
67
|
* @throws {CLIError} If the domain is invalid or cannot be parsed
|
|
68
68
|
*/
|
|
69
69
|
export declare const fetchMCSPIAMTokenURL: (zenctlApiUrl: string) => Promise<string | undefined>;
|
|
70
|
+
/**
|
|
71
|
+
* Determines if a domain is an iPaaS environment based on its hostname.
|
|
72
|
+
* Delegates to the SDK's isIPaaSDeployment which checks against the known
|
|
73
|
+
* iPaaS domain list.
|
|
74
|
+
*
|
|
75
|
+
* @param zenctlApiUrl - The zenctl API URL to check
|
|
76
|
+
* @returns True if the domain is iPaaS, false if it's SaaS
|
|
77
|
+
*/
|
|
78
|
+
export declare const isIPaaSDomain: (zenctlApiUrl: string) => boolean;
|
|
70
79
|
export type SdkInterface = ReturnType<typeof getStepzenSDK>;
|
|
71
80
|
export declare const hasSdkInterfaceV2: (configuration: MachineConfiguration) => string | false | undefined;
|
|
72
81
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stepzen-sdk.d.ts","sourceRoot":"","sources":["../../src/shared/stepzen-sdk.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,YAAY,CAAA;AAmCvE,eAAO,MAAM,aAAa,GAAI,cAAc,MAAM,EAAE,gBAAgB,MAAM;oBAQhD,MAAM;
|
|
1
|
+
{"version":3,"file":"stepzen-sdk.d.ts","sourceRoot":"","sources":["../../src/shared/stepzen-sdk.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,YAAY,CAAA;AAmCvE,eAAO,MAAM,aAAa,GAAI,cAAc,MAAM,EAAE,gBAAgB,MAAM;oBAQhD,MAAM;qBAmBlB,MAAM,cACF,MAAM,iBACH,MAAM,YACX,MAAM;;;;;;qBA2DK,iBAAiB;;iBAxHC,CAAC;eAAmB,CAAC;gBAC5C,CAAC;sBACM,CAAC;mBAGvB,CAAC;;;;;;;;;;;kBAeG,CAAC;kBACV,CAAC;;;yCAUoB,CAAC;sBAA0B,CAAC;oBACjD,CAAD;;;2CAO4B,CAAC,uBAAuB,CAAC;;;;;;wBAQhD,CAAL;kCACqB,CAAA;;;;;;CAgFrB,CAAA;AA+BD;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,MAAM,EACd,YAAY,MAAM,EAClB,WAAW,MAAM,EACjB,cAAc,MAAM,GAAG,SAAS,iBA6BjC,CAAA;AAwFD;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,GAC/B,cAAc,MAAM,KACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAyB5B,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,GAAI,cAAc,MAAM,KAAG,OAKpD,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAAA;AAE3D,eAAO,MAAM,iBAAiB,GAAI,eAAe,oBAAoB,+BAMpE,CAAA;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,CAAC,EAC/B,aAAa,EAAE,oBAAoB,EACnC,EAAE,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,GACxC,OAAO,CAAC;IACT,MAAM,EAAE,CAAC,CAAA;IACT,eAAe,CAAC,EAAE,iBAAiB,CAAA;IACnC,aAAa,EAAE,oBAAoB,CAAA;IACnC,cAAc,EAAE,OAAO,CAAA;CACxB,CAAC,CAoCD"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Copyright IBM Corp. 2020, 2025
|
|
2
2
|
import { CLIError } from '@oclif/core/errors';
|
|
3
3
|
import fetch from '@stepzen/fetch';
|
|
4
|
-
import { initV2 } from '@stepzen/sdk';
|
|
4
|
+
import { IPAAS_DOMAINS, initV2, isIPaaSDeployment } from '@stepzen/sdk';
|
|
5
5
|
import debug from 'debug';
|
|
6
6
|
import { createRequire } from 'node:module';
|
|
7
7
|
import { MCSP_PROD_AWS_TOKEN_URL, MCSP_PROD_AZURE_TOKEN_URL, MCSP_TEST_AWS_TOKEN_URL, MCSP_TEST_AZURE_TOKEN_URL, getDeploymentType, getZenCtl2Url, } from './constants.js';
|
|
@@ -44,26 +44,43 @@ export const getStepzenSDK = (zenctlApiUrl, deploymentType) => {
|
|
|
44
44
|
` (${error})`);
|
|
45
45
|
}
|
|
46
46
|
},
|
|
47
|
-
async jwtLogin(apiKey, instanceId, zenctlApiUrl) {
|
|
47
|
+
async jwtLogin(apiKey, instanceId, zenctlApiUrl, account) {
|
|
48
48
|
const accessToken = await fetchMCSPJWToken(apiKey, instanceId, 'services', zenctlApiUrl);
|
|
49
|
-
//
|
|
50
|
-
// account
|
|
51
|
-
const client = await stepzen2.client({ accessToken });
|
|
49
|
+
// Always call fetchAccountDetails to validate or retrieve account
|
|
50
|
+
// Pass account so Tenant-ID header is included for iPaaS requests
|
|
51
|
+
const client = await stepzen2.client({ accessToken, account });
|
|
52
52
|
const { data, errors } = await client.fetchAccountDetails();
|
|
53
53
|
if (errors && errors.length > 0) {
|
|
54
54
|
debug('stepzen:sdk')('Error while fetching the account details {fetchAccountDetails}', errors);
|
|
55
55
|
const errorMessage = errors[0].message || 'An unknown error occurred.';
|
|
56
56
|
throw new CLIError(`StepZen Error: ${errorMessage}`);
|
|
57
57
|
}
|
|
58
|
-
const
|
|
59
|
-
|
|
58
|
+
const fetchedAccount = data?.account ?? '';
|
|
59
|
+
// If account was provided (iPaaS case), validate it
|
|
60
|
+
if (account) {
|
|
61
|
+
// Only validate if we got a non-empty account back
|
|
62
|
+
if (fetchedAccount && fetchedAccount !== account) {
|
|
63
|
+
throw new CLIError(`Account name mismatch: you provided "${account}" but this instance belongs to "${fetchedAccount}". ` +
|
|
64
|
+
`Please check your account name in the APICGQL dashboard.`);
|
|
65
|
+
}
|
|
66
|
+
// Validation passed or no account returned - use the supplied account
|
|
67
|
+
const response = {
|
|
68
|
+
instanceId,
|
|
69
|
+
accessToken,
|
|
70
|
+
deploymentType,
|
|
71
|
+
account,
|
|
72
|
+
};
|
|
73
|
+
return response;
|
|
74
|
+
}
|
|
75
|
+
// SaaS case: no account provided, use the fetched account
|
|
76
|
+
if (!fetchedAccount) {
|
|
60
77
|
throw new CLIError(`No environment found for the instance (${instanceId})`);
|
|
61
78
|
}
|
|
62
79
|
const response = {
|
|
63
80
|
instanceId,
|
|
64
81
|
accessToken,
|
|
65
82
|
deploymentType,
|
|
66
|
-
account,
|
|
83
|
+
account: fetchedAccount,
|
|
67
84
|
};
|
|
68
85
|
return response;
|
|
69
86
|
},
|
|
@@ -134,13 +151,6 @@ export const fetchMCSPJWToken = async (apiKey, instanceId, scopeType, zenctlApiU
|
|
|
134
151
|
}
|
|
135
152
|
return jwt;
|
|
136
153
|
};
|
|
137
|
-
// Domain configuration for MCSP IAM token URL resolution
|
|
138
|
-
const IPAAS_DOMAINS = [
|
|
139
|
-
'ipaas.dev.ibmappdomain.cloud',
|
|
140
|
-
'ipaas.test.ibmappdomain.cloud',
|
|
141
|
-
'ipaas.preprod.ibmappdomain.cloud',
|
|
142
|
-
'ipaas.ibmappdomain.cloud',
|
|
143
|
-
];
|
|
144
154
|
// Environment configuration mapping for MCSP IAM token URL resolution
|
|
145
155
|
const ENVIRONMENT_CONFIGS = [
|
|
146
156
|
{
|
|
@@ -239,6 +249,20 @@ export const fetchMCSPIAMTokenURL = async (zenctlApiUrl) => {
|
|
|
239
249
|
}
|
|
240
250
|
throw new CLIError(`Invalid url : ${zenctlApiUrl}, Could you please check the domain?`);
|
|
241
251
|
};
|
|
252
|
+
/**
|
|
253
|
+
* Determines if a domain is an iPaaS environment based on its hostname.
|
|
254
|
+
* Delegates to the SDK's isIPaaSDeployment which checks against the known
|
|
255
|
+
* iPaaS domain list.
|
|
256
|
+
*
|
|
257
|
+
* @param zenctlApiUrl - The zenctl API URL to check
|
|
258
|
+
* @returns True if the domain is iPaaS, false if it's SaaS
|
|
259
|
+
*/
|
|
260
|
+
export const isIPaaSDomain = (zenctlApiUrl) => {
|
|
261
|
+
const url = zenctlApiUrl.startsWith('http')
|
|
262
|
+
? zenctlApiUrl
|
|
263
|
+
: `http://${zenctlApiUrl}`;
|
|
264
|
+
return isIPaaSDeployment(url);
|
|
265
|
+
};
|
|
242
266
|
export const hasSdkInterfaceV2 = (configuration) => {
|
|
243
267
|
const isOnZenCtl2 = configuration.serviceInstance &&
|
|
244
268
|
'zenctl2' in configuration.serviceInstance &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stepzen-sdk.js","sourceRoot":"","sources":["../../src/shared/stepzen-sdk.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAIjC,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,MAAM,gBAAgB,CAAA;AAClC,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"stepzen-sdk.js","sourceRoot":"","sources":["../../src/shared/stepzen-sdk.ts"],"names":[],"mappings":"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"}
|
package/lib/shared/utils.d.ts
CHANGED
|
@@ -58,8 +58,9 @@ export declare function getTimeout(ms: number): Promise<undefined> & {
|
|
|
58
58
|
*
|
|
59
59
|
* @param {*} url url to a web service
|
|
60
60
|
* @param {*} tries number of attempts at 3-second intervals
|
|
61
|
+
* @param {*} headers optional HTTP headers to include in every request
|
|
61
62
|
* @returns {*} a promise that completes if the service is up, otherwise fails
|
|
62
63
|
*/
|
|
63
|
-
export declare function probeEndpoint(url: string, tries?: number): Promise<void>;
|
|
64
|
+
export declare function probeEndpoint(url: string, tries?: number, headers?: Record<string, string>): Promise<void>;
|
|
64
65
|
export declare const findNextAvailableSubfolder: (folder: string, name: string) => string;
|
|
65
66
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,OAAO,EACP,4BAA4B,EAC5B,oBAAoB,EACrB,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,OAAO,EACP,4BAA4B,EAC5B,oBAAoB,EACrB,MAAM,YAAY,CAAA;AAwBnB,eAAO,MAAM,YAAY,GAAI,IAAG,MAAM,GAAG,SAAyB,KAAG,MAkBpE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,SAAS,MAAM,KAAG,MAO9C,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,WAAW,MAAM,KAChB,MAOF,CAAA;AAED,eAAO,MAAM,oBAAoB,GAC/B,gBAAgB,oBAAoB,KACnC,OAAO,CAAC,MAAM,CAoChB,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,KAAG,MAAM,GAAG,IAe5D,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,WASzC,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,YAO1C,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,eAAe,4BAA4B,KAC1C,OAMF,CAAA;AAED,MAAM,MAAM,qBAAqB,GAC7B;IAAC,IAAI,EAAE,KAAK,CAAA;CAAC,GACb;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAC7B;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAA;AAElB,eAAO,MAAM,kBAAkB,GAAI,wCAMhC;IACD,aAAa,EAAE,4BAA4B,CAAA;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,qBAAqB,CAAA;CACjC,WAwEA,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,YAAY,MAAM,KACjB,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CA0BjD,CAAA;AAID,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,UAgB5C;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,oBAAoB,EAC5B,QAAQ,EAAE,MAAM,GACf,MAAM,CAuBR;AAED,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,GACV,MAAM,CAWR;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAE3D;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC,GAAG;IAAC,MAAM,EAAE,MAAM,IAAI,CAAA;CAAC,CAS3C;AAED;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,EACX,KAAK,SAAI,EACT,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED,eAAO,MAAM,0BAA0B,GAAI,QAAQ,MAAM,EAAE,MAAM,MAAM,WAStE,CAAA"}
|
package/lib/shared/utils.js
CHANGED
|
@@ -10,6 +10,7 @@ import path from 'node:path';
|
|
|
10
10
|
import prettier from 'prettier';
|
|
11
11
|
import { readConfiguration } from './configuration.js';
|
|
12
12
|
import { DEFAULT_STEPZEN_DOMAIN, getZenServDomain, getZenServUrl, getZenServUrlTemplate, } from './constants.js';
|
|
13
|
+
import { isIPaaSDomain } from './stepzen-sdk.js';
|
|
13
14
|
import { isLocalhost, parseHost, parseJdbcUrl } from './url-helpers.js';
|
|
14
15
|
const SAMPLE_QUERY = `query SampleQuery { __schema { description queryType { fields {name} } } }`;
|
|
15
16
|
export const getDirectory = (d = process.cwd()) => {
|
|
@@ -62,7 +63,14 @@ export const getStepZenExtensions = async (configuration) => {
|
|
|
62
63
|
const url = `${zenserv}/directives.graphql`;
|
|
63
64
|
const startedAt = Date.now();
|
|
64
65
|
debug('stepzen:extensions')(`fetching StepZen extensions from ${url}`);
|
|
65
|
-
const
|
|
66
|
+
const headers = {};
|
|
67
|
+
if (isIPaaSDomain(url) &&
|
|
68
|
+
'account' in configuration &&
|
|
69
|
+
configuration.account) {
|
|
70
|
+
headers['Tenant-ID'] = configuration.account;
|
|
71
|
+
debug('stepzen:extensions')(`Added Tenant-ID header: ${configuration.account}`);
|
|
72
|
+
}
|
|
73
|
+
const response = await fetch(url, { headers });
|
|
66
74
|
const schema = await response.text();
|
|
67
75
|
const formatted = await prettier.format(schema, { parser: 'graphql' });
|
|
68
76
|
const doneAt = Date.now();
|
|
@@ -253,9 +261,10 @@ export function getTimeout(ms) {
|
|
|
253
261
|
*
|
|
254
262
|
* @param {*} url url to a web service
|
|
255
263
|
* @param {*} tries number of attempts at 3-second intervals
|
|
264
|
+
* @param {*} headers optional HTTP headers to include in every request
|
|
256
265
|
* @returns {*} a promise that completes if the service is up, otherwise fails
|
|
257
266
|
*/
|
|
258
|
-
export async function probeEndpoint(url, tries = 5) {
|
|
267
|
+
export async function probeEndpoint(url, tries = 5, headers) {
|
|
259
268
|
try {
|
|
260
269
|
debug('stepzen:utils')(chalk `fetching {cyan ${url}}`);
|
|
261
270
|
if (url.endsWith('graphql')) {
|
|
@@ -263,7 +272,7 @@ export async function probeEndpoint(url, tries = 5) {
|
|
|
263
272
|
// introspection log; so send a trivial but fine introspection query
|
|
264
273
|
url += '?query={__schema {__typename}}';
|
|
265
274
|
}
|
|
266
|
-
const response = await fetch(url);
|
|
275
|
+
const response = await fetch(url, headers ? { headers } : undefined);
|
|
267
276
|
debug('stepzen:utils')(chalk `\t--> ${response.status}`);
|
|
268
277
|
if (response.status === 200) {
|
|
269
278
|
return;
|
|
@@ -276,7 +285,7 @@ export async function probeEndpoint(url, tries = 5) {
|
|
|
276
285
|
const waitMillis = 3000;
|
|
277
286
|
debug('stepzen:utils')(chalk `will attempt to fetch {cyan ${url}} again in ${waitMillis}ms`);
|
|
278
287
|
await getTimeout(waitMillis);
|
|
279
|
-
return probeEndpoint(url, tries - 1);
|
|
288
|
+
return probeEndpoint(url, tries - 1, headers);
|
|
280
289
|
}
|
|
281
290
|
throw new CLIError(`Could not connect to the service at ${url}.`);
|
|
282
291
|
}
|
package/lib/shared/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "stepzen",
|
|
3
3
|
"description": "The StepZen CLI",
|
|
4
|
-
"version": "0.60.0-experimental.
|
|
4
|
+
"version": "0.60.0-experimental.8b8a89f",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Darren Waddell <darren@stepzen.com>",
|
|
7
7
|
"contributors": [
|
|
@@ -28,14 +28,13 @@
|
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@oclif/core": "^4.10.5",
|
|
30
30
|
"@oclif/plugin-help": "^6.2.43",
|
|
31
|
-
"@oclif/plugin-plugins": "^5.4.59",
|
|
32
31
|
"@oclif/plugin-version": "^2.2.41",
|
|
33
32
|
"@segment/analytics-node": "^2.2.0",
|
|
34
33
|
"@soluble/dsn-parser": "^1.7.5",
|
|
35
|
-
"@stepzen/fetch": "0.60.0-experimental.
|
|
36
|
-
"@stepzen/graphiql-proxy": "0.60.0-experimental.
|
|
37
|
-
"@stepzen/sdk": "0.60.0-experimental.
|
|
38
|
-
"@stepzen/transpiler": "0.60.0-experimental.
|
|
34
|
+
"@stepzen/fetch": "0.60.0-experimental.8b8a89f",
|
|
35
|
+
"@stepzen/graphiql-proxy": "0.60.0-experimental.8b8a89f",
|
|
36
|
+
"@stepzen/sdk": "0.60.0-experimental.8b8a89f",
|
|
37
|
+
"@stepzen/transpiler": "0.60.0-experimental.8b8a89f",
|
|
39
38
|
"chalk": "^4.1.2",
|
|
40
39
|
"chokidar": "^3.6.0",
|
|
41
40
|
"compare-versions": "^6.1.1",
|
|
@@ -55,7 +54,7 @@
|
|
|
55
54
|
"string-argv": "^0.3.2",
|
|
56
55
|
"tty-table": "^4.2.3",
|
|
57
56
|
"uuid": "^14.0.0",
|
|
58
|
-
"ws": "^8.
|
|
57
|
+
"ws": "^8.21.1",
|
|
59
58
|
"yaml": "^2.6.1"
|
|
60
59
|
},
|
|
61
60
|
"devDependencies": {
|
|
@@ -140,9 +139,6 @@
|
|
|
140
139
|
"cross-spawn": "^7.0.0"
|
|
141
140
|
}
|
|
142
141
|
},
|
|
143
|
-
"@oclif/plugin-plugins": {
|
|
144
|
-
"npm": "^11.0.0"
|
|
145
|
-
},
|
|
146
142
|
"cacheable-request": {
|
|
147
143
|
"http-cache-semantics": "^4.1.1"
|
|
148
144
|
},
|
|
@@ -153,12 +149,9 @@
|
|
|
153
149
|
"cross-spawn": "^7.0.6",
|
|
154
150
|
"lodash": "^4.18.0",
|
|
155
151
|
"picomatch": "^4.0.4",
|
|
156
|
-
"minimatch": {
|
|
157
|
-
"brace-expansion": "^2.0.2"
|
|
158
|
-
},
|
|
159
152
|
"@oclif/plugin-version": {
|
|
160
153
|
"@oclif/core": "^4.10.5"
|
|
161
154
|
}
|
|
162
155
|
},
|
|
163
|
-
"gitHead": "
|
|
156
|
+
"gitHead": "8b8a89fb4ed3cb585cfa30d1b01d0c9ff38da25b"
|
|
164
157
|
}
|