@codiac.io/codiac-cli 1.2.125 → 1.2.127

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 (52) hide show
  1. package/bin/run +1 -1
  2. package/lib/apis/codiac-relay/gen/client.d.ts +11 -1
  3. package/lib/apis/codiac-relay/gen/client.js +70 -0
  4. package/lib/apis/codiac-relay/gen/client.js.map +1 -1
  5. package/lib/apis/codiac-relay/gen/contracts.d.ts +76 -11
  6. package/lib/apis/codiac-relay/gen/contracts.js +22 -19
  7. package/lib/apis/codiac-relay/gen/contracts.js.map +1 -1
  8. package/lib/command-base-enterprise.d.ts +0 -3
  9. package/lib/command-base-enterprise.js +4 -10
  10. package/lib/command-base-enterprise.js.map +1 -1
  11. package/lib/commands/asset/create.js +2 -31
  12. package/lib/commands/asset/create.js.map +1 -1
  13. package/lib/commands/imageRegistry/capture.js +2 -4
  14. package/lib/commands/imageRegistry/capture.js.map +1 -1
  15. package/lib/commands/imageRegistry/forget.js +0 -1
  16. package/lib/commands/imageRegistry/forget.js.map +1 -1
  17. package/lib/commands/imageRegistry/pullSecret/set.js +0 -2
  18. package/lib/commands/imageRegistry/pullSecret/set.js.map +1 -1
  19. package/lib/commands/imageRegistry/pullSecret/unset.js +0 -2
  20. package/lib/commands/imageRegistry/pullSecret/unset.js.map +1 -1
  21. package/lib/commands/images/add.js +1 -2
  22. package/lib/commands/images/add.js.map +1 -1
  23. package/lib/commands/secretStore/forget.js +0 -3
  24. package/lib/commands/secretStore/forget.js.map +1 -1
  25. package/lib/relay/relay-container.js +1 -1
  26. package/lib/uilogic/cloud-resource-configurators/aws-resource-configurator.js +3 -2
  27. package/lib/uilogic/cloud-resource-configurators/aws-resource-configurator.js.map +1 -1
  28. package/lib/uilogic/cloud-resource-configurators/az-acr-cli-authenticator.d.ts +16 -0
  29. package/lib/uilogic/cloud-resource-configurators/az-acr-cli-authenticator.js +85 -0
  30. package/lib/uilogic/cloud-resource-configurators/az-acr-cli-authenticator.js.map +1 -0
  31. package/lib/uilogic/cloud-resource-configurators/azure-resource-configurator.js +1 -1
  32. package/lib/uilogic/cloud-resource-configurators/azure-resource-configurator.js.map +1 -1
  33. package/lib/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js +1 -1
  34. package/lib/uilogic/cloud-resource-configurators/docker-hub-resource-configurator.js.map +1 -1
  35. package/lib/uilogic/cloud-resource-configurators/helm-resource-configurator.js.map +1 -1
  36. package/lib/uilogic/cloud-resource-configurators/unsupported-resource-configurator.d.ts +6 -5
  37. package/lib/uilogic/cloud-resource-configurators/unsupported-resource-configurator.js +9 -8
  38. package/lib/uilogic/cloud-resource-configurators/unsupported-resource-configurator.js.map +1 -1
  39. package/lib/uilogic/enterprise-contextualizer.d.ts +4 -3
  40. package/lib/uilogic/enterprise-contextualizer.js +17 -14
  41. package/lib/uilogic/enterprise-contextualizer.js.map +1 -1
  42. package/lib/uilogic/image-configurator.d.ts +5 -13
  43. package/lib/uilogic/image-configurator.js +38 -64
  44. package/lib/uilogic/image-configurator.js.map +1 -1
  45. package/lib/uilogic/image-contextualizer.d.ts +6 -4
  46. package/lib/uilogic/image-contextualizer.js +11 -6
  47. package/lib/uilogic/image-contextualizer.js.map +1 -1
  48. package/lib/uilogic/image-registry-contextualizer.d.ts +5 -7
  49. package/lib/uilogic/image-registry-contextualizer.js +16 -10
  50. package/lib/uilogic/image-registry-contextualizer.js.map +1 -1
  51. package/oclif.manifest.json +1 -0
  52. package/package.json +2 -2
@@ -2,25 +2,28 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ImageContextualizer = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ const inversify_1 = require("inversify");
5
6
  const codiac_common_1 = require("@codiac.io/codiac-common");
6
7
  const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
7
- const inversify_1 = require("inversify");
8
8
  const codiac_cli_common_1 = require("@codiac.io/codiac-cli-common");
9
+ const codiac_relay_1 = require("../apis/codiac-relay");
9
10
  /** User interactions for selecting an image from a given container registry.
10
11
  */
11
12
  let ImageContextualizer = class ImageContextualizer {
12
- constructor(_ui, _styler, logger) {
13
+ constructor(_ui, _styler, relayClient, logger) {
13
14
  this._ui = _ui;
14
15
  this._styler = _styler;
16
+ this.relayClient = relayClient;
15
17
  this.logger = logger;
16
18
  }
17
- promptForImage(regClient, registry, defaults) {
19
+ promptForImage(registry, defaults) {
18
20
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
19
21
  return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
20
22
  var _a, _b;
21
23
  let img = Object.assign({ name: (_a = defaults.name) !== null && _a !== void 0 ? _a : "unnamed", registry: registry }, this.createAuditable());
22
24
  try {
23
25
  // if (img.registry.type === undefined) throw new Error(`You must specify a registry before prompting for an image.`);
26
+ // let regClient = this.clientFactory.createForRegistry(registry); // no need to authenticate - we just did that a few lines prior with the cloud pvd, and the same auth pvd should be injected along with its creds store client.
24
27
  let imageFullName; // = defaults.name;
25
28
  while (!imageFullName || imageFullName == "") {
26
29
  // TODO: lets only get into the fuzzy search if they decide to change their selection
@@ -29,7 +32,8 @@ let ImageContextualizer = class ImageContextualizer {
29
32
  var _c, _d, _e, _f;
30
33
  let output = [];
31
34
  try {
32
- let searchResult = yield regClient.search({ query: searchString !== null && searchString !== void 0 ? searchString : "*" });
35
+ // let searchResult = await regClient.search({ query: searchString ?? "*" });
36
+ let searchResult = yield this.relayClient.Call.searchRegistry({ registry: registry, searchString: searchString !== null && searchString !== void 0 ? searchString : "*" });
33
37
  if (searchResult.error) {
34
38
  output = [];
35
39
  throw searchResult.error;
@@ -78,8 +82,9 @@ ImageContextualizer = tslib_1.__decorate([
78
82
  (0, inversify_1.injectable)(),
79
83
  tslib_1.__param(0, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IUserInputProvider)),
80
84
  tslib_1.__param(1, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IOutputStyler)),
81
- tslib_1.__param(2, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
82
- tslib_1.__metadata("design:paramtypes", [Object, Object, Object])
85
+ tslib_1.__param(2, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
86
+ tslib_1.__param(3, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
87
+ tslib_1.__metadata("design:paramtypes", [Object, Object, codiac_relay_1.RelayClient, Object])
83
88
  ], ImageContextualizer);
84
89
  exports.ImageContextualizer = ImageContextualizer;
85
90
  //# sourceMappingURL=image-contextualizer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"image-contextualizer.js","sourceRoot":"","sources":["../../src/uilogic/image-contextualizer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"image-contextualizer.js","sourceRoot":"","sources":["../../src/uilogic/image-contextualizer.ts"],"names":[],"mappings":";;;;AAAA,yCAA+C;AAC/C,4DAAiF;AAEjF,oEAAiG;AACjG,oEAA+E;AAE/E,uDAAqE;AASrE;GACG;AAEI,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACqD,GAAuB,EAC5B,OAAsB,EACpC,WAA2B,EACjB,MAAqB;QAHZ,QAAG,GAAH,GAAG,CAAoB;QAC5B,YAAO,GAAP,OAAO,CAAe;QACpC,gBAAW,GAAX,WAAW,CAAgB;QACjB,WAAM,GAAN,MAAM,CAAe;IAGjE,CAAC;IAGY,cAAc,CAAC,QAAuB,EAAE,QAAwB;;YAC3E,OAAO,IAAI,OAAO,CAAQ,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;;gBAClD,IAAI,GAAG,mBACL,IAAI,EAAE,MAAA,QAAQ,CAAC,IAAI,mCAAI,SAAS,EAChC,QAAQ,EAAE,QAAQ,IACf,IAAI,CAAC,eAAe,EAAE,CAC1B,CAAC;gBACF,IAAI;oBAEF,sHAAsH;oBAEtH,mOAAmO;oBAEnO,IAAI,aAAiC,CAAC,CAAC,mBAAmB;oBAC1D,OAAO,CAAC,aAAa,IAAI,aAAa,IAAI,EAAE,EAAE;wBAE5C,qFAAqF;wBACrF,IAAI,OAAO,GAAG,CAAO,YAAiC,EAAE,EAAE;4BACxD,OAAO,IAAI,OAAO,CAAiB,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;;gCAC3D,IAAI,MAAM,GAAmB,EAAE,CAAC;gCAChC,IAAI;oCAEF,6EAA6E;oCAC7E,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,GAAG,EAAE,CAAC,CAAC;oCACzH,IAAI,YAAY,CAAC,KAAK,EAAE;wCACtB,MAAM,GAAG,EAAE,CAAC;wCACZ,MAAM,YAAY,CAAC,KAAK,CAAC;qCAC1B;yCAAM;wCACL,MAAM,GAAG,MAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC;qCAC1F;iCAEF;gCAAC,OAAO,GAAG,EAAE;oCACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE,IAAI,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;oCACvE,MAAM,GAAG,EAAE,CAAC;iCACb;wCAAS;oCACR,OAAO,CAAC,MAAM,CAAC,CAAA;iCAChB;4BACH,CAAC,CAAA,CAAC,CAAC;wBACL,CAAC,CAAA,CAAA;wBAED;4FACoE;wBACpE,IAAI,aAAa,GAAG,MAAA,QAAQ,CAAC,kBAAkB,mCAAI,KAAK,CAAC,CAAE,8DAA8D;wBAEzH,IAAI,aAAa,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;wBAC/E,aAAa,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,2CAA2C,EAAE,KAAK,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;wBAC/J,GAAG,CAAC,IAAI,GAAG,aAAa,CAAC;qBAC1B;iBAEF;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;iBAE5D;wBAAS;oBACR,OAAO,CAAC,GAAG,CAAC,CAAA;iBACb;YAEH,CAAC,CAAA,CAAC,CAAC;QAEL,CAAC;KAAA;IAGS,eAAe;QACvB,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACjC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,EAAE;SACf,CAAC;IACJ,CAAC;CAIF,CAAA;AApFY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IAGR,mBAAA,IAAA,kBAAM,EAAC,kCAAc,CAAC,kBAAkB,CAAC,CAAA;IACzC,mBAAA,IAAA,kBAAM,EAAC,kCAAc,CAAC,aAAa,CAAC,CAAA;IACpC,mBAAA,IAAA,kBAAM,EAAC,0BAAc,CAAC,CAAA;IACtB,mBAAA,IAAA,kBAAM,EAAC,0BAAU,CAAC,aAAa,CAAC,CAAA;6DADY,0BAAc;GAJlD,mBAAmB,CAoF/B;AApFY,kDAAmB"}
@@ -1,13 +1,10 @@
1
1
  import { CodiacClient } from "../apis/codiac-api";
2
2
  import { IBetterLogger } from "@codiac.io/codiac-common";
3
3
  import { ImageRegistry } from "../apis/codiac-api/contracts";
4
- import { IClientForImageRegistry, ImageRegistryClientsFactory, IUserInputProvider } from "@codiac.io/codiac-ops-common";
4
+ import { IUserInputProvider } from "@codiac.io/codiac-ops-common";
5
5
  import { interfaces } from "inversify";
6
6
  import { CloudProviderContextualizer } from "./cloud-provider-contextualizer";
7
- export type RegistryAndClient = {
8
- registry: ImageRegistry;
9
- client: IClientForImageRegistry;
10
- };
7
+ import { RelayClient } from "../apis/codiac-relay";
11
8
  /** Registry definition. */
12
9
  export type RegistryReference = Partial<ImageRegistry>;
13
10
  /**
@@ -16,15 +13,16 @@ export type RegistryReference = Partial<ImageRegistry>;
16
13
  export declare class ImageRegistryContextualizer {
17
14
  private _uiCloudProvider;
18
15
  private _codiacApi;
16
+ private relayClient;
19
17
  private _ui;
20
18
  private logger;
21
- constructor(_uiCloudProvider: CloudProviderContextualizer, _codiacApi: CodiacClient, _ui: IUserInputProvider, logger: IBetterLogger);
19
+ constructor(_uiCloudProvider: CloudProviderContextualizer, _codiacApi: CodiacClient, relayClient: RelayClient, _ui: IUserInputProvider, logger: IBetterLogger);
22
20
  /** Selection of an EITHER:
23
21
  * a) existing registry definition,
24
22
  * b) a selector for a built-in registry type,
25
23
  * c) manual entry of a registry url
26
24
  */
27
- promptForRegistry(ioc: interfaces.Container, clientFactory: ImageRegistryClientsFactory, defaults: RegistryReference, captureOnly?: boolean): Promise<RegistryAndClient>;
25
+ promptForRegistry(ioc: interfaces.Container, defaults: RegistryReference, captureOnly?: boolean): Promise<ImageRegistry>;
28
26
  /** Allows the user to OPTIONALLY select a registry that this tenant has already captured. */
29
27
  promptForExistingRegistry(includeOptionToCapture?: boolean, registries?: ImageRegistry[]): Promise<ImageRegistry | undefined>;
30
28
  }
@@ -10,13 +10,15 @@ const inversify_1 = require("inversify");
10
10
  const codiac_constants_1 = require("../codiac-constants");
11
11
  const cloud_provider_contextualizer_1 = require("./cloud-provider-contextualizer");
12
12
  const cloud_resource_configurator_factory_1 = require("./cloud-resource-configurator-factory");
13
+ const codiac_relay_1 = require("../apis/codiac-relay");
13
14
  /**
14
15
  *
15
16
  */
16
17
  let ImageRegistryContextualizer = class ImageRegistryContextualizer {
17
- constructor(_uiCloudProvider, _codiacApi, _ui, logger) {
18
+ constructor(_uiCloudProvider, _codiacApi, relayClient, _ui, logger) {
18
19
  this._uiCloudProvider = _uiCloudProvider;
19
20
  this._codiacApi = _codiacApi;
21
+ this.relayClient = relayClient;
20
22
  this._ui = _ui;
21
23
  this.logger = logger;
22
24
  }
@@ -32,13 +34,11 @@ let ImageRegistryContextualizer = class ImageRegistryContextualizer {
32
34
  * b) a selector for a built-in registry type,
33
35
  * c) manual entry of a registry url
34
36
  */
35
- promptForRegistry(ioc, clientFactory, defaults, captureOnly = false) {
37
+ promptForRegistry(ioc, defaults, captureOnly = false) {
36
38
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
37
39
  return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
38
- let output;
39
40
  try {
40
41
  let registry;
41
- let regClient;
42
42
  // TODO: Consider : if the defaults exists, show them the default and promptConfirm. If they confirm no, then initiate the sequence below...
43
43
  // SELECT EXISTING
44
44
  if (captureOnly !== true) {
@@ -49,7 +49,12 @@ let ImageRegistryContextualizer = class ImageRegistryContextualizer {
49
49
  }
50
50
  else { // DECLARE NEW
51
51
  // 1. Select a cloud resource provider
52
- let choices = clientFactory.getAllProviders();
52
+ let pvdResult = yield this.relayClient.Call.getRegistryProviders({});
53
+ if (pvdResult.error)
54
+ throw pvdResult.error;
55
+ if (pvdResult.output == undefined || pvdResult.output.length === 0)
56
+ throw new Error("There are currently no supported registry providers.");
57
+ let choices = pvdResult.output.map(x => x);
53
58
  let provider = yield this._uiCloudProvider.promptForCloudProvider(choices, defaults.provider);
54
59
  // 2. Authenticate with the cloud resource provider
55
60
  yield this._uiCloudProvider.promptForCloudProviderCreds(ioc, provider);
@@ -62,8 +67,7 @@ let ImageRegistryContextualizer = class ImageRegistryContextualizer {
62
67
  let regCfg = factory.create(provider, ioc);
63
68
  registry = yield regCfg.captureImageRegistry();
64
69
  }
65
- regClient = clientFactory.createForRegistry(registry); // no need to authenticate - we just did that a few lines prior with the cloud pvd, and the same auth pvd should be injected along with its creds store client.
66
- resolve({ registry: registry, client: regClient });
70
+ resolve(registry); //{ registry: registry, client: regClient })
67
71
  }
68
72
  catch (err) {
69
73
  this.logger.error(`${err.name} ${err.message}`, err.stack);
@@ -112,10 +116,12 @@ ImageRegistryContextualizer = tslib_1.__decorate([
112
116
  (0, inversify_1.injectable)(),
113
117
  tslib_1.__param(0, (0, inversify_1.inject)(cloud_provider_contextualizer_1.CloudProviderContextualizer)),
114
118
  tslib_1.__param(1, (0, inversify_1.inject)(codiac_api_1.CodiacClient)),
115
- tslib_1.__param(2, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IUserInputProvider)),
116
- tslib_1.__param(3, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
119
+ tslib_1.__param(2, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
120
+ tslib_1.__param(3, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IUserInputProvider)),
121
+ tslib_1.__param(4, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
117
122
  tslib_1.__metadata("design:paramtypes", [cloud_provider_contextualizer_1.CloudProviderContextualizer,
118
- codiac_api_1.CodiacClient, Object, Object])
123
+ codiac_api_1.CodiacClient,
124
+ codiac_relay_1.RelayClient, Object, Object])
119
125
  ], ImageRegistryContextualizer);
120
126
  exports.ImageRegistryContextualizer = ImageRegistryContextualizer;
121
127
  //# sourceMappingURL=image-registry-contextualizer.js.map
@@ -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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"}