@codiac.io/codiac-cli 1.3.10 → 1.3.12
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 +2 -2
- package/dist/apis/codiac-api/gen/contracts.d.ts +5 -0
- package/dist/apis/codiac-api/gen/contracts.js +7 -1
- package/dist/apis/codiac-api/gen/contracts.js.map +1 -1
- package/dist/codiac-constants.d.ts +3 -1
- package/dist/codiac-constants.js +3 -1
- package/dist/codiac-constants.js.map +1 -1
- package/dist/commands/asset/create.js +2 -2
- package/dist/commands/asset/create.js.map +1 -1
- package/dist/commands/asset/view.js +1 -1
- package/dist/commands/asset/view.js.map +1 -1
- package/dist/commands/cluster/connect.d.ts +0 -1
- package/dist/commands/cluster/connect.js +21 -25
- package/dist/commands/cluster/connect.js.map +1 -1
- package/dist/commands/imageRegistry/capture.js +1 -1
- package/dist/commands/imageRegistry/capture.js.map +1 -1
- package/dist/commands/imageRegistry/forget.js +2 -1
- package/dist/commands/imageRegistry/forget.js.map +1 -1
- package/dist/commands/imageRegistry/pullSecret/set.js +1 -1
- package/dist/commands/imageRegistry/pullSecret/set.js.map +1 -1
- package/dist/commands/imageRegistry/pullSecret/unset.js +4 -3
- package/dist/commands/imageRegistry/pullSecret/unset.js.map +1 -1
- package/dist/ops/k8s/k8s-utils.d.ts +11 -4
- package/dist/ops/k8s/k8s-utils.js +19 -7
- package/dist/ops/k8s/k8s-utils.js.map +1 -1
- package/dist/ops/k8s/kube-config-utils.d.ts +25 -0
- package/dist/ops/k8s/kube-config-utils.js +140 -0
- package/dist/ops/k8s/kube-config-utils.js.map +1 -0
- package/dist/uilogic/cloud-resource-configurator-factory.js +5 -0
- package/dist/uilogic/cloud-resource-configurator-factory.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.d.ts +7 -2
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js +67 -4
- package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js.map +1 -1
- package/dist/uilogic/image-registry-contextualizer.d.ts +4 -4
- package/dist/uilogic/image-registry-contextualizer.js +7 -7
- package/dist/uilogic/image-registry-contextualizer.js.map +1 -1
- package/oclif.manifest.json +2 -3
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/commands/cluster/connect.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/commands/cluster/connect.ts"],"names":[],"mappings":";;;AAEA,sCAAyC;AACzC,4BAA6B;AAC7B,mEAAiE;AACjE,6EAAuE;AACvE,uDAAmD;AAgBnD,MAAM,aAAa,GAAe,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;AAMzJ,MAAqB,cAAe,SAAQ,gDAAsC;IAAlF;;QAqBY,cAAS,GAAG,IAAI,CAAC;IA8K7B,CAAC;IA1KC,uEAAuE;IACvE,yBAAyB;IAEzB,IAAc,QAAQ;QACpB,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE;YACvC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAQ,CAAC,CAAC;SAChD;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAGD,uEAAuE;IAI7D,SAAS;QACjB,KAAK,CAAC,SAAS,EAAE,CAAC;QAClB,oBAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAGY,WAAW;;;YACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAEzD,IAAI,OAAO,GAA6B,EAAE,CAAC;YAE3C,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAEjD,kEAAkE;YAClE,2DAA2D;YAC3D,kEAAkE;YAElE,MAAM,eAAe,GACnB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,kCAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,MAAA,MAAA,SAAS,aAAT,SAAS,cAAT,SAAS,GAClD,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,kCAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,mCAChD,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,kCAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,mCAC5D,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,kCAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAE5D,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC;YAG5C,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;;KACjD;IAGD,2BAA2B;IAC3B,2DAA2D;IAC3D,+FAA+F;IAC/F,iDAAiD;IACjD,8JAA8J;IAC9J,IAAI;IAGS,uBAAuB,CAAC,OAAiC;;YAEpE,IAAI,OAAO,CAAC,OAAO,IAAI,SAAS,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAEzG,IAAI,SAAS,GAAoB;gBAC/B,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC;YAEF,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAGY,4BAA4B,CAAC,OAAiC,EAAE,YAAqB;;YAEhG,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YACzC,IAAI,QAA4B,CAAC;YACjC,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,EAAE;gBAClD,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;aACxB;iBAAM;gBACL,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;aACnE;YACD,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;YAEhC,2BAA2B;YAE3B,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACrD,CAAC;KAAA;IAGM,kBAAkB,CAAC,SAA0B,EAAE,GAAa;QAEjE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEpB,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE5B,OAAO,GAAG,CAAC;IACb,CAAC;IAGY,WAAW,CAAC,SAA0B;;YAEjD,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjF,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YACpE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,sDAAsD,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChK,mBAAmB;YAGnB,wCAAwC;YACxC,mCAAmC;YAGnC,+CAA+C;YAG/C,6DAA6D;YAG7D,8CAA8C;YAC9C,qBAAqB;YACrB,kHAAkH;YAClH,gHAAgH;YAChH,6CAA6C;YAC7C,kDAAkD;YAClD,4EAA4E;YAC5E,MAAM;YACN,iDAAiD;YAEjD,mGAAmG;YACnG,IAAI;YAGJ,OAAO;QACT,CAAC;KAAA;IAID,0FAA0F;IAE5E,YAAY;;;YACxB,IAAI;gBACF,+BAA+B;gBAC/B,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;gBAC5G,IAAI,WAAW,GAAG,MAAA,MAAA,UAAU,CAAC,MAAM,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAuB,CAAC,mCAAI,EAAE,CAAC;gBAC7E,WAAW,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAElD,OAAO,WAAW,CAAC;aACpB;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,GAAG,CAAC;aACX;;KACF;IAED,mDAAmD;IAC3C,QAAQ,CAAC,OAA6E;QAC5F,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,QAAQ,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;IACzI,CAAC;IAED;MACE;IACY,gBAAgB,CAAC,QAA8B,EAAE,YAAqB;;YAClF,IAAI,MAA0B,CAAC;YAC/B,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,IAAI,YAAY,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE;gBAC/D,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,oBAAoB,EAAE,oBAAoB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;aAC1H;YACD,IAAI,IAAI,KAAK,IAAI,EAAE;gBACjB,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAE,CAAC;aACvD;iBAAM;gBACL,IAAI,OAAO,GAAG,QAAQ;qBACnB,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnE,IAAI,YAAY,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,EAAE,4BAA4B,EAAE,OAAO,CAAC,CAAE,CAAC;gBACxG,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAE,CAAC;aACvD;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;;AA/LH,iCAmMC;AAjMQ,0BAAW,GAAG,+XAA+X,CAAA;AAC7Y,sBAAO,GAAG,EAAE,CAAC;AACb,uBAAQ,GAAG;IAChB,oDAAoD;CACrD,CAAA;AAEM,oBAAK,GAAG;IAEb,uCAAuC;IACvC,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,4GAA4G,EAAE,CAAC;IACtL,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,kHAAkH,EAAE,CAAC;IAC5L,WAAW,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,sGAAsG,EAAE,CAAC;IAClL,eAAe,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,ycAAyc,EAAE,CAAC;CAClhB,CAAA;AAEM,mBAAI,GAAG;IACZ,OAAO,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,0GAA0G,EAAE,CAAC;CAClJ,CAAC"}
|
|
@@ -95,7 +95,7 @@ class ImageRegistryCapture extends command_base_enterprise_1.CommandBaseEnterpri
|
|
|
95
95
|
if (found)
|
|
96
96
|
throw new Error(`Image registry [${partial.code}] already exists as [${found.type}, url: ${found.url}]`);
|
|
97
97
|
}
|
|
98
|
-
let registry = (yield this.uiRegistry.promptForRegistry(this.ioc, partial, true));
|
|
98
|
+
let registry = (yield this.uiRegistry.promptForRegistry(contracts_1.PackageTypeEnum.container, this.ioc, partial, true));
|
|
99
99
|
return registry;
|
|
100
100
|
}
|
|
101
101
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/commands/imageRegistry/capture.ts"],"names":[],"mappings":";;;AAAA,sCAAoC;AACpC,MAAM,YAAY,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;AAI7D,+
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/commands/imageRegistry/capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const autocomplete = require("inquirer-autocomplete-prompt");
|
|
6
|
+
const contracts_1 = require("../../apis/codiac-api/contracts");
|
|
6
7
|
const command_base_enterprise_1 = require("../../command-base-enterprise");
|
|
7
8
|
const prettify_1 = require("../../prettify");
|
|
8
9
|
const cloud_resource_configurator_factory_1 = require("../../uilogic/cloud-resource-configurator-factory");
|
|
@@ -96,7 +97,7 @@ class ImageRegistryForget extends command_base_enterprise_1.CommandBaseEnterpris
|
|
|
96
97
|
// NOTE: We are gating on "confirmed != undefined" because that means they asked to revise the values.
|
|
97
98
|
// console.clear();
|
|
98
99
|
// REGISTRY (we've already gated this method for registries.length > 0)
|
|
99
|
-
candidate = (yield this.uiRegistry.promptForExistingRegistry(false, registries));
|
|
100
|
+
candidate = (yield this.uiRegistry.promptForExistingRegistry(contracts_1.PackageTypeEnum.container, false, registries));
|
|
100
101
|
this._ui.userMessage((0, prettify_1.prettify)(candidate));
|
|
101
102
|
this._ui.userMessage(`You are about to remove the record for ${candidate.type} image registry ${this._styler.bold(this._styler.hilite(candidate.code))} [Tenant: ${this._userCntx.currentTenantCode}].`);
|
|
102
103
|
confirmed = yield this._ui.promptConfirm("confirm", "Continue?", false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forget.js","sourceRoot":"","sources":["../../../src/commands/imageRegistry/forget.ts"],"names":[],"mappings":";;;AAAA,sCAA4C;AAE5C,MAAM,YAAY,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"forget.js","sourceRoot":"","sources":["../../../src/commands/imageRegistry/forget.ts"],"names":[],"mappings":"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"}
|
|
@@ -144,7 +144,7 @@ class ImageRegistryPullSecretSet extends command_base_enterprise_1.CommandBaseEn
|
|
|
144
144
|
let selectedRegistry;
|
|
145
145
|
let keepRegistry = (partial.regCode === undefined) ? false : yield this._ui.promptConfirm("keepRegistry", `${this._styler.hilite(partial.regCode)} pull secret`);
|
|
146
146
|
if (!keepRegistry) {
|
|
147
|
-
selectedRegistry = (yield this.uiRegistry.promptForExistingRegistry(false, registries));
|
|
147
|
+
selectedRegistry = (yield this.uiRegistry.promptForExistingRegistry(contracts_1.PackageTypeEnum.container, false, registries));
|
|
148
148
|
partial.regCode = selectedRegistry.code;
|
|
149
149
|
}
|
|
150
150
|
// PRIMARY/SECONDARY
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../src/commands/imageRegistry/pullSecret/set.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../src/commands/imageRegistry/pullSecret/set.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const core_1 = require("@oclif/core");
|
|
5
5
|
const autocomplete = require("inquirer-autocomplete-prompt");
|
|
6
|
-
const contracts_1 = require("
|
|
6
|
+
const contracts_1 = require("../../../apis/codiac-api/contracts");
|
|
7
|
+
const contracts_2 = require("@codiac.io/codiac-common/contracts");
|
|
7
8
|
const command_base_enterprise_1 = require("../../../command-base-enterprise");
|
|
8
9
|
const cloud_resource_configurator_factory_1 = require("../../../uilogic/cloud-resource-configurator-factory");
|
|
9
10
|
const cloud_provider_contextualizer_1 = require("../../../uilogic/cloud-provider-contextualizer");
|
|
@@ -115,7 +116,7 @@ class ImageRegistryPullSecretUnset extends command_base_enterprise_1.CommandBase
|
|
|
115
116
|
while (keepRegistry === false) {
|
|
116
117
|
keepRegistry = (partial.regCode === undefined) ? false : yield this._ui.promptConfirm("keepRegistry", `${this._styler.hilite(partial.regCode)} pull secret`);
|
|
117
118
|
if (!keepRegistry) {
|
|
118
|
-
selectedRegistry = (yield this.uiRegistry.promptForExistingRegistry(false, registries));
|
|
119
|
+
selectedRegistry = (yield this.uiRegistry.promptForExistingRegistry(contracts_1.PackageTypeEnum.container, false, registries));
|
|
119
120
|
partial.regCode = selectedRegistry.code;
|
|
120
121
|
keepRegistry = true;
|
|
121
122
|
}
|
|
@@ -185,7 +186,7 @@ class ImageRegistryPullSecretUnset extends command_base_enterprise_1.CommandBase
|
|
|
185
186
|
id: registry.id,
|
|
186
187
|
operations: [
|
|
187
188
|
{
|
|
188
|
-
op:
|
|
189
|
+
op: contracts_2.patchOperationType.replace,
|
|
189
190
|
path: pullSecretField,
|
|
190
191
|
value: undefined
|
|
191
192
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unset.js","sourceRoot":"","sources":["../../../../src/commands/imageRegistry/pullSecret/unset.ts"],"names":[],"mappings":";;;AAAA,sCAA4C;AAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"unset.js","sourceRoot":"","sources":["../../../../src/commands/imageRegistry/pullSecret/unset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,20 @@
|
|
|
1
|
+
import { interfaces } from "inversify";
|
|
1
2
|
import * as k8s from "@kubernetes/client-node";
|
|
2
3
|
import { IBetterLogger } from "@codiac.io/codiac-common";
|
|
3
4
|
import { RelayClient } from "../../apis/codiac-relay";
|
|
4
5
|
import { AssetReplicaContext } from '../../relay/contracts';
|
|
6
|
+
import { KubeConfigRepo } from './kube-config-utils';
|
|
5
7
|
/** Shallow front-end-layer utility functions for connecting to a k8s cluster. */
|
|
6
|
-
export declare class K8sUtils {
|
|
8
|
+
export declare class K8sUtils extends KubeConfigRepo {
|
|
7
9
|
private relayClient;
|
|
8
|
-
|
|
9
|
-
constructor(relayClient: RelayClient, logger: IBetterLogger);
|
|
10
|
-
|
|
10
|
+
protected cache: k8s.KubeConfig;
|
|
11
|
+
constructor(relayClient: RelayClient, cache: k8s.KubeConfig, logger: IBetterLogger);
|
|
12
|
+
static bootstrap(ioc: interfaces.Container): void;
|
|
13
|
+
/** Requests the relay to connect to the Cloud Service Provider
|
|
14
|
+
* for the remote cluster
|
|
15
|
+
* and download the cluster connection data
|
|
16
|
+
* (aka the KubeConfig: cluster url, user, tokens, etc.). */
|
|
17
|
+
fetchKubeConfigForCluster(cluster: string): Promise<k8s.KubeConfig>;
|
|
11
18
|
getKubeConfig(context: AssetReplicaContext): Promise<k8s.KubeConfig>;
|
|
12
19
|
getK8sClient(context: AssetReplicaContext, kube?: k8s.KubeConfig | undefined): Promise<k8s.CoreV1Api>;
|
|
13
20
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var K8sUtils_1;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
exports.K8sUtils = void 0;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
@@ -8,13 +9,23 @@ const client_node_1 = require("@kubernetes/client-node");
|
|
|
8
9
|
const k8s = require("@kubernetes/client-node");
|
|
9
10
|
const codiac_common_1 = require("@codiac.io/codiac-common");
|
|
10
11
|
const codiac_relay_1 = require("../../apis/codiac-relay");
|
|
12
|
+
const kube_config_utils_1 = require("./kube-config-utils");
|
|
11
13
|
/** Shallow front-end-layer utility functions for connecting to a k8s cluster. */
|
|
12
|
-
let K8sUtils = class K8sUtils {
|
|
13
|
-
constructor(relayClient, logger) {
|
|
14
|
+
let K8sUtils = K8sUtils_1 = class K8sUtils extends kube_config_utils_1.KubeConfigRepo {
|
|
15
|
+
constructor(relayClient, cache, logger) {
|
|
16
|
+
super(cache, logger);
|
|
14
17
|
this.relayClient = relayClient;
|
|
15
|
-
this.
|
|
18
|
+
this.cache = cache;
|
|
16
19
|
}
|
|
17
|
-
|
|
20
|
+
static bootstrap(ioc) {
|
|
21
|
+
kube_config_utils_1.KubeConfigRepo.bootstrap(ioc);
|
|
22
|
+
ioc.bind(K8sUtils_1).toSelf();
|
|
23
|
+
}
|
|
24
|
+
/** Requests the relay to connect to the Cloud Service Provider
|
|
25
|
+
* for the remote cluster
|
|
26
|
+
* and download the cluster connection data
|
|
27
|
+
* (aka the KubeConfig: cluster url, user, tokens, etc.). */
|
|
28
|
+
fetchKubeConfigForCluster(cluster) {
|
|
18
29
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
30
|
// Retrieve cluster connection specs
|
|
20
31
|
let res = yield this.relayClient.Call.getClusterConnectionSpecs({ cluster: cluster });
|
|
@@ -60,11 +71,12 @@ let K8sUtils = class K8sUtils {
|
|
|
60
71
|
});
|
|
61
72
|
}
|
|
62
73
|
};
|
|
63
|
-
K8sUtils = tslib_1.__decorate([
|
|
74
|
+
K8sUtils = K8sUtils_1 = tslib_1.__decorate([
|
|
64
75
|
(0, inversify_1.injectable)(),
|
|
65
76
|
tslib_1.__param(0, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
|
|
66
|
-
tslib_1.__param(1, (0, inversify_1.inject)(
|
|
67
|
-
tslib_1.
|
|
77
|
+
tslib_1.__param(1, (0, inversify_1.inject)(k8s.KubeConfig)),
|
|
78
|
+
tslib_1.__param(2, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
|
|
79
|
+
tslib_1.__metadata("design:paramtypes", [codiac_relay_1.RelayClient, k8s.KubeConfig, Object])
|
|
68
80
|
], K8sUtils);
|
|
69
81
|
exports.K8sUtils = K8sUtils;
|
|
70
82
|
//# sourceMappingURL=k8s-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k8s-utils.js","sourceRoot":"","sources":["../../../src/ops/k8s/k8s-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"k8s-utils.js","sourceRoot":"","sources":["../../../src/ops/k8s/k8s-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { interfaces } from "inversify";
|
|
2
|
+
import * as k8s from "@kubernetes/client-node";
|
|
3
|
+
import { IBetterLogger } from "@codiac.io/codiac-common";
|
|
4
|
+
/** Reads from and writes to the local store of k8s cluster connections file (aka: the kube config).
|
|
5
|
+
* Maintains a current state to limit file system operations.
|
|
6
|
+
*
|
|
7
|
+
* Pure KubeConfig only, no codiac dependencies.
|
|
8
|
+
*
|
|
9
|
+
*
|
|
10
|
+
* TODO: Promote this to a shared lib for relay and cli
|
|
11
|
+
* */
|
|
12
|
+
export declare class KubeConfigRepo {
|
|
13
|
+
protected cache: k8s.KubeConfig;
|
|
14
|
+
protected logger: IBetterLogger;
|
|
15
|
+
constructor(cache: k8s.KubeConfig, logger: IBetterLogger);
|
|
16
|
+
static bootstrap(ioc: interfaces.Container): void;
|
|
17
|
+
/** Throws any exceptions. */
|
|
18
|
+
static getKubeConfigPath(): string;
|
|
19
|
+
get configPath(): string;
|
|
20
|
+
private __configPath;
|
|
21
|
+
protected getK8sContext(contextName: string, clusterName: string, k8sCfg: k8s.KubeConfig): k8s.Context;
|
|
22
|
+
/** Writes to the local .kube/config file. */
|
|
23
|
+
cacheWrite(contextName: string, k8sCfg: k8s.KubeConfig): Promise<void>;
|
|
24
|
+
private cacheRefresh;
|
|
25
|
+
}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var KubeConfigRepo_1;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.KubeConfigRepo = void 0;
|
|
5
|
+
const tslib_1 = require("tslib");
|
|
6
|
+
const _ = require("lodash");
|
|
7
|
+
const path = require("path");
|
|
8
|
+
const fs = require("fs");
|
|
9
|
+
const inversify_1 = require("inversify");
|
|
10
|
+
const k8s = require("@kubernetes/client-node");
|
|
11
|
+
const codiac_common_1 = require("@codiac.io/codiac-common");
|
|
12
|
+
const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
|
|
13
|
+
const codiac_constants_1 = require("../../codiac-constants");
|
|
14
|
+
/** Reads from and writes to the local store of k8s cluster connections file (aka: the kube config).
|
|
15
|
+
* Maintains a current state to limit file system operations.
|
|
16
|
+
*
|
|
17
|
+
* Pure KubeConfig only, no codiac dependencies.
|
|
18
|
+
*
|
|
19
|
+
*
|
|
20
|
+
* TODO: Promote this to a shared lib for relay and cli
|
|
21
|
+
* */
|
|
22
|
+
let KubeConfigRepo = KubeConfigRepo_1 = class KubeConfigRepo {
|
|
23
|
+
constructor(cache, logger) {
|
|
24
|
+
this.cache = cache;
|
|
25
|
+
this.logger = logger;
|
|
26
|
+
}
|
|
27
|
+
static bootstrap(ioc) {
|
|
28
|
+
ioc.bind(k8s.KubeConfig).toDynamicValue(ctx => {
|
|
29
|
+
let cfg = new k8s.KubeConfig();
|
|
30
|
+
let filePath = KubeConfigRepo_1.getKubeConfigPath();
|
|
31
|
+
if (fs.existsSync(filePath)) {
|
|
32
|
+
cfg.loadFromFile(filePath);
|
|
33
|
+
}
|
|
34
|
+
return cfg;
|
|
35
|
+
}).inSingletonScope();
|
|
36
|
+
ioc.bind(KubeConfigRepo_1).toSelf();
|
|
37
|
+
}
|
|
38
|
+
/** Throws any exceptions. */
|
|
39
|
+
static getKubeConfigPath() {
|
|
40
|
+
let targetFile = process.env[codiac_constants_1.CliConstants.LOCAL_KUBE_CONFIG_ENV_KEY];
|
|
41
|
+
if (!targetFile) {
|
|
42
|
+
let homeDir = "~/"; // path.posix.resolve("~/"); // NOTE: This tilde (~) may not be valid on a windows box.
|
|
43
|
+
targetFile = path.posix.join(codiac_ops_common_1.OpsUtils.resolveHomeDir(homeDir), codiac_constants_1.CliConstants.LOCAL_KUBE_CONFIG_PATH_NAME);
|
|
44
|
+
}
|
|
45
|
+
return targetFile;
|
|
46
|
+
}
|
|
47
|
+
get configPath() {
|
|
48
|
+
if (this.__configPath == undefined || _.isEmpty(this.__configPath)) {
|
|
49
|
+
this.__configPath = KubeConfigRepo_1.getKubeConfigPath();
|
|
50
|
+
}
|
|
51
|
+
return this.__configPath;
|
|
52
|
+
}
|
|
53
|
+
// ---------------------------------------------------------------------------------------------------------------------
|
|
54
|
+
//
|
|
55
|
+
// DUPLICATED FROM codiac-relay/src/ops/k8s-connector.ts
|
|
56
|
+
//
|
|
57
|
+
// ---------------------------------------------------------------------------------------------------------------------
|
|
58
|
+
getK8sContext(contextName, clusterName, k8sCfg) {
|
|
59
|
+
let cntx = k8sCfg.contexts.find(c => c.name === contextName);
|
|
60
|
+
if (cntx === undefined) {
|
|
61
|
+
// handling a very odd case where the context we just wrote wasnt found in the kubeconfig.
|
|
62
|
+
cntx = k8sCfg.contexts.find(c => c.cluster === clusterName);
|
|
63
|
+
if (cntx !== undefined) {
|
|
64
|
+
this.logger.warn(`Fetched k8sconfig, but unable to find context in it named [${contextName}]. Continuing with context [${cntx.name}], the first found for cluster [${clusterName}], context user [${cntx.user}]`);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
cntx = k8sCfg.contexts[0];
|
|
68
|
+
if (cntx.name !== contextName) {
|
|
69
|
+
this.logger.warn(`Fetched k8sconfig, unable to find context in it named [${contextName}]. Continuing with default context in the fetch [${cntx.name}] [cluster: ${cntx.cluster}], user: ${cntx.user}]`);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return cntx;
|
|
74
|
+
}
|
|
75
|
+
/** Writes to the local .kube/config file. */
|
|
76
|
+
cacheWrite(contextName, k8sCfg) {
|
|
77
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
78
|
+
// THIS TRY CATCH FIXES ASSET-STATUS FROM FAILING
|
|
79
|
+
try {
|
|
80
|
+
// ================GOTTA LOCK THIS - it's a singleton
|
|
81
|
+
yield this.cacheRefresh();
|
|
82
|
+
if (this.cache) {
|
|
83
|
+
// Gotta prevent dups (cluster and prob user too). Error we're getting: 'Duplicate cluster: codiac-cluster-02'
|
|
84
|
+
_.remove(this.cache.clusters, c => c.name === k8sCfg.clusters[0].name);
|
|
85
|
+
_.remove(this.cache.users, c => c.name === k8sCfg.users[0].name);
|
|
86
|
+
_.remove(this.cache.contexts, c => c.name === k8sCfg.contexts[0].name);
|
|
87
|
+
this.cache.mergeConfig(k8sCfg);
|
|
88
|
+
let json = this.cache.exportConfig();
|
|
89
|
+
let cacheFile = KubeConfigRepo_1.getKubeConfigPath();
|
|
90
|
+
if (!fs.existsSync(path.dirname(cacheFile))) {
|
|
91
|
+
yield fs.promises.mkdir(path.dirname(cacheFile), { recursive: true });
|
|
92
|
+
}
|
|
93
|
+
yield fs.promises.writeFile(cacheFile, json);
|
|
94
|
+
// THis is no good - it mixes object format with serialized format.
|
|
95
|
+
// let k8sEntity = {
|
|
96
|
+
// apiVersion: "v1",
|
|
97
|
+
// kind: "Config",
|
|
98
|
+
// preferences: {},
|
|
99
|
+
// ...this.cache
|
|
100
|
+
// };
|
|
101
|
+
// let k8sEntity = _.cloneDeep<any>(this.cache);
|
|
102
|
+
// k8sEntity.apiVersion = "v1";
|
|
103
|
+
// k8sEntity.kind = "Config";
|
|
104
|
+
// k8sEntity.preferences = {};
|
|
105
|
+
// let k8sEntityJson = this.cache.exportConfig(); // <-- this appears to be the only way to get the full k8s entity (with the "kind" and "version", etc), BUT this method drops the clusters. useless.
|
|
106
|
+
// let k8sEntity = JSON.parse(k8sEntityJson);
|
|
107
|
+
// let yamlDoc = yaml.stringify(k8sEntity);
|
|
108
|
+
// fs.writeFileSync(OpsUtils.resolveHomeDir(K8sConnector.KUBE_CONFIG_FILE_PATH), yamlDoc)
|
|
109
|
+
}
|
|
110
|
+
// RELEASE LOCK =================================
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
this.logger.error('cacheWrite method error', error.message);
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
cacheRefresh() {
|
|
118
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
119
|
+
try {
|
|
120
|
+
// ================GOTTA LOCK THIS - it's a singleton
|
|
121
|
+
if (fs.existsSync(this.configPath)) {
|
|
122
|
+
this.cache.loadFromFile(this.configPath);
|
|
123
|
+
}
|
|
124
|
+
// RELEASE LOCK =================================
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
catch (err) {
|
|
128
|
+
throw err;
|
|
129
|
+
}
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
KubeConfigRepo = KubeConfigRepo_1 = tslib_1.__decorate([
|
|
134
|
+
(0, inversify_1.injectable)(),
|
|
135
|
+
tslib_1.__param(0, (0, inversify_1.inject)(k8s.KubeConfig)),
|
|
136
|
+
tslib_1.__param(1, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
|
|
137
|
+
tslib_1.__metadata("design:paramtypes", [k8s.KubeConfig, Object])
|
|
138
|
+
], KubeConfigRepo);
|
|
139
|
+
exports.KubeConfigRepo = KubeConfigRepo;
|
|
140
|
+
//# sourceMappingURL=kube-config-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"kube-config-utils.js","sourceRoot":"","sources":["../../../src/ops/k8s/kube-config-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -142,6 +142,11 @@ let LoginConfiguratorFactory = LoginConfiguratorFactory_1 = class LoginConfigura
|
|
|
142
142
|
.to(docker_hub_resource_configurator_1.DockerHubResourceConfigurator)
|
|
143
143
|
.whenTargetNamed(codiac_domain_1.CloudProviderEnum.dockerHub);
|
|
144
144
|
}
|
|
145
|
+
if (!ioc.isBoundNamed(INTERFACES_CLI_ENTERPRISE.ILoginConfigurator, codiac_domain_1.CloudProviderEnum.artifactHub)) {
|
|
146
|
+
ioc.bind(INTERFACES_CLI_ENTERPRISE.ILoginConfigurator)
|
|
147
|
+
.to(helm_resource_configurator_1.HelmResourceConfigurator)
|
|
148
|
+
.whenTargetNamed(codiac_domain_1.CloudProviderEnum.artifactHub);
|
|
149
|
+
}
|
|
145
150
|
}
|
|
146
151
|
constructor() {
|
|
147
152
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-resource-configurator-factory.js","sourceRoot":"","sources":["../../src/uilogic/cloud-resource-configurator-factory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cloud-resource-configurator-factory.js","sourceRoot":"","sources":["../../src/uilogic/cloud-resource-configurator-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,20 @@ import { CodiacClient } from "../../apis/codiac-api";
|
|
|
2
2
|
import { IBetterLogger } from "@codiac.io/codiac-common";
|
|
3
3
|
import { CloudProviderEnum, ImageRegistry } from "@codiac.io/codiac-domain";
|
|
4
4
|
import { IRegistryConfigurator } from "../i-registry-configurator";
|
|
5
|
-
import { IUserInputProvider } from "../../ops";
|
|
5
|
+
import { IOutputStyler, IUserInputProvider } from "../../ops";
|
|
6
|
+
import { RelayClient } from "../../apis/codiac-relay";
|
|
6
7
|
/** Walks the user through the selection of an existing
|
|
7
8
|
* or the declaration of a new image registry.
|
|
8
9
|
*/
|
|
9
10
|
export declare class HelmResourceConfigurator implements IRegistryConfigurator {
|
|
10
11
|
private _codiacApi;
|
|
12
|
+
private relayClient;
|
|
11
13
|
private _ui;
|
|
14
|
+
private _styler;
|
|
12
15
|
private logger;
|
|
13
|
-
constructor(_codiacApi: CodiacClient, _ui: IUserInputProvider, logger: IBetterLogger);
|
|
16
|
+
constructor(_codiacApi: CodiacClient, relayClient: RelayClient, _ui: IUserInputProvider, _styler: IOutputStyler, logger: IBetterLogger);
|
|
14
17
|
readonly cloudProvider = CloudProviderEnum["artifactHub"];
|
|
15
18
|
captureImageRegistry(): Promise<ImageRegistry>;
|
|
19
|
+
promptToLogin(providerSubscriptionId?: string, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string): Promise<[boolean, string]>;
|
|
20
|
+
promptToLogout(): Promise<[boolean, string]>;
|
|
16
21
|
}
|