changes after merge

Signed-off-by: Amber Torrise <[email protected]>
zowe · Jan 22, 2024 · 9de3a1d · 9de3a1d
1 parent 0b05a98
commit 9de3a1d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts b/packages/imperative/__tests__/__unit__/config/ConfigUtils.unit.test.ts
@@ -11,7 +11,7 @@
 
 import { ConfigUtils } from "../../../src/config/ConfigUtils";
 import { CredentialManagerFactory } from "../../../src/security";
-import { ImperativeConfig } from "../../../src/utilities";
+import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig";
 
 describe("Config Utils", () => {
     describe("coercePropValue", () => {

diff --git a/packages/imperative/src/cmd/CommandProcessor.ts b/packages/imperative/src/cmd/CommandProcessor.ts
@@ -14,39 +14,40 @@ import { CommandUtils } from "./utils/CommandUtils";
 import { Arguments } from "yargs";
 import { ICommandValidatorResponse } from "./doc/response/response/ICommandValidatorResponse";
 import { ICommandHandler } from "./doc/handler/ICommandHandler";
-import { couldNotInstantiateCommandHandler, unexpectedCommandError } from "./../messages";
+import { couldNotInstantiateCommandHandler, unexpectedCommandError } from "../messages";
 import { SharedOptions } from "./utils/SharedOptions";
-import { IImperativeError, ImperativeError } from "./../error";
-import { IProfileManagerFactory, ProfileUtils } from "./../profiles";
+import { IImperativeError, ImperativeError } from "../error";
+import { IProfileManagerFactory, ProfileUtils } from "../profiles";
 import { SyntaxValidator } from "./syntax/SyntaxValidator";
 import { CommandProfileLoader } from "./profiles/CommandProfileLoader";
 import { ICommandProfileTypeConfiguration } from "./doc/profiles/definition/ICommandProfileTypeConfiguration";
 import { IHelpGenerator } from "./help/doc/IHelpGenerator";
 import { ICommandPrepared } from "./doc/response/response/ICommandPrepared";
 import { CommandResponse } from "./response/CommandResponse";
 import { ICommandResponse } from "./doc/response/response/ICommandResponse";
-import { Logger, LoggerUtils } from "./../logger";
+import { Logger, LoggerUtils } from "../logger";
 import { IInvokeCommandParms } from "./doc/parms/IInvokeCommandParms";
 import { ICommandProcessorParms } from "./doc/processor/ICommandProcessorParms";
-import { ImperativeExpect } from "./../expect";
+import { ImperativeExpect } from "../expect";
 import { inspect } from "util";
-import { EnvFileUtils, ImperativeConfig, TextUtils } from "./../utilities";
+import { ImperativeConfig } from "../utilities/ImperativeConfig";
+import { TextUtils } from "../utilities/TextUtils";
+import { EnvFileUtils } from "../utilities/EnvFileUtils";
 import * as nodePath from "path";
 import * as os from "os";
 import * as stream from "stream";
 import { ICommandHandlerRequire } from "./doc/handler/ICommandHandlerRequire";
-import { IHandlerParameters } from "./../cmd";
+import { IHandlerParameters, IHandlerResponseApi } from "../cmd";
 import { ChainedHandlerService } from "./ChainedHandlerUtils";
-import { Constants } from "./../constants";
+import { Constants } from "../constants";
 import { ICommandArguments } from "./doc/args/ICommandArguments";
-import { CliUtils } from "./../utilities/CliUtils";
+import { CliUtils } from "../utilities/CliUtils";
 import { WebHelpManager } from "./help/WebHelpManager";
 import { ICommandProfile } from "./doc/profiles/definition/ICommandProfile";
-import { Config } from "./../config/Config";
-import { ConfigUtils } from "./../config/ConfigUtils";
-import { ConfigConstants } from "./../config/ConfigConstants";
-import { IDaemonContext } from "./../imperative/doc/IDaemonContext";
-import { IHandlerResponseApi } from "../..";
+import { Config } from "../config/Config";
+import { ConfigUtils } from "../config/ConfigUtils";
+import { ConfigConstants } from "../config/ConfigConstants";
+import { IDaemonContext } from "../imperative/doc/IDaemonContext";
 
 
 /**

diff --git a/packages/imperative/src/config/ConfigUtils.ts b/packages/imperative/src/config/ConfigUtils.ts
@@ -11,7 +11,7 @@
 
 import { CredentialManagerFactory } from "../security";
 import { ICommandArguments } from "../cmd";
-import { ImperativeConfig } from "../utilities/ImperativeConfig";
+import { ImperativeConfig } from "../utilities";
 import { ImperativeError } from "../error";
 
 export class ConfigUtils {
@@ -80,4 +80,4 @@ export class ConfigUtils {
             additionalDetails: details
         });
     }
-}
+}
diff --git a/packages/imperative/src/imperative/config/cmd/init/init.handler.ts b/packages/imperative/src/imperative/config/cmd/init/init.handler.ts
@@ -195,7 +195,7 @@ export default class InitHandler implements ICommandHandler {
             `Enter ${propDesc} ${ConfigConstants.SKIP_PROMPT}`, { hideText: property.secure });
 
         // coerce to correct type
-        if (propValue && propValue.trim().length > 0) { 
+        if (propValue && propValue.trim().length > 0) {
             return ConfigUtils.coercePropValue(propValue);
         }