@oneuptime/cli 14.0.12 → 14.0.13
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.
|
@@ -135,7 +135,10 @@ function getResolvedCredentials(cliOptions) {
|
|
|
135
135
|
const config = load();
|
|
136
136
|
const ctx = config.contexts[cliOptions.context];
|
|
137
137
|
if (ctx) {
|
|
138
|
-
return applyCliOverrides({
|
|
138
|
+
return applyCliOverrides({
|
|
139
|
+
apiKey: envApiKey || ctx.apiKey,
|
|
140
|
+
apiUrl: envUrl || ctx.apiUrl,
|
|
141
|
+
});
|
|
139
142
|
}
|
|
140
143
|
throw new Error(`Context "${cliOptions.context}" does not exist.`);
|
|
141
144
|
}
|
|
@@ -143,16 +146,15 @@ function getResolvedCredentials(cliOptions) {
|
|
|
143
146
|
const currentCtx = getCurrentContext();
|
|
144
147
|
if (currentCtx) {
|
|
145
148
|
return applyCliOverrides({
|
|
146
|
-
apiKey: currentCtx.apiKey,
|
|
147
|
-
apiUrl: currentCtx.apiUrl,
|
|
149
|
+
apiKey: envApiKey || currentCtx.apiKey,
|
|
150
|
+
apiUrl: envUrl || currentCtx.apiUrl,
|
|
148
151
|
});
|
|
149
152
|
}
|
|
150
|
-
// Partial env vars
|
|
153
|
+
// Partial env vars with no saved context to fill the other field
|
|
151
154
|
if (envApiKey || envUrl) {
|
|
152
|
-
const ctx = getCurrentContext();
|
|
153
155
|
return applyCliOverrides({
|
|
154
|
-
apiKey: envApiKey ||
|
|
155
|
-
apiUrl: envUrl ||
|
|
156
|
+
apiKey: envApiKey || "",
|
|
157
|
+
apiUrl: envUrl || "",
|
|
156
158
|
});
|
|
157
159
|
}
|
|
158
160
|
throw new Error("No credentials found. Run `oneuptime login` or set ONEUPTIME_API_KEY and ONEUPTIME_URL environment variables.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigManager.js","sourceRoot":"","sources":["../../../Core/ConfigManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,oBAUC;AAED,oBAOC;AAED,8CAMC;AAED,8CAOC;AAED,gCAOC;AAED,sCAWC;AAED,oCAUC;AAQD,
|
|
1
|
+
{"version":3,"file":"ConfigManager.js","sourceRoot":"","sources":["../../../Core/ConfigManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,oBAUC;AAED,oBAOC;AAED,8CAMC;AAED,8CAOC;AAED,gCAOC;AAED,sCAWC;AAED,oCAUC;AAQD,wDAuDC;AApJD,uCAAyB;AACzB,2CAA6B;AAC7B,uCAAyB;AAGzB,MAAM,UAAU,GAAW,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;AACjE,MAAM,WAAW,GAAW,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAEjE,SAAS,gBAAgB;IACvB,OAAO;QACL,cAAc,EAAE,EAAE;QAClB,QAAQ,EAAE,EAAE;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,IAAI;IAClB,IAAI,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAChC,OAAO,gBAAgB,EAAE,CAAC;QAC5B,CAAC;QACD,MAAM,GAAG,GAAW,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAc,CAAC;IACtC,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,gBAAgB,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,SAAgB,IAAI,CAAC,MAAiB;IACpC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;QAC7D,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,iBAAiB;IAC/B,MAAM,MAAM,GAAc,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC;AACxD,CAAC;AAED,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,MAAM,MAAM,GAAc,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,mBAAmB,CAAC,CAAC;IACvD,CAAC;IACD,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,CAAC;AACf,CAAC;AAED,SAAgB,UAAU,CAAC,OAAmB;IAC5C,MAAM,MAAM,GAAc,IAAI,EAAE,CAAC;IACjC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;IACxC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAC3B,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,CAAC;AACf,CAAC;AAED,SAAgB,aAAa,CAAC,IAAY;IACxC,MAAM,MAAM,GAAc,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,mBAAmB,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,MAAM,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;QACnC,MAAM,SAAS,GAAa,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzD,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,CAAC;AACf,CAAC;AAED,SAAgB,YAAY;IAC1B,MAAM,MAAM,GAAc,IAAI,EAAE,CAAC;IACjC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CACvC,CAAC,GAAe,EAAuC,EAAE;QACvD,uCACK,GAAG,KACN,SAAS,EAAE,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,cAAc,IAC7C;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AAQD,SAAgB,sBAAsB,CACpC,UAAsB;IAEtB,wBAAwB;IACxB,IAAI,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;QACxC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC;IAC/D,CAAC;IAED,SAAS,iBAAiB,CAAC,KAA0B;QACnD,OAAO;YACL,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;YACzC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM;SACvC,CAAC;IACJ,CAAC;IAED,oCAAoC;IACpC,MAAM,SAAS,GAAuB,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACvE,MAAM,MAAM,GAAuB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAChE,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;QACxB,OAAO,iBAAiB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,+DAA+D;IAC/D,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,MAAM,GAAc,IAAI,EAAE,CAAC;QACjC,MAAM,GAAG,GAA2B,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACxE,IAAI,GAAG,EAAE,CAAC;YACR,OAAO,iBAAiB,CAAC;gBACvB,MAAM,EAAE,SAAS,IAAI,GAAG,CAAC,MAAM;gBAC/B,MAAM,EAAE,MAAM,IAAI,GAAG,CAAC,MAAM;aAC7B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IACrE,CAAC;IAED,6CAA6C;IAC7C,MAAM,UAAU,GAAsB,iBAAiB,EAAE,CAAC;IAC1D,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,iBAAiB,CAAC;YACvB,MAAM,EAAE,SAAS,IAAI,UAAU,CAAC,MAAM;YACtC,MAAM,EAAE,MAAM,IAAI,UAAU,CAAC,MAAM;SACpC,CAAC,CAAC;IACL,CAAC;IAED,iEAAiE;IACjE,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;QACxB,OAAO,iBAAiB,CAAC;YACvB,MAAM,EAAE,SAAS,IAAI,EAAE;YACvB,MAAM,EAAE,MAAM,IAAI,EAAE;SACrB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CACb,+GAA+G,CAChH,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneuptime/cli",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.13",
|
|
4
4
|
"description": "OneUptime CLI - Command-line interface for managing OneUptime resources",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"chalk": "^4.1.2",
|
|
31
31
|
"cli-table3": "^0.6.5",
|
|
32
32
|
"commander": "^12.1.0",
|
|
33
|
-
"Common": "npm:@oneuptime/common@14.0.
|
|
33
|
+
"Common": "npm:@oneuptime/common@14.0.13",
|
|
34
34
|
"ts-node": "^10.9.2"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|