stepzen 0.60.0-experimental.10472b2 → 0.60.0-experimental.3c3cd97
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 +1 -1
- package/lib/commands/login.d.ts.map +1 -1
- package/lib/commands/login.js +42 -17
- package/lib/commands/login.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/oclif.manifest.json +1 -1
- package/package.json +11 -11
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.3c3cd97 linux-x64 node-v22.23.1
|
|
40
40
|
$ stepzen --help [COMMAND]
|
|
41
41
|
USAGE
|
|
42
42
|
$ stepzen COMMAND
|
|
@@ -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;IA2BnB,GAAG;CAqKV"}
|
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;
|
|
@@ -162,30 +168,49 @@ export default class Login extends ZenCommand {
|
|
|
162
168
|
};
|
|
163
169
|
}
|
|
164
170
|
const instanceOrAccount = await this.getInstanceOrAccount(flags, claimedConfig);
|
|
165
|
-
|
|
166
|
-
const hasAccountFlag = Boolean(flags.account);
|
|
171
|
+
// Determine login type: if -i flag is present, it's JWT login; otherwise legacy
|
|
167
172
|
const hasInstanceIdFlag = Boolean(flags.instanceId);
|
|
173
|
+
const hasLegacyLogin = hasInstanceIdFlag
|
|
174
|
+
? false
|
|
175
|
+
: await validateLoginType(instanceOrAccount);
|
|
168
176
|
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
177
|
claimedConfig.account = instanceOrAccount;
|
|
173
178
|
}
|
|
174
179
|
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
180
|
const isValid = await isValidInstanceId(instanceOrAccount);
|
|
179
181
|
if (!isValid) {
|
|
180
182
|
throw new Error('Invalid instanceId, Please check in SaaS console (https://console.saas.ibm.com)');
|
|
181
183
|
}
|
|
182
184
|
claimedConfig.instanceId = instanceOrAccount;
|
|
183
185
|
}
|
|
186
|
+
// Detect iPaaS environment
|
|
187
|
+
const isIPaaS = claimedConfig.serviceInstance?.zenctl2 &&
|
|
188
|
+
isIPaaSDomain(claimedConfig.serviceInstance.zenctl2);
|
|
189
|
+
// For iPaaS JWT login, we need an account name
|
|
190
|
+
let accountForIPaaS;
|
|
191
|
+
if (!hasLegacyLogin && isIPaaS) {
|
|
192
|
+
if (claimedConfig.account) {
|
|
193
|
+
// Account already provided via -a flag
|
|
194
|
+
accountForIPaaS = claimedConfig.account;
|
|
195
|
+
}
|
|
196
|
+
else if (flags['non-interactive']) {
|
|
197
|
+
throw new CLIError('Account name must be provided using --account when logging into an iPaaS environment with an instance ID.');
|
|
198
|
+
}
|
|
199
|
+
else {
|
|
200
|
+
// Prompt for account name
|
|
201
|
+
const { account } = await inquirer.prompt({
|
|
202
|
+
name: 'account',
|
|
203
|
+
message: 'What is your account name?',
|
|
204
|
+
});
|
|
205
|
+
accountForIPaaS = account;
|
|
206
|
+
claimedConfig.account = account;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
184
209
|
claimedConfig.adminKey = await this.getAdminKey(flags, claimedConfig, hasLegacyLogin);
|
|
185
210
|
const loggedInConfig = await tryDefaultZenCtl(claimedConfig, stepzen => hasLegacyLogin
|
|
186
211
|
? stepzen.login(claimedConfig.adminKey, claimedConfig.account)
|
|
187
|
-
: stepzen.jwtLogin(claimedConfig.adminKey, // it
|
|
188
|
-
claimedConfig.instanceId, claimedConfig.serviceInstance?.zenctl2));
|
|
212
|
+
: stepzen.jwtLogin(claimedConfig.adminKey, // it contains mcsp's APIKey when login using instanceID
|
|
213
|
+
claimedConfig.instanceId, claimedConfig.serviceInstance?.zenctl2, accountForIPaaS));
|
|
189
214
|
const { result: credentials, serviceInstance } = loggedInConfig;
|
|
190
215
|
if (serviceInstance) {
|
|
191
216
|
if (flags.introspection) {
|
|
@@ -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":"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,aAAa,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAA;AAChF,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,yBAAyB,CAAA;AAC5E,OAAO,UAAU,EAAE,EAAC,2BAA2B,EAAC,MAAM,0BAA0B,CAAA;AAEhF,wEAAwE;AACxE,wEAAwE;AACxE,qEAAqE;AACrE,EAAE;AACF,oEAAoE;AACpE,0EAA0E;AAC1E,yEAAyE;AACzE,kDAAkD;AAClD,2DAA2D;AAC3D,oBAAoB;AACpB,wEAAwE;AACxE,mBAAmB;AACnB,KAAK,UAAU,gBAAgB,CAC7B,aAAmC,EACnC,EAAyC;IAOzC,IACE,aAAa,CAAC,eAAe;QAC7B,SAAS,IAAI,aAAa,CAAC,eAAe,EAC1C,CAAC;QACD,wEAAwE;QACxE,4EAA4E;QAC5E,MAAM,cAAc,GAClB,aAAa,CAAC,eAAe,CAAC,cAAc;YAC5C,OAAO,CAAC,GAAG,CAAC,uBAAuB;YACnC,+BAA+B,CAAA;QAEjC,MAAM,QAAQ,GAAG,aAAa,CAC5B,aAAa,CAAC,eAAe,CAAC,OAAO,EACrC,cAAc,CACf,CAAA;QACD,OAAO;YACL,MAAM,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC;YAC1B,eAAe,EAAE,aAAa,CAAC,eAAe;YAC9C,aAAa;YACb,cAAc,EAAE,KAAK;SACtB,CAAA;IACH,CAAC;IAED,OAAO,SAAS,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,UAAU;IAC3C,MAAM,CAAC,WAAW,GAAG,oBAAoB,CAAA;IAEzC,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,KAAK;QACnB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,GAAG;YACT,WAAW,EACT,+DAA+D;gBAC/D,2DAA2D;YAC7D,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EACT,+BAA+B;gBAC/B,mJAAmJ;gBACnJ,gEAAgE;gBAChE,8CAA8C;YAChD,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,WAAW,EACT,KAAK,CAAA,iGAAiG;gBACtG,KAAK,CAAA,qDAAqD;gBAC1D,IAAI;gBACJ,YAAY;gBACZ,oEAAoE;SACvE,CAAC;QACF,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC;YACvB,IAAI,EAAE,GAAG;YACT,WAAW,EACT,kJAAkJ;SACrJ,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,SAAS,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC;YAClC,MAAM,EAAE,IAAI;SACb,CAAC;KACH,CAAA;IAED,MAAM,CAAC,IAAI,GAAG;QACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;YAClB,QAAQ,EAAE,KAAK;YACf,WAAW,EACT,KAAK,CAAA,iDAAiD;gBACtD,KAAK,CAAA,sCAAsC;gBAC3C,KAAK,CAAA,wCAAwC;gBAC7C,KAAK,CAAA,4BAA4B;gBACjC,KAAK,CAAA,yCAAyC;gBAC9C,KAAK,CAAA,+CAA+C;SACvD,CAAC;KACH,CAAA;IAEO,KAAK,CAAC,oBAAoB,CAChC,KAAiB,EACjB,aAGC;QAED,IAAI,aAAa,CAAC,OAAO;YAAE,OAAO,aAAa,CAAC,OAAO,CAAA;QACvD,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,QAAQ,CAChB,KAAK,CAAA,oGAAoG,CAC1G,CAAA;QACH,CAAC;QAED,6BAA6B;QAC7B,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,aAAa,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;QAC7C,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,aAAa,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;QACvC,CAAC;QAED,4DAA4D;QAC5D,MAAM,iBAAiB,GACrB,KAAK,CAAC,UAAU;YAChB,KAAK,CAAC,OAAO;YACb,CACE,MAAM,QAAQ,CAAC,MAAM,CAAC;gBACpB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,2CAA2C;aACrD,CAAC,CACH,CAAC,OAAO,CAAA;QAEX,wCAAwC;QACxC,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACxC,aAAa,CAAC,UAAU,GAAG,iBAAiB,CAAA;QAC9C,CAAC;QAED,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,KAAiB,EACjB,aAEC,EACD,cAAuB;QAEvB,IAAI,KAAK,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAA;QACzC,IAAI,aAAa,CAAC,QAAQ;YAAE,OAAO,aAAa,CAAC,QAAQ,CAAA;QACzD,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,QAAQ,CAChB,KAAK,CAAA,qDAAqD,CAC3D,CAAA;QACH,CAAC;QAED,MAAM,aAAa,GAAG,cAAc;YAClC,CAAC,CAAC,yBAAyB;YAC3B,CAAC,CAAC,uBAAuB,CAAA;QAC3B,MAAM,EAAC,QAAQ,EAAC,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YACvC,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,aAAa;YACtB,IAAI,EAAE,UAAU;SACjB,CAAC,CAAA;QAEF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAE7C,MAAM,EAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,GAAG,IAAI,EAAC,GAAG,KAAK,CAAC,MAAM;YACjE,CAAC,CAAC,EAAC,MAAM,EAAE,SAAS,EAAC;YACrB,CAAC,CAAC,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC5C,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,OAAO,GACX,KAAK,CAAC,OAAO,KAAK,aAAa;gBAC7B,CAAC,CAAC,KAAK,CAAA,yBAAyB,IAAI,CAAC,MAAM,wBAAwB;oBACjE,KAAK,CAAA,8DAA8D;gBACrE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;YACnB,MAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC7B,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,iBAAiB,EAAE,CAAA;QAC/C,IAAI,aAAa,GAAG;YAClB,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,OAAO,EAAE,SAA+B;YACxC,QAAQ,EAAE,SAA+B;YACzC,UAAU,EAAE,SAA+B;YAC3C,WAAW,EAAE,SAA+B;YAC5C,eAAe,EAAE,sBAAsB;SACxC,CAAA;QACD,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,yEAAyE;YACzE,wCAAwC;YACxC,MAAM,eAAe,GAAG,CAAC,MAAM,mBAAmB,CAChD,KAAK,CAAC,MAAM,CACb,CAA4C,CAAA;YAC7C,aAAa,GAAG;gBACd,GAAG,aAAa;gBAChB,OAAO,EAAE,eAAe,CAAC,OAAO;gBAChC,QAAQ,EAAE,eAAe,CAAC,QAAQ;gBAClC,eAAe,EAAE,aAAa,CAAC,eAAe;oBAC5C,CAAC,CAAC;wBACE,GAAG,aAAa,CAAC,eAAe;wBAChC,GAAG,eAAe,CAAC,eAAe;qBACnC;oBACH,CAAC,CAAE,eAAe,CAAC,eAAqC;aAC3D,CAAA;QACH,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CACvD,KAAK,EACL,aAAa,CACd,CAAA;QAED,gFAAgF;QAChF,MAAM,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACnD,MAAM,cAAc,GAAG,iBAAiB;YACtC,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;QAE9C,IAAI,cAAc,EAAE,CAAC;YACnB,aAAa,CAAC,OAAO,GAAG,iBAAiB,CAAA;QAC3C,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;YAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAA;YACH,CAAC;YAED,aAAa,CAAC,UAAU,GAAG,iBAAiB,CAAA;QAC9C,CAAC;QAED,2BAA2B;QAC3B,MAAM,OAAO,GACX,aAAa,CAAC,eAAe,EAAE,OAAO;YACtC,aAAa,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAEtD,+CAA+C;QAC/C,IAAI,eAAmC,CAAA;QACvC,IAAI,CAAC,cAAc,IAAI,OAAO,EAAE,CAAC;YAC/B,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC1B,uCAAuC;gBACvC,eAAe,GAAG,aAAa,CAAC,OAAO,CAAA;YACzC,CAAC;iBAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,QAAQ,CAChB,2GAA2G,CAC5G,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,0BAA0B;gBAC1B,MAAM,EAAC,OAAO,EAAC,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;oBACtC,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,4BAA4B;iBACtC,CAAC,CAAA;gBACF,eAAe,GAAG,OAAO,CAAA;gBACzB,aAAa,CAAC,OAAO,GAAG,OAAO,CAAA;YACjC,CAAC;QACH,CAAC;QAED,aAAa,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAC7C,KAAK,EACL,aAAa,EACb,cAAc,CACf,CAAA;QAED,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAC3C,aAAa,EACb,OAAO,CAAC,EAAE,CACR,cAAc;YACZ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,QAAS,EAAE,aAAa,CAAC,OAAO,CAAC;YAC/D,CAAC,CAAC,OAAO,CAAC,QAAQ,CACd,aAAa,CAAC,QAAS,EAAE,wDAAwD;YACjF,aAAa,CAAC,UAAW,EACzB,aAAa,CAAC,eAAe,EAAE,OAAO,EACtC,eAAe,CAChB,CACR,CAAA;QACD,MAAM,EAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAC,GAAG,cAAc,CAAA;QAC7D,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;gBACxB,6EAA6E;gBAC7E,kBAAkB;gBAClB,IAAI,oBAAoB,GAAG,KAAK,CAAC,aAAa,CAAA;gBAC9C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;oBAC3C,oBAAoB,GAAG,WAAW,oBAAoB,EAAE,CAAA;gBAC1D,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,aAAa,CACjB,qBAAqB,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,EACnE,CAAC,CACF,CAAA;oBACD,eAAe,CAAC,aAAa,GAAG,oBAAoB,CAAA;oBACpD,IAAI,CAAC,GAAG,CACN,KAAK,CAAA,4CAA4C,oBAAoB,IAAI,CAC1E,CAAA;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,IAAI,CAAC,KAAK,CACR,+CAA+C,oBAAoB,YAAY,CAChF,CAAA;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAA;YAC9D,CAAC;YAED,MAAM,sCAAsC,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;QAC5E,CAAC;aAAM,CAAC;YACN,oEAAoE;YACpE,kEAAkE;YAClE,MAAM,yCAAyC,EAAE,CAAA;YAEjD,qEAAqE;YACrE,MAAM,sCAAsC,CAAC,WAAW,CAAC,CAAA;QAC3D,CAAC;QAED,MAAM,IAAI,GAAG,eAAe;YAC1B,CAAC,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;YACjE,CAAC,CAAC,aAAa,CAAA;QACjB,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;YAChD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,KAAK,CAAA,YAAY,IAAI,GAAG,CAAA;QAE5B,MAAM,cAAc,GAAG,cAAc;YACnC,CAAC,CAAC,KAAK,CAAA,UAAU,aAAa,CAAC,OAAO,YAAY;YAClD,CAAC,CAAC,KAAK,CAAA,UAAU,aAAa,CAAC,UAAU,eAAe,CAAA;QAC1D,IAAI,CAAC,GAAG,CACN,mCAAmC,aAAa,aAAa,cAAc,EAAE,CAC9E,CAAA;QACD,wCAAwC;QACxC,eAAe,EAAE,CAAA;IACnB,CAAC"}
|
|
@@ -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/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.3c3cd97",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Darren Waddell <darren@stepzen.com>",
|
|
7
7
|
"contributors": [
|
|
@@ -32,10 +32,10 @@
|
|
|
32
32
|
"@oclif/plugin-version": "^2.2.41",
|
|
33
33
|
"@segment/analytics-node": "^2.2.0",
|
|
34
34
|
"@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.
|
|
35
|
+
"@stepzen/fetch": "0.60.0-experimental.3c3cd97",
|
|
36
|
+
"@stepzen/graphiql-proxy": "0.60.0-experimental.3c3cd97",
|
|
37
|
+
"@stepzen/sdk": "0.60.0-experimental.3c3cd97",
|
|
38
|
+
"@stepzen/transpiler": "0.60.0-experimental.3c3cd97",
|
|
39
39
|
"chalk": "^4.1.2",
|
|
40
40
|
"chokidar": "^3.6.0",
|
|
41
41
|
"compare-versions": "^6.1.1",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"string-argv": "^0.3.2",
|
|
56
56
|
"tty-table": "^4.2.3",
|
|
57
57
|
"uuid": "^14.0.0",
|
|
58
|
-
"ws": "^8.
|
|
58
|
+
"ws": "^8.21.1",
|
|
59
59
|
"yaml": "^2.6.1"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
@@ -140,7 +140,7 @@
|
|
|
140
140
|
"cross-spawn": "^7.0.0"
|
|
141
141
|
},
|
|
142
142
|
"minimatch": {
|
|
143
|
-
"brace-expansion": "^5.0.
|
|
143
|
+
"brace-expansion": "^5.0.8"
|
|
144
144
|
}
|
|
145
145
|
},
|
|
146
146
|
"@oclif/plugin-plugins": {
|
|
@@ -157,21 +157,21 @@
|
|
|
157
157
|
"lodash": "^4.18.0",
|
|
158
158
|
"picomatch": "^4.0.4",
|
|
159
159
|
"minimatch": {
|
|
160
|
-
"brace-expansion": "^
|
|
160
|
+
"brace-expansion": "^5.0.8"
|
|
161
161
|
},
|
|
162
162
|
"@oclif/plugin-version": {
|
|
163
163
|
"@oclif/core": "^4.10.5"
|
|
164
164
|
},
|
|
165
165
|
"nodemon": {
|
|
166
166
|
"minimatch": {
|
|
167
|
-
"brace-expansion": "^5.0.
|
|
167
|
+
"brace-expansion": "^5.0.8"
|
|
168
168
|
}
|
|
169
169
|
},
|
|
170
170
|
"test-exclude": {
|
|
171
171
|
"minimatch": {
|
|
172
|
-
"brace-expansion": "^5.0.
|
|
172
|
+
"brace-expansion": "^5.0.8"
|
|
173
173
|
}
|
|
174
174
|
}
|
|
175
175
|
},
|
|
176
|
-
"gitHead": "
|
|
176
|
+
"gitHead": "3c3cd97a8e9cf0b4582e3420fa3e851b893b9dd3"
|
|
177
177
|
}
|