@codiac.io/codiac-cli 1.3.38 → 1.3.40

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.
Files changed (64) hide show
  1. package/README.md +1 -1
  2. package/dist/apis/codiac-relay/gen/client.d.ts +4 -4
  3. package/dist/apis/codiac-relay/gen/client.js +2 -2
  4. package/dist/apis/codiac-relay/gen/client.js.map +1 -1
  5. package/dist/apis/codiac-relay/gen/contracts.d.ts +19 -0
  6. package/dist/apis/codiac-relay/gen/contracts.js.map +1 -1
  7. package/dist/apis/nats/nats-client.d.ts +7 -2
  8. package/dist/apis/nats/nats-client.js +33 -13
  9. package/dist/apis/nats/nats-client.js.map +1 -1
  10. package/dist/command-base-enterprise.js +1 -1
  11. package/dist/command-base-enterprise.js.map +1 -1
  12. package/dist/commands/asset/deploy.js +5 -4
  13. package/dist/commands/asset/deploy.js.map +1 -1
  14. package/dist/commands/asset/view.js +1 -1
  15. package/dist/commands/asset/view.js.map +1 -1
  16. package/dist/commands/cabinet/create.js +1 -1
  17. package/dist/commands/cabinet/create.js.map +1 -1
  18. package/dist/commands/csp/login.js +7 -2
  19. package/dist/commands/csp/login.js.map +1 -1
  20. package/dist/commands/deploy.js +4 -3
  21. package/dist/commands/deploy.js.map +1 -1
  22. package/dist/commands/filestore/capture.js +7 -7
  23. package/dist/commands/filestore/capture.js.map +1 -1
  24. package/dist/commands/noc/cluster/create.js +5 -1
  25. package/dist/commands/noc/cluster/create.js.map +1 -1
  26. package/dist/commands/noc/cluster/deinit.js +9 -7
  27. package/dist/commands/noc/cluster/deinit.js.map +1 -1
  28. package/dist/commands/noc/cluster/destroy.js +8 -6
  29. package/dist/commands/noc/cluster/destroy.js.map +1 -1
  30. package/dist/commands/noc/cluster/grant.js +1 -1
  31. package/dist/commands/noc/cluster/grant.js.map +1 -1
  32. package/dist/commands/noc/cluster/init.js +8 -6
  33. package/dist/commands/noc/cluster/init.js.map +1 -1
  34. package/dist/commands/noc/cluster/recreate.js +2 -2
  35. package/dist/commands/noc/cluster/recreate.js.map +1 -1
  36. package/dist/commands/secretStore/capture.js +17 -1
  37. package/dist/commands/secretStore/capture.js.map +1 -1
  38. package/dist/relay/relay-container.d.ts +1 -0
  39. package/dist/relay/relay-container.js +49 -19
  40. package/dist/relay/relay-container.js.map +1 -1
  41. package/dist/uilogic/cloud-provider-contextualizer.d.ts +9 -1
  42. package/dist/uilogic/cloud-provider-contextualizer.js +66 -27
  43. package/dist/uilogic/cloud-provider-contextualizer.js.map +1 -1
  44. package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.d.ts +4 -4
  45. package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js +56 -34
  46. package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.js.map +1 -1
  47. package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.d.ts +2 -1
  48. package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js +9 -2
  49. package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js.map +1 -1
  50. package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.d.ts +8 -0
  51. package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js +40 -31
  52. package/dist/uilogic/cloud-resource-configurators/azure-resource-configurator.js.map +1 -1
  53. package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.d.ts +5 -4
  54. package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js +13 -6
  55. package/dist/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js.map +1 -1
  56. package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.d.ts +5 -4
  57. package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js +20 -11
  58. package/dist/uilogic/cloud-resource-configurators/helm-resource-configurator.js.map +1 -1
  59. package/dist/uilogic/i-login-configurator.d.ts +2 -1
  60. package/dist/uilogic/i-registry-configurator.d.ts +1 -1
  61. package/dist/uilogic/image-registry-contextualizer.js +5 -7
  62. package/dist/uilogic/image-registry-contextualizer.js.map +1 -1
  63. package/oclif.manifest.json +1 -1
  64. package/package.json +1 -1
@@ -6,15 +6,15 @@ const inversify_1 = require("inversify");
6
6
  const codiac_common_1 = require("@codiac.io/codiac-common");
7
7
  const codiac_domain_1 = require("@codiac.io/codiac-domain");
8
8
  const image_registry_1 = require("@codiac.io/codiac-domain/image-registry");
9
- const codiac_api_1 = require("../../apis/codiac-api");
10
9
  const codiac_relay_1 = require("../../apis/codiac-relay");
11
10
  const INTERFACES_CLI_1 = require("../../ops/INTERFACES_CLI");
11
+ const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
12
12
  /** Walks the user through the selection of an existing
13
13
  * or the declaration of a new image registry.
14
14
  */
15
15
  let DockerHubResourceConfigurator = class DockerHubResourceConfigurator {
16
- constructor(_codiacApi, relayClient, _ui, _styler, logger) {
17
- this._codiacApi = _codiacApi;
16
+ constructor(codiacUser, relayClient, _ui, _styler, logger) {
17
+ this.codiacUser = codiacUser;
18
18
  this.relayClient = relayClient;
19
19
  this._ui = _ui;
20
20
  this._styler = _styler;
@@ -79,7 +79,14 @@ let DockerHubResourceConfigurator = class DockerHubResourceConfigurator {
79
79
  if (isAuthed)
80
80
  this._ui.userMessage(`Logged into ${this._styler.hilite(this.cloudProvider)} as [${this._styler.hilite(userName !== null && userName !== void 0 ? userName : "token")}]`);
81
81
  // let subxId = await this.promptForSubscriptionId(userName, providerSubscriptionId);
82
- return [isAuthed, userName];
82
+ let cspUser = {
83
+ tenantCode: this.codiacUser.tenantCode,
84
+ provider: this.cloudProvider,
85
+ username: userName,
86
+ // subscriptionId: undefined, // Not yet applicable yet for dockerHub client
87
+ created: new Date(Date.now())
88
+ };
89
+ return [isAuthed, cspUser];
83
90
  }
84
91
  catch (err) {
85
92
  throw err;
@@ -94,12 +101,12 @@ let DockerHubResourceConfigurator = class DockerHubResourceConfigurator {
94
101
  };
95
102
  DockerHubResourceConfigurator = tslib_1.__decorate([
96
103
  (0, inversify_1.injectable)(),
97
- tslib_1.__param(0, (0, inversify_1.inject)(codiac_api_1.CodiacClient)),
104
+ tslib_1.__param(0, (0, inversify_1.inject)(codiac_ops_common_1.UserNameTenantCode)),
98
105
  tslib_1.__param(1, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
99
106
  tslib_1.__param(2, (0, inversify_1.inject)(INTERFACES_CLI_1.INTERFACES_CLI.IUserInputProvider)),
100
107
  tslib_1.__param(3, (0, inversify_1.inject)(INTERFACES_CLI_1.INTERFACES_CLI.IOutputStyler)),
101
108
  tslib_1.__param(4, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
102
- tslib_1.__metadata("design:paramtypes", [codiac_api_1.CodiacClient,
109
+ tslib_1.__metadata("design:paramtypes", [codiac_ops_common_1.UserNameTenantCode,
103
110
  codiac_relay_1.RelayClient, Object, Object, Object])
104
111
  ], DockerHubResourceConfigurator);
105
112
  exports.DockerHubResourceConfigurator = DockerHubResourceConfigurator;
@@ -1 +1 @@
1
- {"version":3,"file":"docker-hub-resource-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"docker-hub-resource-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.ts"],"names":[],"mappings":"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"}
@@ -1,21 +1,22 @@
1
- import { CodiacClient } from "../../apis/codiac-api";
2
1
  import { IBetterLogger } from "@codiac.io/codiac-common";
3
2
  import { CloudProviderEnum, ImageRegistry } from "@codiac.io/codiac-domain";
3
+ import { UserNameTenantCode } from "@codiac.io/codiac-ops-common";
4
4
  import { IRegistryConfigurator } from "../i-registry-configurator";
5
+ import { CloudProviderUser } from "../../apis/codiac-relay/contracts";
5
6
  import { IOutputStyler, IUserInputProvider } from "../../ops";
6
7
  import { RelayClient } from "../../apis/codiac-relay";
7
8
  /** Walks the user through the selection of an existing
8
9
  * or the declaration of a new image registry.
9
10
  */
10
11
  export declare class HelmResourceConfigurator implements IRegistryConfigurator {
11
- private _codiacApi;
12
+ private codiacUser;
12
13
  private relayClient;
13
14
  private _ui;
14
15
  private _styler;
15
16
  private logger;
16
- constructor(_codiacApi: CodiacClient, relayClient: RelayClient, _ui: IUserInputProvider, _styler: IOutputStyler, logger: IBetterLogger);
17
+ constructor(codiacUser: UserNameTenantCode, relayClient: RelayClient, _ui: IUserInputProvider, _styler: IOutputStyler, logger: IBetterLogger);
17
18
  readonly cloudProvider = CloudProviderEnum["artifactHub"];
18
19
  captureImageRegistry(): Promise<ImageRegistry>;
19
- promptToLogin(providerSubscriptionId?: string, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string): Promise<[boolean, string]>;
20
+ promptToLogin(providerSubscriptionId?: string, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string): Promise<[boolean, CloudProviderUser]>;
20
21
  promptToLogout(): Promise<[boolean, string]>;
21
22
  }
@@ -2,11 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.HelmResourceConfigurator = void 0;
4
4
  const tslib_1 = require("tslib");
5
- // import { CodiacClient } from "@codiac.io/codiac-api-client";
6
- const codiac_api_1 = require("../../apis/codiac-api");
5
+ const inversify_1 = require("inversify");
7
6
  const codiac_common_1 = require("@codiac.io/codiac-common");
8
7
  const codiac_domain_1 = require("@codiac.io/codiac-domain");
9
- const inversify_1 = require("inversify");
8
+ const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
10
9
  const contracts_1 = require("../../apis/codiac-relay/contracts");
11
10
  const ops_1 = require("../../ops");
12
11
  const codiac_relay_1 = require("../../apis/codiac-relay");
@@ -14,8 +13,8 @@ const codiac_relay_1 = require("../../apis/codiac-relay");
14
13
  * or the declaration of a new image registry.
15
14
  */
16
15
  let HelmResourceConfigurator = class HelmResourceConfigurator {
17
- constructor(_codiacApi, relayClient, _ui, _styler, logger) {
18
- this._codiacApi = _codiacApi;
16
+ constructor(codiacUser, relayClient, _ui, _styler, logger) {
17
+ this.codiacUser = codiacUser;
19
18
  this.relayClient = relayClient;
20
19
  this._ui = _ui;
21
20
  this._styler = _styler;
@@ -51,10 +50,11 @@ let HelmResourceConfigurator = class HelmResourceConfigurator {
51
50
  *
52
51
  * ************************************************************************************/
53
52
  promptToLogin(providerSubscriptionId, suppressConfirmations, providedUserName, providedSecret) {
54
- var _a, _b;
53
+ var _a, _b, _c, _d;
55
54
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
56
55
  try {
57
56
  let isAuthed = false;
57
+ let cspUser = undefined;
58
58
  let userName = undefined;
59
59
  let secret = undefined;
60
60
  if (!suppressConfirmations) {
@@ -70,21 +70,30 @@ let HelmResourceConfigurator = class HelmResourceConfigurator {
70
70
  userName = providedUserName;
71
71
  secret = providedSecret;
72
72
  }
73
+ cspUser = {
74
+ tenantCode: this.codiacUser.tenantCode,
75
+ provider: this.cloudProvider,
76
+ username: userName,
77
+ subscriptionId: providerSubscriptionId,
78
+ created: new Date(Date.now())
79
+ };
73
80
  try {
74
81
  this._ui.startSpinner(`Authenticating with ${this.cloudProvider}...`);
75
82
  // let authResult = await this.relayClient.logIntoCloudProvider(this.cloudProvider, { Username: userName, Secret: secret });
76
83
  let authResult = yield this.relayClient.Call.csp_login({ providerCode: this.cloudProvider, username: userName, secret: secret });
77
- isAuthed = authResult !== undefined; // <-- because authenticate throws on failures. // authResult.success;
84
+ if ((_a = authResult.output) === null || _a === void 0 ? void 0 : _a.cspUser)
85
+ cspUser = (_b = authResult.output) === null || _b === void 0 ? void 0 : _b.cspUser;
86
+ isAuthed = authResult.success == true && authResult.output != undefined;
78
87
  this._ui.stopSpinner("Success!");
79
88
  }
80
89
  catch (err) {
81
- this.logger.debug(`Error authenticating with ${this.cloudProvider}: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : ""}`);
90
+ this.logger.debug(`Error authenticating with ${this.cloudProvider}: ${(_c = err.name) !== null && _c !== void 0 ? _c : ""} ${(_d = err.message) !== null && _d !== void 0 ? _d : ""}`);
82
91
  this._ui.stopSpinner("Failed.");
83
92
  }
84
93
  if (isAuthed)
85
94
  this._ui.userMessage(`Logged into ${this._styler.hilite(this.cloudProvider)} as [${this._styler.hilite(userName !== null && userName !== void 0 ? userName : "token")}]`);
86
95
  // let subxId = await this.promptForSubscriptionId(userName, providerSubscriptionId);
87
- return [isAuthed, userName];
96
+ return [isAuthed, cspUser];
88
97
  }
89
98
  catch (err) {
90
99
  throw err;
@@ -99,12 +108,12 @@ let HelmResourceConfigurator = class HelmResourceConfigurator {
99
108
  };
100
109
  HelmResourceConfigurator = tslib_1.__decorate([
101
110
  (0, inversify_1.injectable)(),
102
- tslib_1.__param(0, (0, inversify_1.inject)(codiac_api_1.CodiacClient)),
111
+ tslib_1.__param(0, (0, inversify_1.inject)(codiac_ops_common_1.UserNameTenantCode)),
103
112
  tslib_1.__param(1, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
104
113
  tslib_1.__param(2, (0, inversify_1.inject)(ops_1.INTERFACES_CLI.IUserInputProvider)),
105
114
  tslib_1.__param(3, (0, inversify_1.inject)(ops_1.INTERFACES_CLI.IOutputStyler)),
106
115
  tslib_1.__param(4, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
107
- tslib_1.__metadata("design:paramtypes", [codiac_api_1.CodiacClient,
116
+ tslib_1.__metadata("design:paramtypes", [codiac_ops_common_1.UserNameTenantCode,
108
117
  codiac_relay_1.RelayClient, Object, Object, Object])
109
118
  ], HelmResourceConfigurator);
110
119
  exports.HelmResourceConfigurator = HelmResourceConfigurator;
@@ -1 +1 @@
1
- {"version":3,"file":"helm-resource-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/helm-resource-configurator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helm-resource-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/helm-resource-configurator.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { CloudProviderEnum } from "@codiac.io/codiac-domain";
2
+ import { CloudProviderUser } from "../apis/codiac-relay/contracts";
2
3
  export interface ILoginConfigurator {
3
4
  get cloudProvider(): CloudProviderEnum;
4
- promptToLogin(providerSubscriptionId?: string, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string): Promise<[boolean, string]>;
5
+ promptToLogin(providerSubscriptionId?: string, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string): Promise<[boolean, CloudProviderUser]>;
5
6
  promptToLogout(): Promise<[boolean, string]>;
6
7
  }
@@ -2,5 +2,5 @@ import { CloudProviderEnum, ImageRegistry } from "../apis/codiac-api/contracts";
2
2
  /** A UI implementation for declaring an image registry. */
3
3
  export interface IRegistryConfigurator {
4
4
  get cloudProvider(): CloudProviderEnum;
5
- captureImageRegistry(): Promise<ImageRegistry>;
5
+ captureImageRegistry(subscriptionId?: string): Promise<ImageRegistry>;
6
6
  }
@@ -37,6 +37,7 @@ let ImageRegistryContextualizer = class ImageRegistryContextualizer {
37
37
  promptForRegistry(packageType, ioc, defaults, captureOnly = false) {
38
38
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
39
39
  return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
40
+ var _a;
40
41
  try {
41
42
  let registry;
42
43
  // TODO: Consider : if the defaults exists, show them the default and promptConfirm. If they confirm no, then initiate the sequence below...
@@ -45,7 +46,8 @@ let ImageRegistryContextualizer = class ImageRegistryContextualizer {
45
46
  registry = yield this.promptForExistingRegistry(packageType);
46
47
  }
47
48
  if (registry !== undefined) {
48
- yield this._uiCloudProvider.promptForCloudProviderCreds(ioc, registry.provider);
49
+ let providerSubscriptionId = (_a = registry.accountId) !== null && _a !== void 0 ? _a : registry.subscriptionId;
50
+ yield this._uiCloudProvider.promptForCloudProviderCreds(ioc, registry.provider, undefined, undefined, undefined, providerSubscriptionId);
49
51
  }
50
52
  else { // DECLARE NEW
51
53
  // 1. Select a cloud resource provider
@@ -57,15 +59,11 @@ let ImageRegistryContextualizer = class ImageRegistryContextualizer {
57
59
  let choices = pvdResult.output.map(x => x);
58
60
  let provider = yield this._uiCloudProvider.promptForCloudProvider(choices, defaults.provider);
59
61
  // 2. Authenticate with the cloud resource provider
60
- yield this._uiCloudProvider.promptForCloudProviderCreds(ioc, provider);
61
- // user/pass
62
- // ------------------------------------------------------------------------------------------
63
- // select tenant + subx
64
- // refreshToken?
62
+ const cspUser = yield this._uiCloudProvider.promptForCloudProviderCreds(ioc, provider);
65
63
  // 3. Select a registry
66
64
  let factory = new cloud_resource_configurator_factory_1.RegistryConfiguratorFactory(); //this._codiacApi, this._ui, this.logger);
67
65
  let regCfg = factory.create(provider, ioc);
68
- registry = yield regCfg.captureImageRegistry();
66
+ registry = yield regCfg.captureImageRegistry(cspUser.subscriptionId);
69
67
  }
70
68
  resolve(registry); //{ registry: registry, client: regClient })
71
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"image-registry-contextualizer.js","sourceRoot":"","sources":["../../src/uilogic/image-registry-contextualizer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"image-registry-contextualizer.js","sourceRoot":"","sources":["../../src/uilogic/image-registry-contextualizer.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.3.38",
2
+ "version": "1.3.40",
3
3
  "commands": {
4
4
  "branch": {
5
5
  "id": "branch",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@codiac.io/codiac-cli",
3
3
  "description": "Local command line interface for managing enterprise assets and environments.",
4
- "version": "1.3.38",
4
+ "version": "1.3.40",
5
5
  "author": "Codiac",
6
6
  "bin": {
7
7
  "codiac": "./bin/run",