tolerate errors from profiles.get()

Signed-off-by: Paul Cooper <[email protected]>

Author: pcoop

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -23,6 +23,9 @@ const DEFAULT_PARAMTERS: IHandlerParameters = {
     },
     profiles: {
         get: (type: string) => {
+            if (profileError === true) {
+              throw new Error("Profile Error");
+            }
             return { host: "testname", user: "testuser", password: "testpwd" };
         }
     } as any,
@@ -57,14 +60,15 @@ const DEFAULT_PARAMTERS: IHandlerParameters = {
 let createSpy = jest.spyOn(ZosmfSession, "createBasicZosmfSession").mockImplementation(() => ({}));
 let listSpy = jest.spyOn(List, "allMembers").mockImplementation(() => ({}));
 let submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() => ({}));
-
+let profileError = false;
 
 describe("BundleDeployer01", () => {
 
     beforeEach(() => {
         createSpy = jest.spyOn(ZosmfSession, "createBasicZosmfSession").mockImplementation(() => ({}));
         listSpy = jest.spyOn(List, "allMembers").mockImplementation(() => ( { val: "DFHDPLOY EYU9ABSI" }));
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() => ({}));
+        profileError = false;
     });
     afterEach(() => {
         jest.restoreAllMocks();
@@ -78,6 +82,12 @@ describe("BundleDeployer01", () => {
 
         expect(createSpy).toHaveBeenCalledTimes(1);
     });
+    it("should complain with error during profile load for deploy", async () => {
+        profileError = true;
+        await runDeployTestWithError();
+
+        expect(createSpy).toHaveBeenCalledTimes(0);
+    });
     it("should complain with missing zOSMF profile for undeploy", async () => {
         createSpy.mockImplementationOnce(() => { throw new Error( "Injected Create error" ); });
         await runUndeployTestWithError();

__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap

@@ -18,6 +18,8 @@ exports[`BundleDeployer01 should complain if status can't be determined 1`] = `"
 
 exports[`BundleDeployer01 should complain if status can't be determined 2`] = `"DFHDPLOY command completed for jobid UNKNOWN, but status cannot be determined."`;
 
+exports[`BundleDeployer01 should complain with error during profile load for deploy 1`] = `"Required parameter --zosmf-host is not set."`;
+
 exports[`BundleDeployer01 should complain with missing zOSMF profile for deploy 1`] = `"Injected Create error"`;
 
 exports[`BundleDeployer01 should complain with missing zOSMF profile for undeploy 1`] = `"Injected Create error"`;

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -25,6 +25,11 @@ const DEFAULT_PARAMTERS: IHandlerParameters = {
     },
     profiles: {
         get: (type: string) => {
+
+            if (profileError === true) {
+              throw new Error("Profile Error");
+            }
+
             if (type === "zosmf") {
               return zosmfProfile;
             }
@@ -73,6 +78,7 @@ let consoleText = "";
 let zosmfProfile = {};
 let sshProfile = {};
 let cicsProfile = {};
+let profileError = false;
 
 let zosMFSpy = jest.spyOn(ZosmfSession, "createBasicZosmfSession").mockImplementation(() => ({}));
 let sshSpy = jest.spyOn(SshSession, "createBasicSshSession").mockImplementation(() => ({}));
@@ -114,6 +120,7 @@ describe("BundlePusher01", () => {
         zosmfProfile = { host: "wibble", user: "user", password: "thisIsntReal", port: 443, rejectUnauthorized: true };
         sshProfile = { host: "wibble", user: "user", password: "thisIsntReal", port: 22 };
         cicsProfile = undefined;
+        profileError = false;
     });
     afterEach(() => {
         jest.restoreAllMocks();
@@ -199,6 +206,12 @@ describe("BundlePusher01", () => {
 
         expect(zosMFSpy).toHaveBeenCalledTimes(1);
     });
+    it("should complain with error during profile load for push", async () => {
+        profileError = true;
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01",  false, "Required parameter --zosmf-host is not set.");
+
+        expect(zosMFSpy).toHaveBeenCalledTimes(0);
+    });
     it("should implement --zosmf-* overrides" , async () => {
         const parms = getCommonParmsForPushTests();
         parms.arguments.zh = "overrideHost";

src/api/BundleDeploy/BundleDeployer.ts

@@ -225,7 +225,13 @@ export class BundleDeployer {
 
   private async createZosMFSession(): Promise<AbstractSession> {
     // Create a zosMF session
-    let zosmfProfile = this.params.profiles.get("zosmf");
+    let zosmfProfile;
+    try {
+      zosmfProfile = this.params.profiles.get("zosmf");
+    }
+    catch (error) {
+      // No-op, we can cope with there being no profile.
+    }
 
     if (zosmfProfile === undefined) {
       zosmfProfile = {};

src/api/BundlePush/BundlePusher.ts

@@ -75,6 +75,11 @@ export class BundlePusher {
                                         "_" + bundle.getVersion();
     }
 
+    if (this.params.arguments.silent === undefined) {
+      const logger = Logger.getAppLogger();
+      logger.debug("Loading profiles");
+    }
+
     // Get the profiles
     const zosMFProfile = this.getProfile("zosmf");
     const sshProfile = this.getProfile("ssh");
@@ -92,6 +97,11 @@ export class BundlePusher {
     this.validateProfiles(zosMFProfile, sshProfile, cicsProfile);
 
 
+    if (this.params.arguments.silent === undefined) {
+      const logger = Logger.getAppLogger();
+      logger.debug("Creating sessions");
+    }
+
     // Create a zOSMF session
     const zosMFSession = await this.createZosMFSession(zosMFProfile);
     // Create an SSH session
@@ -199,7 +209,13 @@ export class BundlePusher {
   }
 
   private getProfile(type: string): IProfile {
-    let profile =  this.params.profiles.get(type);
+    let profile;
+    try {
+      profile = this.params.profiles.get(type);
+    }
+    catch (error) {
+      // Tolerate errors
+    }
 
     if (profile === undefined) {
       profile = {};