Merge branch 'master' into master

Author: tasha-m-k

__tests__/__src__/environment/TestEnvironment.ts

@@ -147,7 +147,7 @@ export class TestEnvironment {
     private static async installPlugin(testEnvironment: ITestEnvironment) {
         let installScript: string = TemporaryScripts.SHEBANG;
         installScript += TemporaryScripts.ZOWE_BIN + " plugins install ../../../../\n"; // install plugin from root of project
-        installScript += TemporaryScripts.ZOWE_BIN + " plugins validate @brightside/zowe-cli-cics-deploy-plugin\n";
+        installScript += TemporaryScripts.ZOWE_BIN + " plugins validate zowe-cli-cics-deploy-plugin\n";
         installScript += TemporaryScripts.ZOWE_BIN + " cdep --help\n"; // check that the plugin help is available
         const scriptPath = testEnvironment.workingDir + "/install_plugin.sh";
         IO.writeFile(scriptPath, Buffer.from(installScript));
@@ -156,7 +156,7 @@ export class TestEnvironment {
 
         if (output.status !== 0) {
             throw new ImperativeError({
-                msg: "Install of '@brightside/zowe-cli-cics-deploy-plugin' plugin failed! You should delete the script: \n'" + scriptPath + "' " +
+                msg: "Install of 'zowe-cli-cics-deploy-plugin' plugin failed! You should delete the script: \n'" + scriptPath + "' " +
                     "after reviewing it to check for possible errors.\n Output of the plugin install command:\n" + output.stderr.toString() +
                     output.stdout.toString()
             });

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -24,6 +24,12 @@ const DEFAULT_PARAMTERS: IHandlerParameters = {
     },
     profiles: {
         get: (type: string) => {
+            if (type === "zosmf") {
+              return zosmfProfile;
+            }
+            if (type === "ssh") {
+              return sshProfile;
+            }
             return {};
         }
     } as any,
@@ -60,6 +66,8 @@ const IS_NOT_DIRECTORY: any = {
   isDirectory: jest.fn((directory) => (false))
 };
 let consoleText = "";
+let zosmfProfile = {};
+let sshProfile = {};
 
 // Initialise xml2json before mocking anything
 const parser = require("xml2json");
@@ -99,6 +107,8 @@ describe("BundlePusher01", () => {
         readdirSpy = jest.spyOn(fs, "readdirSync").mockImplementation(() => ([]));
         lstatSpy = jest.spyOn(fs, "lstatSync").mockImplementation(() => ( IS_NOT_DIRECTORY ));
         consoleText = "";
+        zosmfProfile = {};
+        sshProfile = {};
     });
     afterEach(() => {
         jest.restoreAllMocks();
@@ -191,6 +201,38 @@ describe("BundlePusher01", () => {
         expect(zosMFSpy).toHaveBeenCalledTimes(1);
         expect(sshSpy).toHaveBeenCalledTimes(1);
     });
+    it("should complain with mismatching zOSMF and SSH profile host names", async () => {
+        zosmfProfile = { host: "wibble" };
+        sshProfile = { host: "wobble" };
+
+        await runPushTest("__tests__/__resources__/ExampleBundle01", true,
+              "PUSH operation completed.");
+        expect(consoleText).toContain("WARNING: ssh profile --host value 'wobble' does not match zosmf value 'wibble'.");
+    });
+    it("should not complain with matching zOSMF and SSH profile host names", async () => {
+        zosmfProfile = { host: "wibble" };
+        sshProfile = { host: "wibble" };
+
+        await runPushTest("__tests__/__resources__/ExampleBundle01", true,
+              "PUSH operation completed.");
+        expect(consoleText).not.toContain("WARNING: ssh profile");
+    });
+    it("should complain with mismatching zOSMF and SSH profile user names", async () => {
+        zosmfProfile = { host: "wibble", user: "fred" };
+        sshProfile = { host: "wibble", user: "joe" };
+
+        await runPushTest("__tests__/__resources__/ExampleBundle01", true,
+              "PUSH operation completed.");
+        expect(consoleText).toContain("WARNING: ssh profile --user value 'joe' does not match zosmf value 'fred'.");
+    });
+    it("should not complain with matching zOSMF and SSH profile user names", async () => {
+        zosmfProfile = { host: "wibble", user: "fred" };
+        sshProfile = { host: "wibble", user: "fred" };
+
+        await runPushTest("__tests__/__resources__/ExampleBundle01", true,
+              "PUSH operation completed.");
+        expect(consoleText).not.toContain("WARNING: ssh profile");
+    });
     it("should complain if remote bundle dir mkdir fails", async () => {
         createSpy.mockImplementationOnce(() => { throw new Error( "Injected Create error" ); });
         await runPushTestWithError("__tests__/__resources__/ExampleBundle01",  false,

package.json

@@ -34,8 +34,8 @@
     "xml2json": "^0.11.2"
   },
   "devDependencies": {
-    "@zowe/cli": "^5.3.0-alpha.201904291733",
-    "@zowe/imperative": "^4.1.2-alpha.201905061426",
+    "@zowe/cli": "^5.5.0",
+    "@zowe/imperative": "^4.1.2",
     "@types/fs-extra": "^5.0.5",
     "@types/jest": "^22.2.3",
     "@types/node": "^8.0.28",
@@ -66,8 +66,8 @@
     "uuid": "^3.3.2"
   },
   "peerDependencies": {
-    "@zowe/cli": "^3.2.0",
-    "@zowe/imperative": "^3.0.0"
+    "@zowe/cli": "^5.5.0",
+    "@zowe/imperative": "^4.1.2"
   },
   "jest": {
     "modulePathIgnorePatterns": [

src/api/BundlePush/BundlePusher.ts

@@ -11,7 +11,7 @@
 
 "use strict";
 
-import { IHandlerParameters, AbstractSession, ITaskWithStatus, TaskStage, TaskProgress, Logger } from "@zowe/imperative";
+import { IHandlerParameters, AbstractSession, ITaskWithStatus, TaskStage, TaskProgress, Logger, IProfile } from "@zowe/imperative";
 import { List, ZosmfSession, SshSession, Shell, Upload, IUploadOptions, ZosFilesAttributes, Create } from "@zowe/cli";
 import { BundleDeployer } from "../BundleDeploy/BundleDeployer";
 import { Bundle } from "../BundleContent/Bundle";
@@ -69,10 +69,15 @@ export class BundlePusher {
                                         "_" + bundle.getVersion();
     }
 
+    // Get the profiles
+    const zosMFProfile = this.getProfile("zosmf");
+    const sshProfile = this.getProfile("ssh");
+    this.validateProfiles(zosMFProfile, sshProfile);
+
     // Create a zOSMF session
-    const zosMFSession = await this.createZosMFSession();
+    const zosMFSession = await this.createZosMFSession(zosMFProfile);
     // Create an SSH session
-    const sshSession = await this.createSshSession();
+    const sshSession = await this.createSshSession(sshProfile);
 
     // Start a progress bar (but only in non-verbose mode)
     this.progressBar = { percentComplete: 0,
@@ -176,23 +181,43 @@ export class BundlePusher {
     }
   }
 
-  private async createZosMFSession(): Promise<AbstractSession> {
-    // Create a zosMF session
-    const zosmfProfile = this.params.profiles.get("zosmf");
+  private getProfile(type: string): IProfile {
+    const profile =  this.params.profiles.get(type);
 
-    if (zosmfProfile === undefined) {
-      throw new Error("No zosmf profile found");
+    if (profile === undefined) {
+      throw new Error("No " + type + " profile found");
     }
-    return ZosmfSession.createBasicZosmfSession(zosmfProfile);
+
+    return profile;
   }
 
-  private async createSshSession(): Promise<SshSession> {
-    // Create an SSH session
-    const sshProfile = this.params.profiles.get("ssh");
+  private issueWarning(msg: string) {
+    const warningMsg = "WARNING: " + msg + "\n";
+    this.endProgressBar();
+    this.params.response.console.log(Buffer.from(warningMsg));
+    if (this.params.arguments.silent === undefined) {
+      const logger = Logger.getAppLogger();
+      logger.warn(warningMsg);
+    }
+    this.startProgressBar();
+  }
 
-    if (sshProfile === undefined) {
-      throw new Error("No ssh profile found");
+  private validateProfiles(zosmfProfile: IProfile, sshProfile: IProfile) {
+    // Do they share the same host name?
+    if (zosmfProfile.host !== sshProfile.host) {
+      this.issueWarning("ssh profile --host value '" + sshProfile.host + "' does not match zosmf value '" + zosmfProfile.host + "'.");
+    }
+    // Do they share the same user name?
+    if (zosmfProfile.user !== sshProfile.user) {
+      this.issueWarning("ssh profile --user value '" + sshProfile.user + "' does not match zosmf value '" + zosmfProfile.user + "'.");
     }
+  }
+
+  private async createZosMFSession(zosmfProfile: IProfile): Promise<AbstractSession> {
+    return ZosmfSession.createBasicZosmfSession(zosmfProfile);
+  }
+
+  private async createSshSession(sshProfile: IProfile): Promise<SshSession> {
     return SshSession.createBasicSshSession(sshProfile);
   }
 
@@ -433,14 +458,7 @@ export class BundlePusher {
     }
 
     // A project specific .zosattributes has not been found, so use a default
-    const warningMsg = "WARNING: No .zosAttributes file found in the bundle directory, default values will be applied.";
-    this.endProgressBar();
-    this.params.response.console.log(Buffer.from(warningMsg));
-    if (this.params.arguments.silent === undefined) {
-      const logger = Logger.getAppLogger();
-      logger.warn(warningMsg);
-    }
-    this.startProgressBar();
+    this.issueWarning("No .zosAttributes file found in the bundle directory, default values will be applied.");
     return new ZosFilesAttributes(Bundle.getTemplateZosAttributesFile());
   }
 
@@ -468,13 +486,13 @@ export class BundlePusher {
   }
 
   private startProgressBar() {
-    if (this.params.arguments.verbose !== true) {
+    if (this.params.arguments.verbose !== true && this.progressBar !== undefined) {
       this.params.response.progress.startBar({task: this.progressBar});
     }
   }
 
   private endProgressBar() {
-    if (this.params.arguments.verbose !== true) {
+    if (this.params.arguments.verbose !== true && this.progressBar !== undefined) {
       this.params.response.progress.endBar();
     }
   }