Merge branch 'master' into master

Author: cxharris

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -70,7 +70,7 @@ let createSpy = jest.spyOn(Create, "uss").mockImplementation(() => ({}));
 let listSpy = jest.spyOn(List, "fileList").mockImplementation(() => ({}));
 let membersSpy = jest.spyOn(List, "allMembers").mockImplementation(() => ({}));
 let submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() => ({}));
-let shellSpy = jest.spyOn(Shell, "executeSshCwd").mockImplementation(() => ({}));
+let shellSpy = jest.spyOn(Shell, "executeSshCwd").mockImplementation(() => (0));
 let existsSpy = jest.spyOn(fs, "existsSync").mockImplementation(() => ({}));
 let readSpy = jest.spyOn(fs, "readFileSync").mockImplementation(() => ({}));
 let uploadSpy = jest.spyOn(Upload, "dirToUSSDirRecursive").mockImplementation(() => ({}));
@@ -88,7 +88,7 @@ describe("BundlePusher01", () => {
         membersSpy = jest.spyOn(List, "allMembers").mockImplementation(() => ( { val: "DFHDPLOY, EYU9ABSI" }));
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
-        shellSpy = jest.spyOn(Shell, "executeSshCwd").mockImplementation(() => ({}));
+        shellSpy = jest.spyOn(Shell, "executeSshCwd").mockImplementation(() => (0));
         existsSpy = jest.spyOn(fs, "existsSync").mockReturnValue(false);
         readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
           if (data.indexOf("cics.xml") > -1) {
@@ -393,6 +393,7 @@ describe("BundlePusher01", () => {
     it("should tolerate delete of empty directory", async () => {
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           stdoutHandler("FSUM9195 cannot unlink entry \"*\": EDC5129I No such file or directory.");
+          return 1;
         });
 
         await runPushTest("__tests__/__resources__/ExampleBundle01", true,
@@ -406,9 +407,48 @@ describe("BundlePusher01", () => {
         expect(membersSpy).toHaveBeenCalledTimes(2);
         expect(submitSpy).toHaveBeenCalledTimes(2);
     });
+    it("should not tolerate non zero return code from ssh command", async () => {
+        shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
+          stdoutHandler("Ssh command exit with non zero status");
+          return 1;
+        });
+
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01", true,
+              "A problem occurred attempting to run 'rm -r *' in remote directory '/u/ThisDoesNotExist/12345678'. " +
+              "Problem is: The output from the remote command implied that an error occurred.");
+
+        expect(consoleText).toContain("Ssh command exit with non zero status");
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(1);
+        expect(shellSpy).toHaveBeenCalledTimes(1);
+        expect(membersSpy).toHaveBeenCalledTimes(2);
+        expect(submitSpy).toHaveBeenCalledTimes(1);
+    });
+    it("should not tolerate mixture of FSUM9195 but exit status is not 1", async () => {
+        shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
+          stdoutHandler("Injected FSUM9195 error message");
+          return 127;
+        });
+
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01", true,
+              "A problem occurred attempting to run 'rm -r *' in remote directory '/u/ThisDoesNotExist/12345678'. " +
+              "Problem is: The output from the remote command implied that an error occurred.");
+
+        expect(consoleText).toContain("Injected FSUM9195 error message");
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(1);
+        expect(shellSpy).toHaveBeenCalledTimes(1);
+        expect(membersSpy).toHaveBeenCalledTimes(2);
+        expect(submitSpy).toHaveBeenCalledTimes(1);
+    });
     it("should not tolerate mixture of FSUM9195 and other FSUM messages", async () => {
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           stdoutHandler("Injected FSUM9195 and FSUM9196 error message");
+          return 1;
         });
 
         await runPushTestWithError("__tests__/__resources__/ExampleBundle01", true,
@@ -594,6 +634,7 @@ describe("BundlePusher01", () => {
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           if (cmd.indexOf("npm install") > -1) {
             stdoutHandler("Injected stdout error message");
+            return 1;
           }
           else {
             return true;
@@ -626,6 +667,7 @@ describe("BundlePusher01", () => {
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           if (cmd.indexOf("npm install") > -1) {
             stdoutHandler("Injected FSUM7351 not found message");
+            return 1;
           }
           else {
             return true;
@@ -658,6 +700,7 @@ describe("BundlePusher01", () => {
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           if (cmd.indexOf("npm install") > -1) {
             stdoutHandler("Injected npm ERR! Exit status 1 message");
+            return 1;
           }
           else {
             return true;
@@ -725,6 +768,7 @@ describe("BundlePusher01", () => {
         parms.arguments.targetdir = "//u//escapedDirName";
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           stdoutHandler("Injected stdout shell message");
+          return 0;
         });
         readdirSpy.mockImplementation((data: string) => {
           return [ "package.json" ];
@@ -752,6 +796,7 @@ describe("BundlePusher01", () => {
         parms.arguments.targetdir = "//u//escapedDirName";
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           stdoutHandler("Injected stdout shell message for " + dir);
+          return 0;
         });
         readdirSpy.mockImplementation((data: string) => {
           if (data.endsWith("XXXDIRXXX")) {
@@ -799,6 +844,7 @@ describe("BundlePusher01", () => {
         parms.arguments.verbose = true;
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           stdoutHandler("Injected stdout shell message");
+          return 0;
         });
         readdirSpy.mockImplementation((data: string) => {
           return [ "package.json" ];
@@ -832,6 +878,7 @@ describe("BundlePusher01", () => {
         parms.arguments.verbose = true;
         shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
           stdoutHandler("Injected stdout shell message");
+          return 0;
         });
         readdirSpy.mockImplementation((data: string) => {
           return [ "package.json" ];

docs/pages/cdp/cdp-Create-Zowe-CLI-profiles.md

@@ -18,8 +18,7 @@ This profile identifies the z/OSMF server that has access to the directory on z/
 
 For example, to create a z/OSMF profile:
 ```console
-zowe profiles create zosmf-profile myzos --host myzos.example.com --port 3000
-     --user myuserid --password mypassword --reject-unauthorized false --overwrite
+zowe profiles create zosmf-profile myzos --host myzos.example.com --port 3000 --user myuserid --password mypassword --reject-unauthorized false --overwrite
 ```
 For help on using the options:
 ```console
@@ -42,8 +41,7 @@ It is recommended that you use the same user ID and host to connect with SSH as
 
 For example, to create an SSH profile:
 ```console
-zowe profiles create ssh-profile myzos --host myzos.example.com
-     --user myuserid --password mypassword --overwrite
+zowe profiles create ssh-profile myzos --host myzos.example.com --user myuserid --password mypassword --overwrite
 ```
 For help on using the options:
 ```console
@@ -66,9 +64,7 @@ This profile identifies the CICS environment for deployment. You need to know th
 
 For example to create a cics-deploy profile:
 ```console
-zowe profiles create cics-deploy-profile example --cicsplex PLEX1
-     --cicshlq CICSTS55.CICS720 --cpsmhlq CICSTS55.CPSM550
-     --scope TESTGRP1 --csdgroup BUNDGRP1 --overwrite
+zowe profiles create cics-deploy-profile example --cicsplex PLEX1 --cicshlq CICSTS55.CICS720 --cpsmhlq CICSTS55.CPSM550 --scope TESTGRP1 --csdgroup BUNDGRP1 --overwrite
 ```
 For help on using the options:
 ```console

docs/pages/cdp/cdp-Developer-pushing-Node.js-apps.md

@@ -37,7 +37,9 @@ You also need an existing CICS bundle in the current working directory. For more
 
 The `cics-deploy push bundle` command pushes a bundle from the working directory to a target CICS environment. It requires the use of a z/OSMF profile and an ssh profile to do so, use of a cics-deploy profile is also encouraged (for more information on these dependencies see [Requirements for Push](#push_req)). You can request assistance on using the push command by issuing the following command:
 
-  `zowe cics-deploy push bundle --help`
+   ```console
+   zowe cics-deploy push bundle --help
+   ```
 
 If you have configured default profiles for zosmf, ssh and cics-deploy then only two further items are needed:
 
@@ -46,16 +48,21 @@ If you have configured default profiles for zosmf, ssh and cics-deploy then only
 
 For example, you might issue the following command:
 
-  `zowe cics-deploy push bundle --name EXAMPLE1 --targetdir /u/user01/myBundles`
+   ```console
+   zowe cics-deploy push bundle --name EXAMPLE1 --targetdir /u/user01/myBundles
+   ```
 
 This command causes cics-deploy to attempt to deploy a bundle from the current working directory to the target CICS environment under the name `EXAMPLE1`. If a bundle exists in the target environment with the same name, cics-deploy returns an error. You can instruct cics-deploy to overwrite the existing bundle by adding the --overwrite parameter, for example:
 
-  `zowe cics-deploy push bundle --name EXAMPLE1 --targetdir /u/user01/myBundles --overwrite`
+   ```console
+   zowe cics-deploy push bundle --name EXAMPLE1 --targetdir /u/user01/myBundles --overwrite
+   ```
 
 You can also request verbose messages from cics-deploy by adding the --verbose option, for example:
 
-  `zowe cics-deploy push bundle --name EXAMPLE1 --targetdir /u/user01/myBundles --overwrite --verbose`
-
+   ```console
+   zowe cics-deploy push bundle --name EXAMPLE1 --targetdir /u/user01/myBundles --overwrite --verbose
+   ```
 
 <a name="push_components"></a>
 ### Subcomponents of the push command
@@ -67,5 +74,4 @@ The `cics-deploy push bundle` command consists of several separate actions, each
 3. If the bundle contains a package.json file, it runs `npm install` on the remote system by using `zowe zos-uss issue ssh`.
 4. It deploys a bundle by using `zowe cics-deploy deploy bundle` (See [Deploying a CICS bundle](#deploying)).
 
-Advanced users might prefer to use these subcommands in preference to the `push` command. For example, if the target CICS regions are not CPSM-managed then you might use Zowe to generate and then upload the bundle, and your own scripts to deploy the bundle into a CICS region.
-
+Advanced users might prefer to use these subcommands in preference to the `push` command. For example, if the target CICS regions are not CPSM-managed then you might use Zowe to generate and then upload the bundle, and your own scripts to deploy the bundle into a CICS region.

src/api/BundlePush/BundlePusher.ts

@@ -375,26 +375,24 @@ export class BundlePusher {
       const shell = await Shell.executeSshCwd(sshSession, sshCommand, directory, this.sshOutput.bind(this));
       const upperCaseOutputText = this.sshOutputText.toUpperCase();
 
-      // Did the SSH command work? It's unclear how to tell, but for starters let's look for common
-      // signifiers in the output text. Note that FSUM9195 can imply that we've tried to delete the
+      // Note that FSUM9195 can imply that we've tried to delete the
       // contents of an empty directory - that's not a problem.
-
-      // If there any FSUM messages other than FSUM9195 then that's a problem
-      let otherFSUMMessages = false;
+      // Check if FSUM9195 is the only FSUM error
+      let isOnlyFSUM9195 = false;
       const countFSUM = (upperCaseOutputText.match(/FSUM/g) || []).length;
       const countFSUM9195 = (upperCaseOutputText.match(/FSUM9195/g) || []).length;
-      if (countFSUM > countFSUM9195) {
-        otherFSUMMessages = true;
+      if (countFSUM9195 !== 0 &&
+          countFSUM === countFSUM9195 &&
+          shell === 1) {
+        isOnlyFSUM9195 = true;
       }
 
-      // Now check for other common error signifiers
-      if (otherFSUMMessages ||
-          upperCaseOutputText.indexOf("ERROR ") > -1 ||
-          upperCaseOutputText.indexOf("ERR!") > -1 ) {
-
+      // Now check
+      // A. If exit code is non zero
+      // B. FSUM9195 is not the only FSUM error
+      if (shell !== 0 && !isOnlyFSUM9195) {
         // if we've not already logged the output, log it now
-        if (this.params.arguments.verbose !== true)
-        {
+        if (this.params.arguments.verbose !== true) {
           this.params.response.console.log(Buffer.from(this.sshOutputText));
         }
         throw new Error("The output from the remote command implied that an error occurred.");

src/cli/generate/bundle/options/Port.option.ts

@@ -19,9 +19,9 @@ export const PortOption: ICommandOptionDefinition = {
     name: "port",
     aliases: ["p"],
     type: "string",
-    description: "An optional TCP/IP port number that the Node.js application expects to use. " +
-                 "If a value is specified, it is stored within the generated NODEJSAPP's profile " +
-                 "and the associated value can be referenced programmatically by using the 'PORT' " +
-                 "environment variable."
+    description: "The TCP/IP port number the Node.js application should use for clients to connect to. " +
+                 "If a value is specified, it is set within the generated NODEJSAPP's profile. " +
+                 "The Node.js application can reference this value by accessing the PORT environment variable, " +
+                 "for example using process.env.PORT. " +
+                 "Additional environment variables can be set by manually editing the profile."
 };
-