@codiac.io/codiac-cli 1.3.155 → 1.3.157
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/apis/codiac-api/gen/client.d.ts +1 -1
- package/dist/apis/codiac-api/gen/client.js.map +1 -1
- package/dist/apis/codiac-api-nats/common/token.d.ts +0 -4
- package/dist/apis/codiac-api-nats/common/token.js +5 -14
- package/dist/apis/codiac-api-nats/common/token.js.map +1 -1
- package/dist/apis/codiac-api-nats/gen/client.d.ts +1 -1
- package/dist/apis/codiac-api-nats/gen/client.js +5 -5
- package/dist/apis/codiac-api-nats/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay/gen/client.d.ts +6 -2
- package/dist/apis/codiac-relay/gen/client.js +13 -1
- package/dist/apis/codiac-relay/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay/gen/contracts/types.gen.d.ts +22 -0
- package/dist/apis/codiac-relay/gen/contracts/types.gen.js.map +1 -1
- package/dist/apis/codiac-relay/i-client.d.ts +2 -0
- package/dist/apis/codiac-relay-nats/common/token.d.ts +0 -4
- package/dist/apis/codiac-relay-nats/common/token.js +5 -14
- package/dist/apis/codiac-relay-nats/common/token.js.map +1 -1
- package/dist/apis/codiac-relay-nats/gen/client.d.ts +5 -1
- package/dist/apis/codiac-relay-nats/gen/client.js +18 -6
- package/dist/apis/codiac-relay-nats/gen/client.js.map +1 -1
- package/dist/apis/codiac-relay-nats/gen/contracts/types.gen.d.ts +29 -0
- package/dist/apis/codiac-relay-nats/gen/contracts/types.gen.js.map +1 -1
- package/dist/bootstrapper-for-api-clients.js +14 -8
- package/dist/bootstrapper-for-api-clients.js.map +1 -1
- package/dist/bootstrapper-for-auth-dmz-commands.js +2 -3
- package/dist/bootstrapper-for-auth-dmz-commands.js.map +1 -1
- package/dist/bootstrapper-for-codiac-cli.d.ts +7 -0
- package/dist/bootstrapper-for-codiac-cli.js +108 -1
- package/dist/bootstrapper-for-codiac-cli.js.map +1 -1
- package/dist/bootstrapper-for-enterprise-commands.js +16 -45
- package/dist/bootstrapper-for-enterprise-commands.js.map +1 -1
- package/dist/cli-common/command-base.d.ts +0 -8
- package/dist/cli-common/command-base.js +22 -22
- package/dist/cli-common/command-base.js.map +1 -1
- package/dist/codiac-constants.d.ts +3 -0
- package/dist/codiac-constants.js +3 -0
- package/dist/codiac-constants.js.map +1 -1
- package/dist/command-base-enterprise.js +12 -12
- package/dist/command-base-enterprise.js.map +1 -1
- package/dist/commands/asset/deploy.js +1 -0
- package/dist/commands/asset/deploy.js.map +1 -1
- package/dist/commands/config/import.d.ts +1 -0
- package/dist/commands/config/import.js +19 -3
- package/dist/commands/config/import.js.map +1 -1
- package/dist/commands/csp/creds/list.d.ts +30 -0
- package/dist/commands/csp/creds/list.js +120 -0
- package/dist/commands/csp/creds/list.js.map +1 -0
- package/dist/commands/csp/login.js +1 -1
- package/dist/commands/csp/login.js.map +1 -1
- package/dist/commands/login.js +1 -1
- package/dist/commands/login.js.map +1 -1
- package/dist/ops/entities/cli-config.d.ts +32 -17
- package/dist/ops/entities/cli-config.js +42 -17
- package/dist/ops/entities/cli-config.js.map +1 -1
- package/dist/ops/overlayer.d.ts +150 -0
- package/dist/ops/overlayer.js +194 -0
- package/dist/ops/overlayer.js.map +1 -0
- package/dist/relay/relay-container.d.ts +4 -1
- package/dist/relay/relay-container.js +19 -5
- package/dist/relay/relay-container.js.map +1 -1
- package/dist/sdk-adapters/artifact-hub/helm-resource-configurator.d.ts +2 -2
- package/dist/sdk-adapters/artifact-hub/helm-resource-configurator.js +20 -2
- package/dist/sdk-adapters/artifact-hub/helm-resource-configurator.js.map +1 -1
- package/dist/sdk-adapters/aws/aws-resource-configurator.d.ts +2 -2
- package/dist/sdk-adapters/aws/aws-resource-configurator.js +28 -10
- package/dist/sdk-adapters/aws/aws-resource-configurator.js.map +1 -1
- package/dist/sdk-adapters/azure/az-interactive-login-configurator.js +10 -0
- package/dist/sdk-adapters/azure/az-interactive-login-configurator.js.map +1 -1
- package/dist/sdk-adapters/docker-hub/docker-hub-resource-configurator.d.ts +2 -2
- package/dist/sdk-adapters/docker-hub/docker-hub-resource-configurator.js +20 -2
- package/dist/sdk-adapters/docker-hub/docker-hub-resource-configurator.js.map +1 -1
- package/dist/uilogic/cloud-resource-configurator-factory.js +3 -4
- package/dist/uilogic/cloud-resource-configurator-factory.js.map +1 -1
- package/dist/uilogic/type-safety-utils.d.ts +15 -7
- package/dist/uilogic/type-safety-utils.js +35 -7
- package/dist/uilogic/type-safety-utils.js.map +1 -1
- package/oclif.manifest.json +107 -3
- package/package.json +10 -10
|
@@ -2494,6 +2494,7 @@ export type CspLogoutInteractiveRequest = {
|
|
|
2494
2494
|
providerCode: CloudProviderEnum;
|
|
2495
2495
|
correlationId: string;
|
|
2496
2496
|
commChannel: CommChannelRef;
|
|
2497
|
+
accountRef?: IcspAccountFilter;
|
|
2497
2498
|
};
|
|
2498
2499
|
export type CspLogoutInteractiveResponse = {
|
|
2499
2500
|
correlationId: string;
|
|
@@ -2504,6 +2505,23 @@ export type CspLogoutInteractiveResponse = {
|
|
|
2504
2505
|
*/
|
|
2505
2506
|
cspUserName?: string;
|
|
2506
2507
|
};
|
|
2508
|
+
/**
|
|
2509
|
+
* Invokes the single request-response logout sequence for the given cloud service provider.
|
|
2510
|
+
*/
|
|
2511
|
+
export type CspLogoutRequest = {
|
|
2512
|
+
providerCode: CloudProviderEnum;
|
|
2513
|
+
accountRef?: IcspAccountFilter;
|
|
2514
|
+
};
|
|
2515
|
+
/**
|
|
2516
|
+
* Return contract from the single request-response logout sequence for the given cloud service provider.
|
|
2517
|
+
*/
|
|
2518
|
+
export type CspLogoutResponse = {
|
|
2519
|
+
tokensPurged: boolean;
|
|
2520
|
+
/**
|
|
2521
|
+
* Will be undefined if we have no tokens or credentials cached.
|
|
2522
|
+
*/
|
|
2523
|
+
cspUserName?: string;
|
|
2524
|
+
};
|
|
2507
2525
|
export type CspPrimaryCredsMeta = {
|
|
2508
2526
|
tenantCode: string;
|
|
2509
2527
|
provider: CloudProviderEnum;
|
|
@@ -5640,6 +5658,11 @@ export type GetAzureVnetsRequest = {
|
|
|
5640
5658
|
location: string;
|
|
5641
5659
|
subscriptionId: string;
|
|
5642
5660
|
};
|
|
5661
|
+
export type CspCredsListRequest = {
|
|
5662
|
+
providerCode?: CloudProviderEnum;
|
|
5663
|
+
providerSubscriptionId?: string;
|
|
5664
|
+
providerTenantId?: string;
|
|
5665
|
+
};
|
|
5643
5666
|
export type GetCloudProviderUserRequest = {
|
|
5644
5667
|
providerCode: CloudProviderEnum;
|
|
5645
5668
|
};
|
|
@@ -5788,6 +5811,12 @@ export type ICommandLineProbeAction = {
|
|
|
5788
5811
|
command: Array<string>;
|
|
5789
5812
|
actionType: ProbeActionTypesEnum;
|
|
5790
5813
|
};
|
|
5814
|
+
/** Filter to help identify/select authentication creds
|
|
5815
|
+
* within a given Cloud Service Provider (CSP). */
|
|
5816
|
+
export type IcspAccountFilter = {
|
|
5817
|
+
subscriptionId?: string;
|
|
5818
|
+
tenantId?: string;
|
|
5819
|
+
};
|
|
5791
5820
|
export type IcspPrimaryCredsMeta = {
|
|
5792
5821
|
username: string;
|
|
5793
5822
|
created: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.gen.js","sourceRoot":"","sources":["../../../../../src/apis/codiac-relay-nats/gen/contracts/types.gen.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.gen.js","sourceRoot":"","sources":["../../../../../src/apis/codiac-relay-nats/gen/contracts/types.gen.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,12 +11,14 @@ const type_safety_utils_1 = require("./uilogic/type-safety-utils");
|
|
|
11
11
|
const codiac_api_nats_1 = require("./apis/codiac-api-nats");
|
|
12
12
|
const codiac_relay_nats_1 = require("./apis/codiac-relay-nats");
|
|
13
13
|
const codiac_messaging_1 = require("@codiac.io/codiac-messaging");
|
|
14
|
+
const codiac_constants_1 = require("./codiac-constants");
|
|
14
15
|
class BootstrapperForApiClients {
|
|
15
16
|
static bootstrap(ioc, cmd) {
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
const useNats =
|
|
19
|
-
const localEntities =
|
|
17
|
+
// const apiClientKind: ApiClientKindEnum = (<any>cmd.localConfig)?.apiClientKind ?? cmd._cliCfg.apiClientKind ?? ApiClientKindEnum.nats;
|
|
18
|
+
// const useNats = Boolean(apiClientKind == ApiClientKindEnum.nats);
|
|
19
|
+
const useNats = type_safety_utils_1.TypeSafetyUtils.toBoolean(cmd._cliCfg.apiClientKind == entities_1.ApiClientKindEnum.nats);
|
|
20
|
+
// const localEntities = TypeSafetyUtils.toBoolean(/* TEMP HACK!! --> update this class... */(<any>cmd.localConfig)?.localEntities ?? cmd._cliCfg?.localEntities);
|
|
21
|
+
const localEntities = cmd._cliCfg.localEntities;
|
|
20
22
|
// Cant do it this way until we make ApiUserCreds.token nullable.
|
|
21
23
|
// ioc.bind<CodiacClientConfig>(CodiacClientConfig).toConstantValue({ apiBaseUrl: this.codiacApiUrl });
|
|
22
24
|
// ioc.bind(ApiUserCreds).toConstantValue(undefined); // <--- ILLEGAL!
|
|
@@ -32,8 +34,9 @@ class BootstrapperForApiClients {
|
|
|
32
34
|
if (useNats) {
|
|
33
35
|
// NATS
|
|
34
36
|
// Codiac Api
|
|
35
|
-
const givenNatsUrl =
|
|
36
|
-
|
|
37
|
+
// const givenNatsUrl = cmd.localConfig?.apiNatsUrl ?? cmd._cliCfg.codiacNatsUrl;
|
|
38
|
+
// const givenNatsUrl = cmd._cliCfg.codiacNatsUrl!;
|
|
39
|
+
codiac_api_nats_1.CodiacNatsClient.bootstrap(ioc, { baseUrl: cmd._cliCfg.codiacNatsUrl });
|
|
37
40
|
ioc.bind(codiac_api_nats_1.CodiacNatsClient).toDynamicValue((ctx) => {
|
|
38
41
|
var _a;
|
|
39
42
|
const connector = ctx.container.get(codiac_messaging_1.StreamingConstants.IStreamingConnector);
|
|
@@ -44,8 +47,11 @@ class BootstrapperForApiClients {
|
|
|
44
47
|
// Codiac Relay
|
|
45
48
|
codiac_relay_nats_1.RelayNatsClient.bootstrap(ioc, {
|
|
46
49
|
natsInstance: this.RELAY_NATS_INSTANCE,
|
|
47
|
-
|
|
48
|
-
|
|
50
|
+
baseUrl: cmd._cliCfg.useLocalRelay ? codiac_constants_1.CliConstants.LOCAL_RELAY_NATS_URL : cmd._cliCfg.codiacNatsUrl,
|
|
51
|
+
// requestTimeoutInMs: (<any>cmd.localConfig)?.natsRequestTimeoutInMs ?? (<any>cmd._cliCfg)?.natsRequestTimeoutInMs ?? RelayNatsClient.DEFAULTS.requestTimeoutInMs,
|
|
52
|
+
// connectTimeoutInMs: (<any>cmd.localConfig)?.natsConnectTimeoutInMs ?? (<any>cmd._cliCfg)?.natsConnectTimeoutInMs ?? RelayNatsClient.DEFAULTS.connectTimeoutInMs
|
|
53
|
+
requestTimeoutInMs: cmd._cliCfg.natsRequestTimeoutInMs,
|
|
54
|
+
connectTimeoutInMs: cmd._cliCfg.natsConnectTimeoutInMs
|
|
49
55
|
});
|
|
50
56
|
ioc.bind(codiac_relay_nats_1.RelayNatsClient).toDynamicValue((ctx) => {
|
|
51
57
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrapper-for-api-clients.js","sourceRoot":"","sources":["../src/bootstrapper-for-api-clients.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAE1B,kDAAqD;AACrD,sDAAkD;AAClD,uCAAsD;AACtD,6CAAuF;AACvF,uFAA2G;AAC3G,mEAA8D;AAC9D,4DAAkF;AAIlF,gEAAkF;AAClF,kEAAsF;
|
|
1
|
+
{"version":3,"file":"bootstrapper-for-api-clients.js","sourceRoot":"","sources":["../src/bootstrapper-for-api-clients.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ const uilogic_1 = require("./uilogic");
|
|
|
7
7
|
const bootstrapper_for_codiac_cli_1 = require("./bootstrapper-for-codiac-cli");
|
|
8
8
|
class BootstrapperForAuthDmzCommands {
|
|
9
9
|
static bootstrap(ioc, cmd) {
|
|
10
|
-
var _a, _b, _c;
|
|
11
10
|
if (this.isBootstrapped == true) {
|
|
12
11
|
return;
|
|
13
12
|
}
|
|
@@ -17,9 +16,9 @@ class BootstrapperForAuthDmzCommands {
|
|
|
17
16
|
// A: Because the TenantContextualizer will fire, which we dont want in this case
|
|
18
17
|
// bc it doesnt have a registration workflow in it (and shouldnt).
|
|
19
18
|
// This is just a prereq for IAuthClient...
|
|
20
|
-
const codiacApiUrl =
|
|
19
|
+
// const codiacApiUrl = cmd.localConfig?.apiUrl ?? cmd._cliCfg.codiacApiBaseUrl ?? CodiacRestClient.DEFAULT_API_URL;
|
|
21
20
|
codiac_api_1.CodiacRestClient.bootstrap(ioc);
|
|
22
|
-
ioc.bind(codiac_api_1.CodiacRestClient).toDynamicValue(() => codiac_api_1.CodiacRestClient.create(cmd.logger,
|
|
21
|
+
ioc.bind(codiac_api_1.CodiacRestClient).toDynamicValue(() => codiac_api_1.CodiacRestClient.create(cmd.logger, cmd._cliCfg.codiacApiBaseUrl));
|
|
23
22
|
// ioc.bind<ICodiacClient>(INTERFACES_CLI_ENTERPRISE.ICodiacClient).toDynamicValue(ctx => ctx.container.get(CodiacRestClient)); // Use the Codiac rest api client for this.
|
|
24
23
|
ioc.bind(uilogic_1.INTERFACES_CLI_ENTERPRISE.IAuthClient).toDynamicValue(ctx => ctx.container.get(codiac_api_1.CodiacRestClient)); // Use the Codiac rest api client for this.
|
|
25
24
|
this.isBootstrapped = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrapper-for-auth-dmz-commands.js","sourceRoot":"","sources":["../src/bootstrapper-for-auth-dmz-commands.ts"],"names":[],"mappings":";;;AAAA,4BAAyB;AAGzB,kDAAqD;AAGrD,uCAAsD;AACtD,+EAAyE;AAGzE,MAAa,8BAA8B;IAIlC,MAAM,CAAC,SAAS,CAAC,GAAyB,EAAE,GAAgB
|
|
1
|
+
{"version":3,"file":"bootstrapper-for-auth-dmz-commands.js","sourceRoot":"","sources":["../src/bootstrapper-for-auth-dmz-commands.ts"],"names":[],"mappings":";;;AAAA,4BAAyB;AAGzB,kDAAqD;AAGrD,uCAAsD;AACtD,+EAAyE;AAGzE,MAAa,8BAA8B;IAIlC,MAAM,CAAC,SAAS,CAAC,GAAyB,EAAE,GAAgB;QACjE,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE;YAC/B,OAAO;SACR;QAGD,sDAAwB,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE3D,+FAA+F;QAC/F,iGAAiG;QACjG,kFAAkF;QAClF,qEAAqE;QAErE,2CAA2C;QAC3C,oHAAoH;QACpH,6BAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAChC,GAAG,CAAC,IAAI,CAAmB,6BAAgB,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,6BAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACrI,4KAA4K;QAE5K,GAAG,CAAC,IAAI,CAAc,mCAAyB,CAAC,WAAW,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,6BAAgB,CAAgB,CAAC,CAAC,CAAE,2CAA2C;QAEpL,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,CAAC;;AA1BH,wEA2BC;AA1Be,6CAAc,GAAY,KAAK,CAAC"}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
import "reflect-metadata";
|
|
2
2
|
import { interfaces } from 'inversify';
|
|
3
3
|
import { Config } from '@oclif/core';
|
|
4
|
+
import { CliConfig } from "./ops/entities";
|
|
4
5
|
export declare class BootstrapperForCodiacCli {
|
|
5
6
|
protected static isBootstrapped: boolean;
|
|
6
7
|
/** (IDEMPOTENT) Initializes ioc (mutates it) with typical cli/codiac project entities. */
|
|
7
8
|
static bootstrap(ioc: interfaces.Container, oclifConfig: Config, requiresProjectScope: boolean): void;
|
|
9
|
+
static overlayWithLocalConfig(cliConfig: CliConfig, localProgramFolder: string): CliConfig;
|
|
10
|
+
/** Uses dotenv to load env variables from a file into the process.env.
|
|
11
|
+
* Throws on error, ignores empty pathnames.
|
|
12
|
+
*
|
|
13
|
+
*/
|
|
14
|
+
private static loadEnvFiles;
|
|
8
15
|
}
|
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BootstrapperForCodiacCli = void 0;
|
|
4
4
|
require("reflect-metadata");
|
|
5
5
|
const path = require("path");
|
|
6
|
+
const fs = require("fs");
|
|
7
|
+
const envparser = require("dotenv");
|
|
6
8
|
const guid_typescript_1 = require("guid-typescript");
|
|
7
9
|
const codiac_common_1 = require("@codiac.io/codiac-common");
|
|
8
10
|
const IBetterLogger_1 = require("@codiac.io/codiac-common/IBetterLogger");
|
|
@@ -18,11 +20,17 @@ const INTERFACES_CLI_1 = require("./ops/INTERFACES_CLI");
|
|
|
18
20
|
const codiac_constants_1 = require("./codiac-constants");
|
|
19
21
|
const relay_container_1 = require("./relay/relay-container");
|
|
20
22
|
const log4js_logger_1 = require("./log4js-logger");
|
|
23
|
+
const overlayUtils = require("./ops/overlayer");
|
|
24
|
+
const type_safety_utils_1 = require("./uilogic/type-safety-utils");
|
|
21
25
|
class BootstrapperForCodiacCli {
|
|
22
26
|
/** (IDEMPOTENT) Initializes ioc (mutates it) with typical cli/codiac project entities. */
|
|
23
27
|
static bootstrap(ioc, oclifConfig, requiresProjectScope) {
|
|
24
28
|
if (this.isBootstrapped != true) {
|
|
25
29
|
process.removeAllListeners('warning');
|
|
30
|
+
const envPath = path.posix.join(oclifConfig.root, ops_1.OpsConstants.PROJECT_USER_CONFIG_FOLDER_NAME, ".env");
|
|
31
|
+
if (fs.existsSync(envPath)) {
|
|
32
|
+
this.loadEnvFiles([envPath]);
|
|
33
|
+
}
|
|
26
34
|
const localProgramFolder = path.normalize(codiac_ops_common_1.OpsUtils.resolveHomeDir(path.posix.join("~", codiac_constants_1.CliConstants.LOCAL_CONFIG_FOLDER_NAME)));
|
|
27
35
|
ioc.bind(entities_1.CliEnviro).toDynamicValue(() => {
|
|
28
36
|
return new entities_1.CliEnviro(oclifConfig.configDir, localProgramFolder, oclifConfig.version, relay_container_1.DEFAULT_IMAGE_TAG);
|
|
@@ -30,7 +38,49 @@ class BootstrapperForCodiacCli {
|
|
|
30
38
|
ioc.bind(data_1.CliGlobalConfigRepo).toSelf(); // (() => new CliContextRepo(this.config.configDir, this._projectRoot));
|
|
31
39
|
ioc.bind(entities_1.CliConfig).toDynamicValue(ctxt => {
|
|
32
40
|
let cfgRepo = ctxt.container.get(data_1.CliGlobalConfigRepo);
|
|
33
|
-
|
|
41
|
+
// ---------------------------
|
|
42
|
+
// 0. Declare Defaults...
|
|
43
|
+
// ---------------------------
|
|
44
|
+
let cliConfig = entities_1.CliConfig.DEFAULTS;
|
|
45
|
+
// ---------------------------
|
|
46
|
+
// 1. Overlay with values in config file itself...
|
|
47
|
+
// ---------------------------
|
|
48
|
+
let valuesFromFile = cfgRepo.read_sync() || new entities_1.CliConfig();
|
|
49
|
+
cliConfig = type_safety_utils_1.TypeSafetyUtils.overlay(cliConfig, valuesFromFile, false);
|
|
50
|
+
// ---------------------------
|
|
51
|
+
// 2. Overlay with localConfig...
|
|
52
|
+
// (these are overrides from the install folder,
|
|
53
|
+
// for use in adjusting behaviors of the installed version)
|
|
54
|
+
// ---------------------------
|
|
55
|
+
cliConfig = this.overlayWithLocalConfig(cliConfig, localProgramFolder);
|
|
56
|
+
// ---------------------------
|
|
57
|
+
// 3. Overlay with ENV values...
|
|
58
|
+
// (these govern so that a bare-metal IDE instance
|
|
59
|
+
// can move and thrust independently from the installed version)
|
|
60
|
+
// ---------------------------
|
|
61
|
+
const mergeOptz = {
|
|
62
|
+
fromSource: {
|
|
63
|
+
sourceKeys: [],
|
|
64
|
+
targetObjectCase: overlayUtils.EnumCase.camelCase,
|
|
65
|
+
sourcePrefix: entities_1.CliConfig.ENV_PREFIX,
|
|
66
|
+
sourceHierarchyDelim: overlayUtils.Overlayer.ENV_HIERARCHY_DELIM
|
|
67
|
+
},
|
|
68
|
+
// fromTarget: {
|
|
69
|
+
// targetPropertyNames: [],
|
|
70
|
+
// sourceCase: overlayUtils.EnumCase.constantCase,
|
|
71
|
+
// sourcePrefix: CliConfig.ENV_PREFIX,
|
|
72
|
+
// sourceHierarchyDelim: overlayUtils.Overlayer.ENV_HIERARCHY_DELIM
|
|
73
|
+
// }
|
|
74
|
+
};
|
|
75
|
+
cliConfig = overlayUtils.Overlayer.overlay(cliConfig, process.env, mergeOptz);
|
|
76
|
+
// ---------------------------
|
|
77
|
+
// 4. Ensure typesafety on booleans...
|
|
78
|
+
// ---------------------------
|
|
79
|
+
cliConfig.addBranchNameToPrereleases = type_safety_utils_1.TypeSafetyUtils.toBoolean(cliConfig.addBranchNameToPrereleases);
|
|
80
|
+
cliConfig.localEntities = type_safety_utils_1.TypeSafetyUtils.toBoolean(cliConfig.localEntities);
|
|
81
|
+
cliConfig.skipRelayAutoStart = type_safety_utils_1.TypeSafetyUtils.toBoolean(cliConfig.skipRelayAutoStart);
|
|
82
|
+
cliConfig.useLocalRelay = type_safety_utils_1.TypeSafetyUtils.toBoolean(cliConfig.useLocalRelay);
|
|
83
|
+
return cliConfig;
|
|
34
84
|
}); // .inSingletonScope();
|
|
35
85
|
// PROJECT SCOPE (all nullables)
|
|
36
86
|
ioc.bind(entities_1.ProjectEnviro).toDynamicValue(() => {
|
|
@@ -95,6 +145,63 @@ class BootstrapperForCodiacCli {
|
|
|
95
145
|
this.isBootstrapped = true;
|
|
96
146
|
}
|
|
97
147
|
}
|
|
148
|
+
static overlayWithLocalConfig(cliConfig, localProgramFolder) {
|
|
149
|
+
// Load local config file
|
|
150
|
+
let localOverridesPathname = path.posix.join(localProgramFolder, codiac_constants_1.CliConstants.LOCAL_CONFIG_OVERRIDES_FILE_NAME);
|
|
151
|
+
let localConfigRaw = codiac_ops_common_1.JsonUtils.deserializeJsonFile(localOverridesPathname);
|
|
152
|
+
// REMAP
|
|
153
|
+
// localConfig properties have drifted
|
|
154
|
+
// and dont match the CliConfig class one-for-one,
|
|
155
|
+
// so we gotta fix it up before doing the overlay...
|
|
156
|
+
const localConfig = {
|
|
157
|
+
apiClientKind: localConfigRaw === null || localConfigRaw === void 0 ? void 0 : localConfigRaw.apiClientKind,
|
|
158
|
+
codiacApiBaseUrl: localConfigRaw === null || localConfigRaw === void 0 ? void 0 : localConfigRaw.apiUrl,
|
|
159
|
+
codiacNatsUrl: localConfigRaw === null || localConfigRaw === void 0 ? void 0 : localConfigRaw.apiNatsUrl,
|
|
160
|
+
localEntities: (localConfigRaw === null || localConfigRaw === void 0 ? void 0 : localConfigRaw.localEntities) ? type_safety_utils_1.TypeSafetyUtils.toBoolean(localConfigRaw === null || localConfigRaw === void 0 ? void 0 : localConfigRaw.localEntities) : undefined,
|
|
161
|
+
// authApiBaseUrl: localConfigRaw?.authApiUrl /* <-- NOT USED BY CLI */,
|
|
162
|
+
// : localConfigRaw?.relayPort /* <-- NOT USED BY CLI */,
|
|
163
|
+
// : localConfigRaw?.relayWebSocketPort /* <-- NOT USED BY CLI */
|
|
164
|
+
natsRequestTimeoutInMs: localConfigRaw === null || localConfigRaw === void 0 ? void 0 : localConfigRaw.natsRequestTimeoutInMs,
|
|
165
|
+
natsConnectTimeoutInMs: localConfigRaw === null || localConfigRaw === void 0 ? void 0 : localConfigRaw.natsConnectTimeoutInMs,
|
|
166
|
+
useLocalRelay: localConfigRaw === null || localConfigRaw === void 0 ? void 0 : localConfigRaw.useLocalRelay,
|
|
167
|
+
};
|
|
168
|
+
const modified = type_safety_utils_1.TypeSafetyUtils.overlay(cliConfig, localConfig);
|
|
169
|
+
return modified;
|
|
170
|
+
}
|
|
171
|
+
/** Uses dotenv to load env variables from a file into the process.env.
|
|
172
|
+
* Throws on error, ignores empty pathnames.
|
|
173
|
+
*
|
|
174
|
+
*/
|
|
175
|
+
static loadEnvFiles(envPathNames, ignoreErrors = false, logger) {
|
|
176
|
+
var _a;
|
|
177
|
+
if (envPathNames && envPathNames.length > 0) {
|
|
178
|
+
for (let rawPath of envPathNames) {
|
|
179
|
+
const envFqn = path.isAbsolute(rawPath) ? rawPath : path.join(process.cwd(), rawPath);
|
|
180
|
+
if (fs.existsSync(envFqn)) {
|
|
181
|
+
const result = envparser.config({ path: envFqn });
|
|
182
|
+
if (result.error) {
|
|
183
|
+
if (ignoreErrors === true) {
|
|
184
|
+
logger === null || logger === void 0 ? void 0 : logger.warn("Error loading env file: ".concat((_a = result.error.message) !== null && _a !== void 0 ? _a : "(no error message available)"));
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
throw result.error;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
else if (result.parsed) {
|
|
191
|
+
logger === null || logger === void 0 ? void 0 : logger.detail("Loaded ".concat(Object.keys(result.parsed).length.toString(), " env variables from [", envFqn, "]"));
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
if (ignoreErrors === true) {
|
|
196
|
+
logger === null || logger === void 0 ? void 0 : logger.warn("Error loading env file: ".concat("Invalid console argument: env file not found."));
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
throw new Error("Error loading env file: env file not found.");
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
}
|
|
98
205
|
}
|
|
99
206
|
exports.BootstrapperForCodiacCli = BootstrapperForCodiacCli;
|
|
100
207
|
BootstrapperForCodiacCli.isBootstrapped = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrapper-for-codiac-cli.js","sourceRoot":"","sources":["../src/bootstrapper-for-codiac-cli.ts"],"names":[],"mappings":";;;AAAA,4BAAyB;AACzB,6BAA6B;
|
|
1
|
+
{"version":3,"file":"bootstrapper-for-codiac-cli.js","sourceRoot":"","sources":["../src/bootstrapper-for-codiac-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,75 +3,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BootstrapperForEnterpriseCommands = void 0;
|
|
4
4
|
require("reflect-metadata");
|
|
5
5
|
const codiac_common_1 = require("@codiac.io/codiac-common");
|
|
6
|
+
const codiac_messaging_1 = require("@codiac.io/codiac-messaging");
|
|
6
7
|
const client_1 = require("@codiac.io/codiac-messaging/dist/nats/client");
|
|
7
|
-
// import { NatsClient } from "./apis/nats/nats-client";
|
|
8
8
|
const relay_container_1 = require("./relay/relay-container");
|
|
9
9
|
const uilogic_1 = require("./uilogic");
|
|
10
10
|
const entities_1 = require("./ops/entities");
|
|
11
|
-
const relay_websocket_client_1 = require("./relay/wsclient/relay-websocket-client");
|
|
12
11
|
const lrp_watcher_predef_1 = require("./uilogic/lrp-watcher-predef");
|
|
13
12
|
const rootmap_ui_utils_1 = require("./uilogic/rootmap-ui-utils");
|
|
14
13
|
const INTERFACES_CLI_1 = require("./ops/INTERFACES_CLI");
|
|
15
|
-
const type_safety_utils_1 = require("./uilogic/type-safety-utils");
|
|
16
14
|
const bootstrapper_for_codiac_cli_1 = require("./bootstrapper-for-codiac-cli");
|
|
17
15
|
const bootstrapper_for_api_clients_1 = require("./bootstrapper-for-api-clients");
|
|
16
|
+
const codiac_constants_1 = require("./codiac-constants");
|
|
18
17
|
class BootstrapperForEnterpriseCommands {
|
|
19
18
|
static bootstrap(ioc, cmd) {
|
|
20
|
-
var _a, _b, _c;
|
|
21
19
|
if (this.isBootstrapped == true) {
|
|
22
20
|
return;
|
|
23
21
|
}
|
|
24
22
|
cmd.requiresProjectScope = false;
|
|
25
23
|
bootstrapper_for_codiac_cli_1.BootstrapperForCodiacCli.bootstrap(ioc, cmd.config, cmd.requiresProjectScope);
|
|
26
24
|
bootstrapper_for_api_clients_1.BootstrapperForApiClients.bootstrap(ioc, cmd);
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
codiac_messaging_1.nats.NatsConfigurator.bootstrap(ioc, {
|
|
26
|
+
natsInstance: bootstrapper_for_api_clients_1.BootstrapperForApiClients.RELAY_NATS_INSTANCE,
|
|
27
|
+
connectorSettings: {
|
|
28
|
+
baseUrl: cmd._cliCfg.useLocalRelay ? codiac_constants_1.CliConstants.DEFAULT_RELAY_URL : cmd._cliCfg.codiacNatsUrl,
|
|
29
|
+
natsInstance: bootstrapper_for_api_clients_1.BootstrapperForApiClients.RELAY_NATS_INSTANCE
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
ioc.bind(INTERFACES_CLI_1.INTERFACES_CLI.IMessagingClient).to(client_1.NatsClient).whenTargetNamed("nats");
|
|
33
|
+
ioc.bind(INTERFACES_CLI_1.INTERFACES_CLI.IMessagingClient)
|
|
34
|
+
.toDynamicValue(ctx => ctx.container.getNamed(client_1.NatsClient, bootstrapper_for_api_clients_1.BootstrapperForApiClients.RELAY_NATS_INSTANCE))
|
|
35
|
+
.whenTargetIsDefault();
|
|
36
|
+
const useNats = Boolean(cmd._cliCfg.apiClientKind == entities_1.ApiClientKindEnum.nats);
|
|
29
37
|
ioc.bind(uilogic_1.INTERFACES_CLI_ENTERPRISE.IContainerManager).toDynamicValue(ctx => {
|
|
30
|
-
var _a
|
|
38
|
+
var _a;
|
|
31
39
|
let relayCtrSettings = {
|
|
32
40
|
healthCheckUrl: useNats ? "nats://localhost:4222" : "http://localhost:5799/heartbeat-json",
|
|
33
41
|
retryTimeout: undefined
|
|
34
42
|
};
|
|
35
|
-
let relayContainer = new relay_container_1.RelayContainer(ctx.container.get(INTERFACES_CLI_1.INTERFACES_CLI.IOutputStyler), ctx.container.get(entities_1.CliEnviro), ctx.container.get(codiac_common_1.INTERFACES.IBetterLogger), relayCtrSettings.healthCheckUrl, relayCtrSettings.retryTimeout, (_a = ctx.container.get(entities_1.ProjectEnviro)) === null || _a === void 0 ? void 0 : _a.projectRoot,
|
|
43
|
+
let relayContainer = new relay_container_1.RelayContainer(ctx.container.get(INTERFACES_CLI_1.INTERFACES_CLI.IOutputStyler), ctx.container.get(entities_1.CliEnviro), ctx.container.get(codiac_common_1.INTERFACES.IBetterLogger), relayCtrSettings.healthCheckUrl, relayCtrSettings.retryTimeout, (_a = ctx.container.get(entities_1.ProjectEnviro)) === null || _a === void 0 ? void 0 : _a.projectRoot, ctx.container.get(entities_1.CliConfig).localEntities);
|
|
36
44
|
return relayContainer;
|
|
37
45
|
});
|
|
38
|
-
// ioc.bind<ExtendedRelayClient>(ExtendedRelayClient).toDynamicValue(ctx => {
|
|
39
|
-
// // let apiRootUrl: string | undefined;
|
|
40
|
-
// let relayAuthToken: string | undefined;
|
|
41
|
-
// let relayClient = new ExtendedRelayClient(
|
|
42
|
-
// ctx.container,
|
|
43
|
-
// ctx.container.get(UserContext),
|
|
44
|
-
// ctx.container.get<IContainerManager>(INTERFACES_CLI_ENTERPRISE.IContainerManager),
|
|
45
|
-
// ctx.container.get<IOutputStyler>(INTERFACES_CLI.IOutputStyler),
|
|
46
|
-
// ctx.container.get<IBetterLogger>(INTERFACES.IBetterLogger),
|
|
47
|
-
// ctx.container.get<CodiacRestClient>(CodiacRestClient),
|
|
48
|
-
// this.codiacApiUrl /* Careful! This property relies on the rest of the bootstrapping to already be done */,
|
|
49
|
-
// relayAuthToken
|
|
50
|
-
// );
|
|
51
|
-
// return relayClient;
|
|
52
|
-
// });
|
|
53
|
-
// RelaySocketListener.bootstrap(ioc);
|
|
54
|
-
relay_websocket_client_1.RelayWebsocketClient.bootstrap(ioc);
|
|
55
|
-
// NatsClient.bootstrap(ioc, {});
|
|
56
|
-
const connectorSettings = { baseUrl: "nats://localhost:4222", natsInstance: bootstrapper_for_api_clients_1.BootstrapperForApiClients.RELAY_NATS_INSTANCE };
|
|
57
|
-
client_1.NatsClient.bootstrap(ioc, {}, connectorSettings, bootstrapper_for_api_clients_1.BootstrapperForApiClients.RELAY_NATS_INSTANCE);
|
|
58
|
-
// const connectorSettings: Partial<NatsConnectorSettings> = { baseUrl: "nats://localhost:4222" };
|
|
59
|
-
// NatsClient.bootstrap(ioc, {}, connectorSettings);
|
|
60
|
-
// ioc.bind(INTERFACES_CLI.IMessagingClient).to(RelayWebsocketClient).whenTargetNamed("websockets");
|
|
61
|
-
ioc.bind(INTERFACES_CLI_1.INTERFACES_CLI.IMessagingClient).to(client_1.NatsClient).whenTargetNamed("nats");
|
|
62
|
-
// ioc.bind(INTERFACES_CLI.IMessagingClient).to(NatsClient).whenTargetIsDefault();
|
|
63
|
-
// ioc.bind(INTERFACES_CLI.IMessagingClient).toDynamicValue(ctx => {
|
|
64
|
-
// const settings = ioc.get(NatsClientSettings);
|
|
65
|
-
// const connectorSettings = ioc.getNamed(NatsConnectorSettings, BootstrapperForApiClients.RELAY_NATS_INSTANCE);
|
|
66
|
-
// const connector = ioc.getNamed<NatsConnector>(StreamingConstants.IStreamingConnector, BootstrapperForApiClients.RELAY_NATS_INSTANCE);
|
|
67
|
-
// const logger = ioc.get<IBetterLogger>(INTERFACES.IBetterLogger);
|
|
68
|
-
// const creds = ioc.getNamed<TokenCreds | undefined>(TokenCreds, BootstrapperForApiClients.RELAY_NATS_INSTANCE);
|
|
69
|
-
// const client = new NatsClient(logger, settings, connectorSettings, connector, creds);
|
|
70
|
-
// return client;
|
|
71
|
-
// }).whenTargetIsDefault();
|
|
72
|
-
ioc.bind(INTERFACES_CLI_1.INTERFACES_CLI.IMessagingClient)
|
|
73
|
-
.toDynamicValue(ctx => ctx.container.getNamed(client_1.NatsClient, bootstrapper_for_api_clients_1.BootstrapperForApiClients.RELAY_NATS_INSTANCE))
|
|
74
|
-
.whenTargetIsDefault();
|
|
75
46
|
ioc.bind(lrp_watcher_predef_1.LrpWatcherPredef).toSelf();
|
|
76
47
|
ioc.bind(rootmap_ui_utils_1.RootMapUiUtils).toSelf();
|
|
77
48
|
this.isBootstrapped = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrapper-for-enterprise-commands.js","sourceRoot":"","sources":["../src/bootstrapper-for-enterprise-commands.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAE1B,4DAAqE;AAErE,
|
|
1
|
+
{"version":3,"file":"bootstrapper-for-enterprise-commands.js","sourceRoot":"","sources":["../src/bootstrapper-for-enterprise-commands.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAE1B,4DAAqE;AAErE,kEAAmD;AACnD,yEAA0E;AAC1E,6DAAyD;AAEzD,uCAAsD;AACtD,6CAAuF;AACvF,qEAAgE;AAChE,iEAA4D;AAC5D,yDAAsD;AAEtD,+EAAyE;AACzE,iFAA2E;AAC3E,yDAAkD;AAIlD,MAAa,iCAAiC;IAMrC,MAAM,CAAC,SAAS,CAAC,GAAyB,EAAE,GAA0B;QAC3E,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE;YAC/B,OAAO;SACR;QAID,GAAG,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACjC,sDAAwB,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAG9E,wDAAyB,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAE9C,uBAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE;YACnC,YAAY,EAAE,wDAAyB,CAAC,mBAAmB;YAC3D,iBAAiB,EAAE;gBACjB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,+BAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa;gBAC/F,YAAY,EAAE,wDAAyB,CAAC,mBAAmB;aAC5D;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,+BAAc,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,mBAAU,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACjF,GAAG,CAAC,IAAI,CAAC,+BAAc,CAAC,gBAAgB,CAAC;aACtC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAU,EAAE,wDAAyB,CAAC,mBAAmB,CAAC,CAAC;aACxG,mBAAmB,EAAE,CAAC;QAGzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,4BAAiB,CAAC,IAAI,CAAC,CAAC;QAE7E,GAAG,CAAC,IAAI,CAAoB,mCAAyB,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;;YAC5F,IAAI,gBAAgB,GAAG;gBACrB,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,sCAAsC;gBAC1F,YAAY,EAAE,SAAS;aACxB,CAAA;YACD,IAAI,cAAc,GAAG,IAAI,gCAAc,CACrC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAgB,+BAAc,CAAC,aAAa,CAAC,EAC9D,GAAG,CAAC,SAAS,CAAC,GAAG,CAAY,oBAAS,CAAC,EACvC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAgB,0BAAU,CAAC,aAAa,CAAC,EAC1D,gBAAgB,CAAC,cAAc,EAC/B,gBAAgB,CAAC,YAAY,EAC7B,MAAA,GAAG,CAAC,SAAS,CAAC,GAAG,CAA4B,wBAAa,CAAC,0CAAE,WAAW,EACxE,GAAG,CAAC,SAAS,CAAC,GAAG,CAAY,oBAAS,CAAC,CAAC,aAAa,CACtD,CAAC;YACF,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,IAAI,CAAC,qCAAgB,CAAC,CAAC,MAAM,EAAE,CAAC;QAEpC,GAAG,CAAC,IAAI,CAAC,iCAAc,CAAC,CAAC,MAAM,EAAE,CAAC;QAElC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,CAAC;;AA1DH,8EA4DC;AAzDe,gDAAc,GAAY,KAAK,CAAC"}
|
|
@@ -6,7 +6,6 @@ import { Command } from '@oclif/core';
|
|
|
6
6
|
import * as fs from 'fs';
|
|
7
7
|
import { exec as nodeExec } from 'child_process';
|
|
8
8
|
import { IBetterLogger } from '@codiac.io/codiac-common/IBetterLogger';
|
|
9
|
-
import { CodiacLocalConfig } from '@codiac.io/codiac-relay-contracts';
|
|
10
9
|
import { IUserInputProvider, IOutputStyler } from '../ops';
|
|
11
10
|
import { CliEnviro, CliConfig } from "../ops/entities";
|
|
12
11
|
import { CliGlobalConfigRepo } from "../ops/data";
|
|
@@ -74,13 +73,6 @@ export declare abstract class commandBase extends Command {
|
|
|
74
73
|
/** Deprecated: use ioc instead. This getter Lazyloads from ioc. */
|
|
75
74
|
protected get _styler(): IOutputStyler;
|
|
76
75
|
protected __styler: IOutputStyler | undefined;
|
|
77
|
-
/** Fully qualified path to the app config folder on the local machine. */
|
|
78
|
-
get localConfigPath(): string;
|
|
79
|
-
private __localConfigPath;
|
|
80
|
-
/** The Codiac Local config overrides (shared with the relay). */
|
|
81
|
-
get localConfig(): CodiacLocalConfig | undefined;
|
|
82
|
-
private __localConfig;
|
|
83
|
-
private __localConfigIsLoaded;
|
|
84
76
|
protected execAsync: typeof nodeExec.__promisify__;
|
|
85
77
|
protected copyAsync: typeof fs.copyFile.__promisify__;
|
|
86
78
|
abstract run(): Promise<void>;
|
|
@@ -3,14 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.commandBase = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
require("reflect-metadata");
|
|
6
|
-
const path = require("path");
|
|
7
6
|
const inversify_1 = require("inversify");
|
|
8
7
|
const core_1 = require("@oclif/core");
|
|
9
8
|
const nodeUtil = require("util");
|
|
10
9
|
const fs = require("fs");
|
|
11
10
|
const child_process_1 = require("child_process");
|
|
12
11
|
const codiac_common_1 = require("@codiac.io/codiac-common");
|
|
13
|
-
const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
|
|
14
12
|
const entities_1 = require("../ops/entities");
|
|
15
13
|
const data_1 = require("../ops/data");
|
|
16
14
|
const read_stdin_1 = require("../read-stdin");
|
|
@@ -18,7 +16,25 @@ const INTERFACES_CLI_1 = require("../ops/INTERFACES_CLI");
|
|
|
18
16
|
class commandBase extends core_1.Command {
|
|
19
17
|
constructor() {
|
|
20
18
|
super(...arguments);
|
|
21
|
-
|
|
19
|
+
// /** Fully qualified path to the app config folder on the local machine. */
|
|
20
|
+
// public get localConfigPath(): string {
|
|
21
|
+
// if (this.__localConfigPath === undefined) {
|
|
22
|
+
// this.__localConfigPath = this.cliEnviro.localProgramFolder;
|
|
23
|
+
// }
|
|
24
|
+
// return this.__localConfigPath;
|
|
25
|
+
// }
|
|
26
|
+
// private __localConfigPath: string | undefined;
|
|
27
|
+
// /** The Codiac Local config overrides (shared with the relay). */
|
|
28
|
+
// public get localConfig(): CodiacLocalConfig | undefined {
|
|
29
|
+
// if (this.__localConfigIsLoaded !== true) {
|
|
30
|
+
// let localOverridesPathname = path.posix.join(this.localConfigPath, "codiac-local.json");
|
|
31
|
+
// this.__localConfig = JsonUtils.deserializeJsonFile<CodiacLocalConfig>(localOverridesPathname)
|
|
32
|
+
// this.__localConfigIsLoaded = true;
|
|
33
|
+
// }
|
|
34
|
+
// return this.__localConfig;
|
|
35
|
+
// }
|
|
36
|
+
// private __localConfig: CodiacLocalConfig | undefined;
|
|
37
|
+
// private __localConfigIsLoaded: boolean = false;
|
|
22
38
|
this.execAsync = nodeUtil.promisify(child_process_1.exec); // antiquated nastiness
|
|
23
39
|
this.copyAsync = nodeUtil.promisify(fs.copyFile); // antiquated nastiness
|
|
24
40
|
}
|
|
@@ -100,22 +116,6 @@ class commandBase extends core_1.Command {
|
|
|
100
116
|
}
|
|
101
117
|
return this.__styler;
|
|
102
118
|
}
|
|
103
|
-
/** Fully qualified path to the app config folder on the local machine. */
|
|
104
|
-
get localConfigPath() {
|
|
105
|
-
if (this.__localConfigPath === undefined) {
|
|
106
|
-
this.__localConfigPath = this.cliEnviro.localProgramFolder;
|
|
107
|
-
}
|
|
108
|
-
return this.__localConfigPath;
|
|
109
|
-
}
|
|
110
|
-
/** The Codiac Local config overrides (shared with the relay). */
|
|
111
|
-
get localConfig() {
|
|
112
|
-
if (this.__localConfigIsLoaded !== true) {
|
|
113
|
-
let localOverridesPathname = path.posix.join(this.localConfigPath, "codiac-local.json");
|
|
114
|
-
this.__localConfig = codiac_ops_common_1.JsonUtils.deserializeJsonFile(localOverridesPathname);
|
|
115
|
-
this.__localConfigIsLoaded = true;
|
|
116
|
-
}
|
|
117
|
-
return this.__localConfig;
|
|
118
|
-
}
|
|
119
119
|
// async run(): Promise<void> {
|
|
120
120
|
// return new Promise<void>(async (resolve,reject) => {
|
|
121
121
|
// try {
|
|
@@ -137,15 +137,15 @@ class commandBase extends core_1.Command {
|
|
|
137
137
|
}
|
|
138
138
|
else {
|
|
139
139
|
if (err.stdout || err.stderr) {
|
|
140
|
-
this.logger.error(`Operation failed! ${(_b = err.name) !== null && _b !== void 0 ? _b : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : ""}`, { stdout: err.stdout, stderr: err.stderr, stack: err.stack });
|
|
140
|
+
this.logger.error(`Operation failed! ${(_b = err.name) !== null && _b !== void 0 ? _b : ""}${err.code ? " (".concat(err.code, ")") : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : ""}`, { stdout: err.stdout, stderr: err.stderr, stack: err.stack });
|
|
141
141
|
}
|
|
142
142
|
else {
|
|
143
|
-
this.logger.error(`Operation failed! ${(_d = err.name) !== null && _d !== void 0 ? _d : ""} ${(_e = err.message) !== null && _e !== void 0 ? _e : ""}`, err.stack);
|
|
143
|
+
this.logger.error(`Operation failed! ${(_d = err.name) !== null && _d !== void 0 ? _d : ""}${err.code ? " (".concat(err.code, ")") : ""} ${(_e = err.message) !== null && _e !== void 0 ? _e : ""}`, err.stack);
|
|
144
144
|
this._ui.userMessage(this._styler.colorCritical("Operation failed! ").concat((_f = err.message) !== null && _f !== void 0 ? _f : ""));
|
|
145
145
|
}
|
|
146
146
|
// need to output stderr for pipelines
|
|
147
147
|
if (!process.stdin.isTTY) {
|
|
148
|
-
(err === null || err === void 0 ? void 0 : err.message) ? process.stderr.write(`Operation failed! ${(_g = err.name) !== null && _g !== void 0 ? _g : ""} ${(_h = err.message) !== null && _h !== void 0 ? _h : ""}`) : process.stderr.write("Error, see logs for details");
|
|
148
|
+
(err === null || err === void 0 ? void 0 : err.message) ? process.stderr.write(`Operation failed! ${(_g = err.name) !== null && _g !== void 0 ? _g : ""}${err.code ? " (".concat(err.code.toString(), ")") : ""} ${(_h = err.message) !== null && _h !== void 0 ? _h : ""}`) : process.stderr.write("Error, see logs for details");
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
151
|
// this.exit(err.code ?? 1);
|