@codiac.io/codiac-cli 1.3.80 → 1.3.82
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/dist/cli-common/command-base.d.ts +5 -0
- package/dist/cli-common/command-base.js +9 -1
- package/dist/cli-common/command-base.js.map +1 -1
- package/dist/command-base-enterprise.js +5 -5
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/commands/auth/register.js +1 -1
- package/dist/commands/auth/register.js.map +1 -1
- package/dist/commands/login.js +1 -1
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +1 -1
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/noc/cluster/destroy.d.ts +3 -0
- package/dist/commands/noc/cluster/destroy.js +28 -4
- package/dist/commands/noc/cluster/destroy.js.map +1 -1
- package/dist/commands/relay-version.js +6 -0
- package/dist/commands/relay-version.js.map +1 -1
- package/dist/commands/tenant/create.js +1 -1
- package/dist/commands/tenant/create.js.map +1 -1
- package/dist/commands/tenant/switch.js +1 -1
- package/dist/commands/tenant/switch.js.map +1 -1
- package/dist/message-contracts/terminal-command-request.d.ts +3 -1
- package/dist/message-contracts/terminal-command-request.js +2 -0
- package/dist/message-contracts/terminal-command-request.js.map +1 -1
- package/dist/ops/entities/cli-config.d.ts +17 -1
- package/dist/ops/entities/cli-config.js +4 -2
- package/dist/ops/entities/cli-config.js.map +1 -1
- package/dist/ops/terminal-utils.js +7 -0
- package/dist/ops/terminal-utils.js.map +1 -1
- package/dist/relay/relay-container.d.ts +10 -2
- package/dist/relay/relay-container.js +49 -5
- package/dist/relay/relay-container.js.map +1 -1
- package/dist/uilogic/image-contextualizer.js +12 -1
- package/dist/uilogic/image-contextualizer.js.map +1 -1
- package/dist/uilogic/tenant-contextualizer.d.ts +3 -1
- package/dist/uilogic/tenant-contextualizer.js +4 -3
- package/dist/uilogic/tenant-contextualizer.js.map +1 -1
- package/dist/user-context-loader.d.ts +5 -2
- package/dist/user-context-loader.js +13 -9
- package/dist/user-context-loader.js.map +1 -1
- package/oclif.manifest.json +8 -1
- package/package.json +1 -1
|
@@ -7,11 +7,11 @@ const fs = require("fs");
|
|
|
7
7
|
const codiac_relay_contracts_1 = require("@codiac.io/codiac-relay-contracts");
|
|
8
8
|
const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
|
|
9
9
|
const codiac_constants_1 = require("./codiac-constants");
|
|
10
|
-
const ops_1 = require("./ops");
|
|
11
10
|
/** Simply deserializes the currently cached user context from its config file.
|
|
12
11
|
* This class exists so that the load methods can be called before an api client gets instantiated. */
|
|
13
12
|
class UserContextLoader {
|
|
14
|
-
constructor(logger) {
|
|
13
|
+
constructor(cliEnviro, logger) {
|
|
14
|
+
this.cliEnviro = cliEnviro;
|
|
15
15
|
this.logger = logger;
|
|
16
16
|
}
|
|
17
17
|
/** (context is Machine-User scoped)
|
|
@@ -31,8 +31,9 @@ class UserContextLoader {
|
|
|
31
31
|
* */
|
|
32
32
|
loadUserContext(tenantCode) {
|
|
33
33
|
// let output: UserContext | undefined;
|
|
34
|
-
let homeDir = "~/"; // path.posix.resolve("~/"); // NOTE: This tilde (~) may not be valid on a windows box.
|
|
35
|
-
let pathName = path.posix.join(homeDir,
|
|
34
|
+
// let homeDir = "~/"; // path.posix.resolve("~/"); // NOTE: This tilde (~) may not be valid on a windows box.
|
|
35
|
+
// let pathName = path.posix.join(homeDir, OpsConstants.CLI_CONFIG_FOLDER_NAME, CliConstants.USER_CONTEXT_FILENAME);
|
|
36
|
+
let pathName = path.posix.join(this.cliEnviro.localProgramFolder, codiac_constants_1.CliConstants.USER_CONTEXT_FILENAME);
|
|
36
37
|
this.logger.trace(`Reading ${pathName}...`);
|
|
37
38
|
let machineUserContext = codiac_ops_common_1.JsonUtils.deserializeJsonFile(pathName);
|
|
38
39
|
if (machineUserContext) {
|
|
@@ -79,8 +80,9 @@ class UserContextLoader {
|
|
|
79
80
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
80
81
|
return new Promise((resolve, reject) => {
|
|
81
82
|
try {
|
|
82
|
-
let homeDir = "~/"; // path.posix.resolve("~/"); // NOTE: This tilde (~) may not be valid on a windows box.
|
|
83
|
-
let pathName = path.posix.join(
|
|
83
|
+
// let homeDir = "~/"; // path.posix.resolve("~/"); // NOTE: This tilde (~) may not be valid on a windows box.
|
|
84
|
+
// let pathName = path.posix.join(OpsUtils.resolveHomeDir(homeDir), OpsConstants.CLI_CONFIG_FOLDER_NAME, CliConstants.USER_CONTEXT_FILENAME);
|
|
85
|
+
let pathName = path.posix.join(this.cliEnviro.localProgramFolder, codiac_constants_1.CliConstants.USER_CONTEXT_FILENAME);
|
|
84
86
|
pathName = path.normalize(pathName);
|
|
85
87
|
if (fs.existsSync(pathName)) {
|
|
86
88
|
fs.rm(pathName, { force: true }, () => {
|
|
@@ -103,10 +105,11 @@ class UserContextLoader {
|
|
|
103
105
|
exports.UserContextLoader = UserContextLoader;
|
|
104
106
|
/** Provides cruds for the user context, persisting to the local context config file. */
|
|
105
107
|
class UserContextManager {
|
|
106
|
-
constructor(authClient, logger) {
|
|
108
|
+
constructor(cliEnviro, authClient, logger) {
|
|
109
|
+
this.cliEnviro = cliEnviro;
|
|
107
110
|
this.authClient = authClient;
|
|
108
111
|
this.logger = logger;
|
|
109
|
-
this.loader = new UserContextLoader(this.logger);
|
|
112
|
+
this.loader = new UserContextLoader(this.cliEnviro, this.logger);
|
|
110
113
|
}
|
|
111
114
|
/** Extends the user token so we can get the user's tenant profiles.
|
|
112
115
|
* If the token is expired, or something has changed, it fails.
|
|
@@ -145,7 +148,8 @@ class UserContextManager {
|
|
|
145
148
|
* TODO: Consider writing this to the cache folder instead of the config folder.
|
|
146
149
|
* Throws any encountered exceptions. */
|
|
147
150
|
writeUserContext(userContext) {
|
|
148
|
-
let pathName = path.join("~/",
|
|
151
|
+
// let pathName = path.join("~/", OpsConstants.CLI_CONFIG_FOLDER_NAME, CliConstants.USER_CONTEXT_FILENAME);
|
|
152
|
+
let pathName = path.join(this.cliEnviro.localProgramFolder, codiac_constants_1.CliConstants.USER_CONTEXT_FILENAME);
|
|
149
153
|
this.logger.debug(`Writing UserContext to ${pathName}`);
|
|
150
154
|
codiac_ops_common_1.JsonUtils.serializeJsonFile(userContext, pathName);
|
|
151
155
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-context-loader.js","sourceRoot":"","sources":["../src/user-context-loader.ts"],"names":[],"mappings":";;;;AAAA,6BAA6B;AAC7B,yBAAyB;AAKzB,8EAAgE;AAChE,oEAAmE;AACnE,yDAAkD;
|
|
1
|
+
{"version":3,"file":"user-context-loader.js","sourceRoot":"","sources":["../src/user-context-loader.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "1.3.
|
|
2
|
+
"version": "1.3.82",
|
|
3
3
|
"commands": {
|
|
4
4
|
"branch": {
|
|
5
5
|
"id": "branch",
|
|
@@ -9388,6 +9388,13 @@
|
|
|
9388
9388
|
"description": "OPTIONAL: Include clusters that were never fully created.",
|
|
9389
9389
|
"allowNo": false
|
|
9390
9390
|
},
|
|
9391
|
+
"local": {
|
|
9392
|
+
"name": "local",
|
|
9393
|
+
"type": "boolean",
|
|
9394
|
+
"char": "l",
|
|
9395
|
+
"description": "OPTIONAL: Include only clusters that reside locally on this machine.",
|
|
9396
|
+
"allowNo": false
|
|
9397
|
+
},
|
|
9391
9398
|
"silent": {
|
|
9392
9399
|
"name": "silent",
|
|
9393
9400
|
"type": "boolean",
|
package/package.json
CHANGED