stepzen 0.30.0-beta.5 → 0.30.0-beta.7
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 +5 -5
- package/lib/commands/login.d.ts.map +1 -1
- package/lib/commands/login.js +33 -16
- package/lib/commands/login.js.map +1 -1
- package/lib/commands/whoami.d.ts +1 -0
- package/lib/commands/whoami.d.ts.map +1 -1
- package/lib/commands/whoami.js +18 -4
- package/lib/commands/whoami.js.map +1 -1
- package/oclif.manifest.json +21 -6
- package/package.json +6 -6
package/README.md
CHANGED
|
@@ -30,7 +30,7 @@ $ npm install -g stepzen
|
|
|
30
30
|
$ stepzen COMMAND
|
|
31
31
|
running command...
|
|
32
32
|
$ stepzen (--version|-v)
|
|
33
|
-
stepzen/0.30.0-beta.
|
|
33
|
+
stepzen/0.30.0-beta.7 linux-x64 node-v18.16.0
|
|
34
34
|
$ stepzen --help [COMMAND]
|
|
35
35
|
USAGE
|
|
36
36
|
$ stepzen COMMAND
|
|
@@ -693,9 +693,8 @@ USAGE
|
|
|
693
693
|
$ stepzen login [DOMAIN] [-h] [--non-interactive] [-a <value> | | --public] [-k <value> | | ]
|
|
694
694
|
|
|
695
695
|
ARGUMENTS
|
|
696
|
-
DOMAIN
|
|
697
|
-
|
|
698
|
-
StepZen instance.
|
|
696
|
+
DOMAIN Domain of the StepZen service to login to (e.g. stepzen.acme.com). If no domain is provided, stepzen.net is
|
|
697
|
+
used by default.
|
|
699
698
|
|
|
700
699
|
FLAGS
|
|
701
700
|
-a, --account=<value> StepZen account name (copy from https://stepzen.com/account). If not provided, the CLI prompts
|
|
@@ -936,13 +935,14 @@ View your StepZen credentials.
|
|
|
936
935
|
|
|
937
936
|
```
|
|
938
937
|
USAGE
|
|
939
|
-
$ stepzen whoami [-h] [--non-interactive] [--showkeys | --account | --adminkey | --apikey]
|
|
938
|
+
$ stepzen whoami [-h] [--non-interactive] [--showkeys | --account | --adminkey | --apikey | --domain]
|
|
940
939
|
|
|
941
940
|
FLAGS
|
|
942
941
|
-h, --help Show CLI help
|
|
943
942
|
--account
|
|
944
943
|
--adminkey
|
|
945
944
|
--apikey
|
|
945
|
+
--domain
|
|
946
946
|
--non-interactive Disable all interactive prompts
|
|
947
947
|
--showkeys
|
|
948
948
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAC,OAAO,EAAwB,iBAAiB,EAAC,MAAM,iBAAiB,CAAA;AAEhF,OAAO,UAAU,MAAM,uBAAuB,CAAA;AA0C9C,eAAO,MAAM,2BAA2B,iBACxB,MAAM,KACnB,QAAQ,iBAAiB,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAC,OAAO,EAAwB,iBAAiB,EAAC,MAAM,iBAAiB,CAAA;AAEhF,OAAO,UAAU,MAAM,uBAAuB,CAAA;AA0C9C,eAAO,MAAM,2BAA2B,iBACxB,MAAM,KACnB,QAAQ,iBAAiB,GAAG,SAAS,CAsEvC,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,UAAU;IAC3C,MAAM,CAAC,WAAW,SAAuB;IAEzC,MAAM,CAAC,KAAK;;;;;;;MA2BX;IAED,MAAM,CAAC,IAAI;;MAQV;IAEK,GAAG;CA2GV"}
|
package/lib/commands/login.js
CHANGED
|
@@ -56,20 +56,18 @@ const getServiceInstanceForDomain = (domainOrUrl) => {
|
|
|
56
56
|
port = match.groups.port;
|
|
57
57
|
domainOrUrl = match.groups.hostname;
|
|
58
58
|
}
|
|
59
|
-
let
|
|
59
|
+
let url;
|
|
60
60
|
try {
|
|
61
|
-
|
|
61
|
+
url = new URL(domainOrUrl);
|
|
62
62
|
if (url.pathname === '/') {
|
|
63
63
|
url.pathname = constants_1.ZENCTL2_URL;
|
|
64
64
|
}
|
|
65
|
-
zenctl2 = url.href;
|
|
66
65
|
}
|
|
67
66
|
catch {
|
|
68
|
-
zenctl2 = `http${(0, utils_1.isLocalhost)(domainOrUrl) ? '' : 's'}://${domainOrUrl}${port ? `:${port}` : ''}${constants_1.ZENCTL2_URL}`;
|
|
67
|
+
const zenctl2 = `http${(0, utils_1.isLocalhost)(domainOrUrl) ? '' : 's'}://${domainOrUrl}${port ? `:${port}` : ''}${constants_1.ZENCTL2_URL}`;
|
|
69
68
|
// ensure the inferred zenctl2 URL is valid
|
|
70
69
|
try {
|
|
71
|
-
|
|
72
|
-
new URL(zenctl2);
|
|
70
|
+
url = new URL(zenctl2);
|
|
73
71
|
}
|
|
74
72
|
catch (error) {
|
|
75
73
|
debug('stepzen:login')(`the inferred zenctl2 URL is invalid: ${zenctl2}`);
|
|
@@ -80,11 +78,29 @@ const getServiceInstanceForDomain = (domainOrUrl) => {
|
|
|
80
78
|
};
|
|
81
79
|
}
|
|
82
80
|
}
|
|
83
|
-
|
|
81
|
+
// special case since stepzen.net is the default
|
|
82
|
+
if (url.hostname === 'stepzen.net' || url.hostname.endsWith('.stepzen.net')) {
|
|
83
|
+
return { result: undefined };
|
|
84
|
+
}
|
|
85
|
+
// special case since steprz.net uses ZenCtl v1 (and is the default)
|
|
86
|
+
// disallow x.steprz.net but do allow us.ibm.steprz.net
|
|
87
|
+
if (url.hostname.match(/^([A-Za-z0-9]+\.)?steprz\.net$/)) {
|
|
88
|
+
return {
|
|
89
|
+
error: {
|
|
90
|
+
message: chalk `Not currently supported - {bold stepzen login steprz.net}` +
|
|
91
|
+
chalk ` requires {bold steprz.net} to use ZenCtl v2.`,
|
|
92
|
+
},
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
// ZenCtl v2 endpoint is deployed to the `stepzen` account
|
|
96
|
+
if (!(0, utils_1.isLocalhost)(url) && url.hostname.includes('.')) {
|
|
97
|
+
url.hostname = `stepzen.${url.hostname}`;
|
|
98
|
+
}
|
|
99
|
+
debug('stepzen:login')(`using zenctl2 URL ${url}`);
|
|
84
100
|
return {
|
|
85
101
|
result: {
|
|
86
102
|
deploymentType: 'local',
|
|
87
|
-
zenctl2,
|
|
103
|
+
zenctl2: url.href,
|
|
88
104
|
},
|
|
89
105
|
};
|
|
90
106
|
};
|
|
@@ -98,8 +114,11 @@ class Login extends zen_command_1.default {
|
|
|
98
114
|
}
|
|
99
115
|
const { result: claimedServiceInstance, error } = (0, exports.getServiceInstanceForDomain)(args.domain);
|
|
100
116
|
if (error) {
|
|
101
|
-
|
|
102
|
-
chalk `
|
|
117
|
+
const message = error.message === 'Invalid URL'
|
|
118
|
+
? chalk `Could not parse {bold ${args.domain}} as a StepZen service` +
|
|
119
|
+
chalk ` instance domain name or URL. Please make sure it's correct.`
|
|
120
|
+
: error.message;
|
|
121
|
+
throw new errors_1.CLIError(message);
|
|
103
122
|
}
|
|
104
123
|
const initialConfig = await (0, configuration_1.readConfiguration)();
|
|
105
124
|
let claimedConfig = {
|
|
@@ -162,7 +181,7 @@ class Login extends zen_command_1.default {
|
|
|
162
181
|
await (0, configuration_1.writeCredentialsAndServiceToConfigFile)(credentials);
|
|
163
182
|
}
|
|
164
183
|
const host = serviceInstance
|
|
165
|
-
? new URL(serviceInstance.zenctl2).host
|
|
184
|
+
? new URL(serviceInstance.zenctl2).host.replace(/^stepzen\./, '')
|
|
166
185
|
: 'stepzen.net';
|
|
167
186
|
const toInstanceMsg = host.endsWith('stepzen.net')
|
|
168
187
|
? ''
|
|
@@ -201,11 +220,9 @@ Login.flags = {
|
|
|
201
220
|
Login.args = {
|
|
202
221
|
domain: core_1.Args.string({
|
|
203
222
|
required: false,
|
|
204
|
-
description: chalk `
|
|
205
|
-
chalk `
|
|
206
|
-
chalk ` {bold stepzen.
|
|
207
|
-
chalk ` {bold stepzen login} logs you into the default` +
|
|
208
|
-
chalk ` {bold stepzen.net} StepZen instance.`,
|
|
223
|
+
description: chalk `Domain of the StepZen service to login to (e.g.` +
|
|
224
|
+
chalk ` {bold stepzen.acme.com}). If no domain is provided,` +
|
|
225
|
+
chalk ` {bold stepzen.net} is used by default.`,
|
|
209
226
|
}),
|
|
210
227
|
};
|
|
211
228
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AAEnD,+DAA+D;AAC/D,+DAA+D;AAC/D,8DAA8D;AAE9D,sCAA2C;AAC3C,mDAA+C;AAC/C,+BAA8B;AAC9B,+BAA8B;AAE9B,2DAKgC;AAChC,mDAAgF;AAChF,uDAI8B;AAE9B,2CAA2C;AAC3C,uDAA8C;AAE9C,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,oDAAoD,CACjE,aAAmC,EACnC,EAA2C;IAE3C,IACE,aAAa,CAAC,eAAe;QAC7B,SAAS,IAAI,aAAa,CAAC,eAAe,EAC1C;QACA,wEAAwE;QACxE,4EAA4E;QAC5E,MAAM,cAAc,GAClB,aAAa,CAAC,eAAe,CAAC,cAAc;YAC5C,OAAO,CAAC,GAAG,CAAC,uBAAuB;YACnC,2CAA+B,CAAA;QAEjC,MAAM,QAAQ,GAAG,IAAA,4BAAc,EAC7B,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;SAC/C,CAAA;KACF;IAED,OAAO,IAAA,mCAAqB,EAAC,aAAa,EAAE,EAAE,CAAC,CAAA;AACjD,CAAC;AAEM,MAAM,2BAA2B,GAAG,CACzC,WAAoB,EACoB,EAAE;IAC1C,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,OAAO,EAAC,MAAM,EAAE,SAAS,EAAC,CAAA;KAC3B;IAED,2EAA2E;IAC3E,4EAA4E;IAC5E,wBAAwB;IACxB,IAAI,IAAI,CAAA;IACR,MAAM,mBAAmB,GACvB,8DAA8D,CAAA;IAChE,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACnD,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,QAAQ,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE;QACzD,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAA;QACxB,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAA;KACpC;IAED,IAAI,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AAEnD,+DAA+D;AAC/D,+DAA+D;AAC/D,8DAA8D;AAE9D,sCAA2C;AAC3C,mDAA+C;AAC/C,+BAA8B;AAC9B,+BAA8B;AAE9B,2DAKgC;AAChC,mDAAgF;AAChF,uDAI8B;AAE9B,2CAA2C;AAC3C,uDAA8C;AAE9C,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,oDAAoD,CACjE,aAAmC,EACnC,EAA2C;IAE3C,IACE,aAAa,CAAC,eAAe;QAC7B,SAAS,IAAI,aAAa,CAAC,eAAe,EAC1C;QACA,wEAAwE;QACxE,4EAA4E;QAC5E,MAAM,cAAc,GAClB,aAAa,CAAC,eAAe,CAAC,cAAc;YAC5C,OAAO,CAAC,GAAG,CAAC,uBAAuB;YACnC,2CAA+B,CAAA;QAEjC,MAAM,QAAQ,GAAG,IAAA,4BAAc,EAC7B,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;SAC/C,CAAA;KACF;IAED,OAAO,IAAA,mCAAqB,EAAC,aAAa,EAAE,EAAE,CAAC,CAAA;AACjD,CAAC;AAEM,MAAM,2BAA2B,GAAG,CACzC,WAAoB,EACoB,EAAE;IAC1C,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,OAAO,EAAC,MAAM,EAAE,SAAS,EAAC,CAAA;KAC3B;IAED,2EAA2E;IAC3E,4EAA4E;IAC5E,wBAAwB;IACxB,IAAI,IAAI,CAAA;IACR,MAAM,mBAAmB,GACvB,8DAA8D,CAAA;IAChE,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACnD,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,QAAQ,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE;QACzD,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAA;QACxB,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAA;KACpC;IAED,IAAI,GAAG,CAAA;IACP,IAAI;QACF,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAA;QAC1B,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,EAAE;YACxB,GAAG,CAAC,QAAQ,GAAG,uBAAW,CAAA;SAC3B;KACF;IAAC,MAAM;QACN,MAAM,OAAO,GAAG,OACd,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAClC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,uBAAW,EAAE,CAAA;QAE1D,2CAA2C;QAC3C,IAAI;YACF,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;SACvB;QAAC,OAAO,KAAU,EAAE;YACnB,KAAK,CAAC,eAAe,CAAC,CAAC,wCAAwC,OAAO,EAAE,CAAC,CAAA;YACzE,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,aAAa;iBACxC;aACF,CAAA;SACF;KACF;IAED,gDAAgD;IAChD,IAAI,GAAG,CAAC,QAAQ,KAAK,aAAa,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;QAC3E,OAAO,EAAC,MAAM,EAAE,SAAS,EAAC,CAAA;KAC3B;IAED,oEAAoE;IACpE,uDAAuD;IACvD,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,gCAAgC,CAAC,EAAE;QACxD,OAAO;YACL,KAAK,EAAE;gBACL,OAAO,EACL,KAAK,CAAA,2DAA2D;oBAChE,KAAK,CAAA,+CAA+C;aACvD;SACF,CAAA;KACF;IAED,0DAA0D;IAC1D,IAAI,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACnD,GAAG,CAAC,QAAQ,GAAG,WAAW,GAAG,CAAC,QAAQ,EAAE,CAAA;KACzC;IAED,KAAK,CAAC,eAAe,CAAC,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAA;IAClD,OAAO;QACL,MAAM,EAAE;YACN,cAAc,EAAE,OAAO;YACvB,OAAO,EAAE,GAAG,CAAC,IAAI;SAClB;KACF,CAAA;AACH,CAAC,CAAA;AAxEY,QAAA,2BAA2B,+BAwEvC;AAED,MAAqB,KAAM,SAAQ,qBAAU;IA0C3C,KAAK,CAAC,GAAG;QACP,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAE7C,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE;YAC/B,MAAM,IAAI,iBAAQ,CAChB,KAAK,CAAA,wFAAwF;gBAC3F,KAAK,CAAA,kDAAkD,IAAI,CAAC,MAAM,IAAI,CACzE,CAAA;SACF;QAED,MAAM,EAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAC,GAAG,IAAA,mCAA2B,EACzE,IAAI,CAAC,MAAM,CACZ,CAAA;QACD,IAAI,KAAK,EAAE;YACT,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,iBAAQ,CAAC,OAAO,CAAC,CAAA;SAC5B;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAiB,GAAE,CAAA;QAE/C,IAAI,aAAa,GAAG;YAClB,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,OAAO,EAAE,SAA+B;YACxC,QAAQ,EAAE,SAA+B;YACzC,eAAe,EAAE,sBAAsB;SACxC,CAAA;QAED,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,yEAAyE;YACzE,wCAAwC;YACxC,MAAM,eAAe,GAAG,MAAM,IAAA,mCAAmB,EAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAC/D,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,CAAC,eAAe,CAAC,eAAe;aACpC,CAAA;SACF;QAED,IAAI,cAAc,CAAA;QAClB,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,cAAc;gBACZ,MAAM,oDAAoD,CACxD,aAAa,EACb,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,CAC9D,CAAA;SACJ;aAAM;YACL,0FAA0F;YAC1F,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;gBAC1B,kDAAkD;gBAClD,aAAa,CAAC,OAAO;oBACnB,KAAK,CAAC,OAAO,IAAI,CAAC,MAAM,SAAE,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,CAAA;aACnE;YAED,yFAAyF;YACzF,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;gBAC3B,kDAAkD;gBAClD,aAAa,CAAC,QAAQ;oBACpB,KAAK,CAAC,QAAQ,KAAK,SAAS;wBAC1B,CAAC,CAAC,MAAM,SAAE,CAAC,MAAM,CAAC,yBAAyB,EAAE;4BACzC,QAAQ,EAAE,KAAK;4BACf,IAAI,EAAE,MAAM;yBACb,CAAC;wBACJ,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAA;aACrB;YAED,cAAc;gBACZ,MAAM,oDAAoD,CACxD,aAAa,EACb,OAAO,CAAC,EAAE,CACR,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,QAAS,EAAE,aAAa,CAAC,OAAO,CAAC,CAChE,CAAA;SACJ;QAED,MAAM,EAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAC,GAAG,cAAc,CAAA;QAC7D,IAAI,eAAe,EAAE;YACnB,MAAM,IAAA,sDAAsC,EAAC,WAAW,EAAE,eAAe,CAAC,CAAA;SAC3E;aAAM;YACL,oEAAoE;YACpE,kEAAkE;YAClE,MAAM,IAAA,yDAAyC,GAAE,CAAA;YAEjD,qEAAqE;YACrE,MAAM,IAAA,sDAAsC,EAAC,WAAW,CAAC,CAAA;SAC1D;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,aAAa,IAAI,GAAG,CAAA;QAE7B,IAAI,CAAC,GAAG,CACN,kCAAkC,aAAa,WAAW;YACxD,KAAK,CAAA,UAAU,WAAW,CAAC,OAAO,YAAY,CACjD,CAAA;IACH,CAAC;;AApJH,wBAqJC;AApJQ,iBAAW,GAAG,oBAAoB,CAAA;AAElC,WAAK,GAAG;IACb,GAAG,qBAAU,CAAC,KAAK;IACnB,OAAO,EAAE,YAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EACT,+DAA+D;YAC/D,2DAA2D;QAC7D,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACF,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EACT,mDAAmD;YACnD,2DAA2D;QAC7D,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,WAAW,EACT,qEAAqE;YACrE,mEAAmE;YACnE,sEAAsE;QACxE,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC;KAC7C,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,SAAS,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC;QAC5C,MAAM,EAAE,IAAI;KACb,CAAC;CACH,CAAA;AAEM,UAAI,GAAG;IACZ,MAAM,EAAE,WAAI,CAAC,MAAM,CAAC;QAClB,QAAQ,EAAE,KAAK;QACf,WAAW,EACT,KAAK,CAAA,iDAAiD;YACtD,KAAK,CAAA,sDAAsD;YAC3D,KAAK,CAAA,yCAAyC;KACjD,CAAC;CACH,CAAA"}
|
package/lib/commands/whoami.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export default class WhoAmI extends ZenCommand {
|
|
|
6
6
|
account: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
7
7
|
adminkey: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
8
8
|
apikey: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
9
|
+
domain: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
9
10
|
help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
|
|
10
11
|
'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
11
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"AAOA,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAE9C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAC5C,MAAM,CAAC,WAAW,SAAmC;IAErD,MAAM,CAAC,KAAK
|
|
1
|
+
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":"AAOA,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAE9C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAC5C,MAAM,CAAC,WAAW,SAAmC;IAErD,MAAM,CAAC,KAAK;;;;;;;;MAsBX;IAEK,GAAG;CAkFV"}
|
package/lib/commands/whoami.js
CHANGED
|
@@ -19,11 +19,20 @@ class WhoAmI extends zen_command_1.default {
|
|
|
19
19
|
this.log(`Account: ${chalk.bold(configuration.account)}`);
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
|
+
const domain = configuration.serviceInstance &&
|
|
23
|
+
'zenctl2' in configuration.serviceInstance
|
|
24
|
+
? new URL(configuration.serviceInstance.zenctl2).host.replace(/^stepzen\./, '')
|
|
25
|
+
: 'stepzen.net';
|
|
22
26
|
const details = {
|
|
27
|
+
domain,
|
|
23
28
|
account: `${configuration.account} `,
|
|
24
29
|
adminkey: 'not set',
|
|
25
30
|
apikey: 'not set',
|
|
26
31
|
};
|
|
32
|
+
if (flags.domain) {
|
|
33
|
+
this.log(domain);
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
27
36
|
if (flags.account) {
|
|
28
37
|
this.log(configuration.account);
|
|
29
38
|
return;
|
|
@@ -61,6 +70,7 @@ class WhoAmI extends zen_command_1.default {
|
|
|
61
70
|
}
|
|
62
71
|
}
|
|
63
72
|
this.log();
|
|
73
|
+
this.log(`Domain: ${chalk.bold(details.domain)}`);
|
|
64
74
|
this.log(`Account: ${chalk.bold(details.account)}`);
|
|
65
75
|
this.log(`Admin key: ${chalk.bold(details.adminkey)}`);
|
|
66
76
|
this.log(`API key: ${chalk.bold(details.apikey)}`);
|
|
@@ -73,19 +83,23 @@ WhoAmI.flags = {
|
|
|
73
83
|
...zen_command_1.default.flags,
|
|
74
84
|
showkeys: core_1.Flags.boolean({
|
|
75
85
|
default: false,
|
|
76
|
-
exclusive: ['account', 'adminkey', 'apikey'],
|
|
86
|
+
exclusive: ['account', 'adminkey', 'apikey', 'domain'],
|
|
77
87
|
}),
|
|
78
88
|
account: core_1.Flags.boolean({
|
|
79
89
|
default: false,
|
|
80
|
-
exclusive: ['showkeys', 'adminkey', 'apikey'],
|
|
90
|
+
exclusive: ['showkeys', 'adminkey', 'apikey', 'domain'],
|
|
81
91
|
}),
|
|
82
92
|
adminkey: core_1.Flags.boolean({
|
|
83
93
|
default: false,
|
|
84
|
-
exclusive: ['showkeys', 'account', 'apikey'],
|
|
94
|
+
exclusive: ['showkeys', 'account', 'apikey', 'domain'],
|
|
85
95
|
}),
|
|
86
96
|
apikey: core_1.Flags.boolean({
|
|
87
97
|
default: false,
|
|
88
|
-
exclusive: ['showkeys', 'account', 'adminkey'],
|
|
98
|
+
exclusive: ['showkeys', 'account', 'adminkey', 'domain'],
|
|
99
|
+
}),
|
|
100
|
+
domain: core_1.Flags.boolean({
|
|
101
|
+
default: false,
|
|
102
|
+
exclusive: ['showkeys', 'account', 'adminkey', 'apikey'],
|
|
89
103
|
}),
|
|
90
104
|
};
|
|
91
105
|
//# sourceMappingURL=whoami.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":";AAAA,mDAAmD;;AAEnD,+BAA8B;AAC9B,sCAAiC;AAEjC,2DAAyD;AACzD,2CAA8C;AAC9C,uDAA8C;AAE9C,MAAqB,MAAO,SAAQ,qBAAU;
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.ts"],"names":[],"mappings":";AAAA,mDAAmD;;AAEnD,+BAA8B;AAC9B,sCAAiC;AAEjC,2DAAyD;AACzD,2CAA8C;AAC9C,uDAA8C;AAE9C,MAAqB,MAAO,SAAQ,qBAAU;IA2B5C,KAAK,CAAC,GAAG;QACP,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAExC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAiB,GAAE,CAAA;QAC/C,IAAI,CAAC,CAAC,SAAS,IAAI,aAAa,CAAC,EAAE;YACjC,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;YAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACxE,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SAC3B;QAED,IAAI,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC9C,IAAI,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACzD,OAAM;SACP;QAED,MAAM,MAAM,GACV,aAAa,CAAC,eAAe;YAC7B,SAAS,IAAI,aAAa,CAAC,eAAe;YACxC,CAAC,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CACzD,YAAY,EACZ,EAAE,CACH;YACH,CAAC,CAAC,aAAa,CAAA;QAEnB,MAAM,OAAO,GAAG;YACd,MAAM;YACN,OAAO,EAAE,GAAG,aAAa,CAAC,OAAO,IAAI;YACrC,QAAQ,EAAE,SAAS;YACnB,MAAM,EAAE,SAAS;SAClB,CAAA;QAED,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAChB,OAAM;SACP;QAED,IAAI,KAAK,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YAC/B,OAAM;SACP;QAED,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;gBAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAC1B,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;aACb;YACD,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;YAChC,OAAM;SACP;QAED,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBACzB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBACxB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;aACb;YACD,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;YAC9B,OAAM;SACP;QAED,IAAI,aAAa,CAAC,QAAQ,EAAE;YAC1B,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAA;aAC1C;iBAAM;gBACL,OAAO,CAAC,QAAQ,GAAG,IAAA,sBAAc,EAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;aAC1D;SACF;QAED,IAAI,aAAa,CAAC,MAAM,EAAE;YACxB,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAA;aACtC;iBAAM;gBACL,OAAO,CAAC,MAAM,GAAG,IAAA,sBAAc,EAAC,aAAa,CAAC,MAAM,CAAC,CAAA;aACtD;SACF;QAED,IAAI,CAAC,GAAG,EAAE,CAAA;QACV,IAAI,CAAC,GAAG,CAAC,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACjD,IAAI,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACnD,IAAI,CAAC,GAAG,CAAC,cAAc,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QACtD,IAAI,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAClD,IAAI,CAAC,GAAG,EAAE,CAAA;IACZ,CAAC;;AA5GH,yBA6GC;AA5GQ,kBAAW,GAAG,gCAAgC,CAAA;AAE9C,YAAK,GAAG;IACb,GAAG,qBAAU,CAAC,KAAK;IACnB,QAAQ,EAAE,YAAK,CAAC,OAAO,CAAC;QACtB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC;KACvD,CAAC;IACF,OAAO,EAAE,YAAK,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC;KACxD,CAAC;IACF,QAAQ,EAAE,YAAK,CAAC,OAAO,CAAC;QACtB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC;KACvD,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC;KACzD,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC;KACzD,CAAC;CACH,CAAA"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.30.0-beta.
|
|
2
|
+
"version": "0.30.0-beta.7",
|
|
3
3
|
"commands": {
|
|
4
4
|
"deploy": {
|
|
5
5
|
"id": "deploy",
|
|
@@ -251,7 +251,7 @@
|
|
|
251
251
|
"args": {
|
|
252
252
|
"domain": {
|
|
253
253
|
"name": "domain",
|
|
254
|
-
"description": "
|
|
254
|
+
"description": "Domain of the StepZen service to login to (e.g. stepzen.acme.com). If no domain is provided, stepzen.net is used by default.",
|
|
255
255
|
"required": false
|
|
256
256
|
}
|
|
257
257
|
}
|
|
@@ -707,7 +707,8 @@
|
|
|
707
707
|
"exclusive": [
|
|
708
708
|
"account",
|
|
709
709
|
"adminkey",
|
|
710
|
-
"apikey"
|
|
710
|
+
"apikey",
|
|
711
|
+
"domain"
|
|
711
712
|
]
|
|
712
713
|
},
|
|
713
714
|
"account": {
|
|
@@ -717,7 +718,8 @@
|
|
|
717
718
|
"exclusive": [
|
|
718
719
|
"showkeys",
|
|
719
720
|
"adminkey",
|
|
720
|
-
"apikey"
|
|
721
|
+
"apikey",
|
|
722
|
+
"domain"
|
|
721
723
|
]
|
|
722
724
|
},
|
|
723
725
|
"adminkey": {
|
|
@@ -727,7 +729,8 @@
|
|
|
727
729
|
"exclusive": [
|
|
728
730
|
"showkeys",
|
|
729
731
|
"account",
|
|
730
|
-
"apikey"
|
|
732
|
+
"apikey",
|
|
733
|
+
"domain"
|
|
731
734
|
]
|
|
732
735
|
},
|
|
733
736
|
"apikey": {
|
|
@@ -737,7 +740,19 @@
|
|
|
737
740
|
"exclusive": [
|
|
738
741
|
"showkeys",
|
|
739
742
|
"account",
|
|
740
|
-
"adminkey"
|
|
743
|
+
"adminkey",
|
|
744
|
+
"domain"
|
|
745
|
+
]
|
|
746
|
+
},
|
|
747
|
+
"domain": {
|
|
748
|
+
"name": "domain",
|
|
749
|
+
"type": "boolean",
|
|
750
|
+
"allowNo": false,
|
|
751
|
+
"exclusive": [
|
|
752
|
+
"showkeys",
|
|
753
|
+
"account",
|
|
754
|
+
"adminkey",
|
|
755
|
+
"apikey"
|
|
741
756
|
]
|
|
742
757
|
}
|
|
743
758
|
},
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "stepzen",
|
|
3
3
|
"description": "The StepZen CLI",
|
|
4
|
-
"version": "0.30.0-beta.
|
|
4
|
+
"version": "0.30.0-beta.7",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Darren Waddell <darren@stepzen.com>",
|
|
7
7
|
"contributors": [
|
|
@@ -30,10 +30,10 @@
|
|
|
30
30
|
"@oclif/plugin-help": "5.2.4",
|
|
31
31
|
"@oclif/plugin-version": "1.2.1",
|
|
32
32
|
"@soluble/dsn-parser": "^1.7.5",
|
|
33
|
-
"@stepzen/fetch": "0.30.0-beta.
|
|
34
|
-
"@stepzen/graphiql-proxy": "0.30.0-beta.
|
|
35
|
-
"@stepzen/sdk": "0.30.0-beta.
|
|
36
|
-
"@stepzen/transpiler": "0.30.0-beta.
|
|
33
|
+
"@stepzen/fetch": "0.30.0-beta.7",
|
|
34
|
+
"@stepzen/graphiql-proxy": "0.30.0-beta.7",
|
|
35
|
+
"@stepzen/sdk": "0.30.0-beta.7",
|
|
36
|
+
"@stepzen/transpiler": "0.30.0-beta.7",
|
|
37
37
|
"chalk": "^4.1.2",
|
|
38
38
|
"chokidar": "^3.5.3",
|
|
39
39
|
"compare-versions": "^5.0.3",
|
|
@@ -135,5 +135,5 @@
|
|
|
135
135
|
"version": "oclif readme && git add README.md"
|
|
136
136
|
},
|
|
137
137
|
"types": "lib/index.d.ts",
|
|
138
|
-
"gitHead": "
|
|
138
|
+
"gitHead": "0a15b48bbb17fcf935a03b6e8aefd4f52e8f987f"
|
|
139
139
|
}
|