Merge dev in to master

matthewpwilson · matthewpwilson · commit 9d4d2fbb537f · 2019-06-07T10:08:04.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -236,7 +236,7 @@ pipeline {
                     //sh("npm set @zowe:registry https://api.bintray.com/npm/ca/brightside/")
                     sh("npm set @zowe:registry https://registry.npmjs.org")
 
-                    sh("npm install -g @zowe/cli@daily")
+                    sh("npm install -g @zowe/cli@latest")
                     sh("zowe --version")
                 }
             }
diff --git a/README.md b/README.md
@@ -6,5 +6,8 @@ The project was started in February 2019 and is at an early stage of development
 
 To try it out, build the plug-in from source as described in [setup](docs-internal/tutorials/Setup.md).
 
+## Documentation
+You can find information and tutorials on using this plugin in our [documentation](https://ibm.github.io/zowe-cli-cics-deploy-plugin/index.html).
+
 ## Contributing
 Contributions are welcome - see the [contribution guidelines](CONTRIBUTING.md). If you have a question or encounter a problem please raise an issue in this repo.
diff --git a/__tests__/api/BundlePush/BundlePusher.test.ts b/__tests__/api/BundlePush/BundlePusher.test.ts
@@ -114,8 +114,8 @@ describe("BundlePusher01", () => {
         lstatSpy = jest.spyOn(fs, "lstatSync").mockImplementation(() => ( IS_NOT_DIRECTORY ));
         cmciSpy = jest.spyOn(cmci, "getResource").mockImplementation(() => ({ response: { records: {} } }));
         consoleText = "";
-        zosmfProfile = { host: "testhost", user: "testuser" };
-        sshProfile = { host: "testhost", user: "testuser" };
+        zosmfProfile = { host: "wibble", user: "user", password: "thisIsntReal" };
+        sshProfile = { host: "wibble", user: "user", password: "thisIsntReal" };
         cicsProfile = undefined;
     });
     afterEach(() => {
@@ -226,15 +226,13 @@ describe("BundlePusher01", () => {
         expect(consoleText).not.toContain("WARNING: ssh profile");
     });
     it("should complain with mismatching zOSMF and CICS profile host names", async () => {
-        cicsProfile = { host: "wibble", user: "testuser", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
+        cicsProfile = { host: "different", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
 
         await runPushTest("__tests__/__resources__/ExampleBundle01", true,
               "PUSH operation completed");
-        expect(consoleText).toContain("WARNING: cics profile --host value 'wibble' does not match zosmf value 'testhost'.");
+        expect(consoleText).toContain("WARNING: cics profile --host value 'different' does not match zosmf value 'wibble'.");
     });
     it("should not complain with matching zOSMF and CICS profile host names", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
 
         await runPushTest("__tests__/__resources__/ExampleBundle01", true,
@@ -274,9 +272,38 @@ describe("BundlePusher01", () => {
               "PUSH operation completed");
         expect(consoleText).toContain("WARNING: cics profile --user value 'joe' does not match zosmf value 'fred'.");
     });
+    it("should complain with mismatching zOSMF and SSH profile passwords", async () => {
+        zosmfProfile = { host: "wibble", user: "fred", password: "fakeZosmfPassword" };
+        sshProfile = { host: "wibble", user: "fred", password: "fakeSshPassword" };
+
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01",  false,
+              "Incompatible security credentials exist in the zosmf and ssh profiles.");
+
+        expect(consoleText).not.toContain("fakeZosmfPassword");
+        expect(consoleText).not.toContain("fakeSshPassword");
+    });
+    it("should tolerate mismatching zOSMF and SSH credentials if SSH keys are used", async () => {
+        zosmfProfile = { host: "wibble", user: "fred", password: "fakeZosmfPassword" };
+        sshProfile = { host: "wibble", user: "fred", privateKey: "fakeSshKey" };
+
+        await runPushTest("__tests__/__resources__/ExampleBundle01", true,
+              "PUSH operation completed");
+
+        expect(consoleText).not.toContain("fakeZosmfPassword");
+        expect(consoleText).not.toContain("fakeSshKey");
+    });
+    it("should complain with mismatching zOSMF and cics profile passwords", async () => {
+        zosmfProfile = { host: "wibble", user: "fred", password: "fakePassword" };
+        sshProfile = { host: "wibble", user: "fred", password: "fakePassword" };
+        cicsProfile = { host: "wibble", user: "fred", password: "fakePassword2", cicsPlex: "12345678" };
+
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01",  false,
+              "Incompatible security credentials exist in the zosmf and cics profiles.");
+
+        expect(consoleText).not.toContain("fakePassword");
+        expect(consoleText).not.toContain("fakePassword2");
+    });
     it("should complain with mismatching cics-deploy and CICS plex names", async () => {
-        zosmfProfile = { host: "wibble", user: "fred" };
-        sshProfile = { host: "wibble", user: "fred" };
         cicsProfile = { host: "wibble", user: "fred", password: "thisIsntReal", cicsPlex: "wibble", regionName: "12345678" };
 
         await runPushTest("__tests__/__resources__/ExampleBundle01", true,
@@ -1025,8 +1052,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(0);
     });
     it("should cope with a NODEJSAPP in the bundle with a CICS profile specified", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I  http://www.ibm.com/xmlns/prod/cics/bundle/NODEJSAPP"}] );
@@ -1046,8 +1071,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(1);
     });
     it("should query scope even with no NODEJSAPPs", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678" };
         readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
           if (data.indexOf("cics.xml") > -1) {
@@ -1090,8 +1113,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(1);
     });
     it("should cope with a NODEJSAPP in the bundle with a CICS profile specified and --verbose", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I  http://www.ibm.com/xmlns/prod/cics/bundle/NODEJSAPP"}] );
@@ -1121,8 +1142,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(1);
     });
     it("should generate diagnostics even if deploy fails", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2055I"}] );
@@ -1180,8 +1199,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(2);
     });
     it("should tolerate a Node.js diagnostics generation failure - region", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I  http://www.ibm.com/xmlns/prod/cics/bundle/NODEJSAPP"}] );
@@ -1202,8 +1219,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(1);
     });
     it("should tolerate a Node.js diagnostics generation failure - nodejsapp", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
@@ -1249,8 +1264,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(2);
     });
     it("should tolerate a Node.js diagnostics generation failure - nodejsapp empty", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
@@ -1296,8 +1309,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(2);
     });
     it("should generate Node.js diagnostics for 1 enabled NODEJSAPP", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
@@ -1355,8 +1366,6 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(2);
     });
     it("should generate Node.js diagnostics for 1 disabled NODEJSAPP", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
         cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
@@ -1414,11 +1423,9 @@ describe("BundlePusher01", () => {
         expect(cmciSpy).toHaveBeenCalledTimes(2);
     });
     it("should generate Node.js diagnostics for 2 NODEJSAPPs", async () => {
-        zosmfProfile = { host: "wibble", user: "user" };
-        sshProfile = { host: "wibble", user: "user" };
-        cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementation(() =>
                   [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
+        cicsProfile = { host: "wibble", user: "user", password: "thisIsntReal", cicsPlex: "12345678", regionName: "12345678" };
         readSpy = jest.spyOn(fs, "readFileSync").mockImplementation((data: string) => {
           if (data.indexOf("cics.xml") > -1) {
             return "<manifest xmlns=\"http://www.ibm.com/xmlns/prod/cics/bundle\">" +
diff --git a/docs/_data/sidebars/cdp_sidebar.yml b/docs/_data/sidebars/cdp_sidebar.yml
@@ -15,11 +15,11 @@ entries:
     - title: Requirements on z/OS
       url: cdp-Requirements.html
       output: web
-    - title: Installation
-      url: cdp-Installation.html
+    - title: Installing
+      url: cdp-Installing.html
       output: web
-    - title: Create Zowe CLI profiles
-      url: cdp-Create-Zowe-CLI-profiles.html
+    - title: Creating Zowe CLI profiles
+      url: cdp-Creating-Zowe-CLI-profiles.html
       output: web
 
   - title: Tutorials
@@ -32,8 +32,8 @@ entries:
     - title: Deploying using individual actions
       url: cdp-Deploying-using-individual-actions.html
       output: web
-    - title: Provision a CICS region with z/OS PT
-      url: cdp-Provision-a-CICS-region-using-zospt.html
+    - title: Provisioning a CICS region with z/OS PT
+      url: cdp-Provisioning-a-CICS-region-using-zospt.html
       output: web
 
   - title: Concepts
diff --git a/docs/pages/cdp/cdp-Creating-Zowe-CLI-profiles.md b/docs/pages/cdp/cdp-Creating-Zowe-CLI-profiles.md
@@ -1,10 +1,10 @@
 ---
-title: Create Zowe CLI profiles
+title: Creating Zowe CLI profiles
 tags: [getting_started, concepts]
 keywords:
 summary: "Zowe profiles let you store configuration details so you don't have to repeat them every time you use a Zowe CLI command."
 sidebar: cdp_sidebar
-permalink: cdp-Create-Zowe-CLI-profiles.html
+permalink: cdp-Creating-Zowe-CLI-profiles.html
 folder: cdp
 ---
 
diff --git a/docs/pages/cdp/cdp-Deploying-your-first-nodejs-app.md b/docs/pages/cdp/cdp-Deploying-your-first-nodejs-app.md
@@ -11,13 +11,13 @@ toc: true
 
 ### Before you begin
 
-CICS TS V5.5 introduced support to run Node.js applications and is required by this tutorial. If you do not have a CICS TS V5.5 region, use the steps in [Provision a CICS region using z/OS PT](cdp-Provision-a-CICS-region-using-zospt) to provision one, or speak to your CICS system administrator.
+CICS TS V5.5 introduced support to run Node.js applications and is required by this tutorial. If you do not have a CICS TS V5.5 region, use the steps in [Provisioning a CICS region using z/OS PT](cdp-Provisioning-a-CICS-region-using-zospt) to provision one, or speak to your CICS system administrator.
 
 ### Procedure
 
-1. Install the Zowe CLI and cics-deploy plugin by following the steps in [Installation](cdp-Installation).
+1. Install the Zowe CLI and cics-deploy plugin by following the steps in [Installing](cdp-Installing).
 
-2. Create Zowe CLI profiles for z/OSMF, SSH, and cics-deploy by following the steps in [Create Zowe CLI profiles](cdp-Create-Zowe-CLI-profiles).
+2. Create Zowe CLI profiles for z/OSMF, SSH, and cics-deploy by following the steps in [Creating Zowe CLI profiles](cdp-Creating-Zowe-CLI-profiles).
 
 3. Create a Node.js application using the [Express Application Generator](https://expressjs.com/en/starter/generator.html):
 
diff --git a/docs/pages/cdp/cdp-Home.md b/docs/pages/cdp/cdp-Home.md
@@ -12,7 +12,7 @@ It provides a CICS deployment workflow for developers and CI/CD automation pipel
 
 Before you start, and especially if you are not familiar with the world of z/OS, Zowe and CICS, it's a good idea to read about some of the key concepts, which include [Zowe](cdp-zowe-and-cli), [Zowe CLI profiles](cdp-zowe-profiles) and [CICS bundles](cdp-cics-bundles). If you're keen to get going quickly, you can jump right in and follow along with our tutorial on [Deploying your first Node.js app](cdp-Deploying-your-first-nodejs-app).
 
-When everything is [installed](cdp-Installation) and you have [created the Zowe CLI profiles](cdp-Create-Zowe-CLI-profiles), you can deploy an application from your workstation to CICS in two steps:
+When everything is [installed](cdp-Installing) and you have [created the Zowe CLI profiles](cdp-Creating-Zowe-CLI-profiles), you can deploy an application from your workstation to CICS in two steps:
 
 1. Use the [zowe cics-deploy generate bundle](cdp-CLIReadMe#generate--g--gen) command to generate some metadata and artifacts that help the target CICS system understand your application.
 
diff --git a/docs/pages/cdp/cdp-Installing.md b/docs/pages/cdp/cdp-Installing.md
@@ -1,10 +1,10 @@
 ---
-title: Installation
+title: Installing
 tags: [getting_started]
 keywords:
 summary: "To install the Zowe CLI and cics-deploy plugin, perform the following steps. For clarity, these components are installed on your local workstation, not on z/OS."
 sidebar: cdp_sidebar
-permalink: cdp-Installation.html
+permalink: cdp-Installing.html
 folder: cdp
 toc: false
 ---
diff --git a/docs/pages/cdp/cdp-Provisioning-a-CICS-region-using-zospt.md b/docs/pages/cdp/cdp-Provisioning-a-CICS-region-using-zospt.md
@@ -1,10 +1,10 @@
 ---
-title: Provision a CICS region using z/OS PT
+title: Provisioning a CICS region using z/OS PT
 tags: [tutorial]
 keywords:
 summary: "The following steps take you through preparing a z/OS Provisioning Toolkit image for CICS, provisioning a CICS region using the image, and then starting, stopping and deprovisioning it."
 sidebar: cdp_sidebar
-permalink: cdp-Provision-a-CICS-region-using-zospt.html
+permalink: cdp-Provisioning-a-CICS-region-using-zospt.html
 folder: cdp
 toc: true
 ---
diff --git a/docs/pages/cdp/cdp-Troubleshooting-Symptoms.md b/docs/pages/cdp/cdp-Troubleshooting-Symptoms.md
@@ -8,7 +8,9 @@ permalink: cdp-Troubleshooting-Symptoms.html
 folder: cdp
 ---
 
-{% include important.html content="To definitively diagnose a problem based on the suggested symptoms, you might need to refer to one or more [system logs and traces](cdp-Troubleshooting-General) particularly the STDERR Node.js log and the file assigned the MSGUSR DD name in the relevant CICS DFHDPLOY job. Depending on your familiarity with z/OS and CICS, and your system privileges, you may also need to consult a CICS systems administrator to get to the bottom of certain problems." %}
+{% include note.html content="For further troubleshooting steps, see [Troubleshooting Node.js applications](https://www.ibm.com/support/knowledgecenter/en/SSGMCP_5.5.0/troubleshooting/node/node-troubleshooting.html)." %}
+
+{% include important.html content="To definitively diagnose a problem based on the suggested symptoms, you might need to refer to one or more [system logs and traces](cdp-Troubleshooting-General) particularly the STDERR Node.js log and the file assigned the MSGUSR DD name in the relevant CICS job. Depending on your familiarity with z/OS and CICS, and your system privileges, you may also need to consult a CICS systems administrator to get to the bottom of certain problems." %}
 
 ## Deployment errors
 
@@ -100,5 +102,3 @@ The length must be between 1 and 8 (inclusive)
 
 *Suggested action*: 
 Review the error output text and reissue the original command having corrected the name of the option so that its length falls within acceptable limits. 
-
-{% include note.html content="For further troubleshooting steps, see [Troubleshooting Node.js applications](https://www.ibm.com/support/knowledgecenter/en/SSGMCP_5.5.0/troubleshooting/node/node-troubleshooting.html)." %}
diff --git a/docs/pages/cdp/cdp-zowe-profiles.md b/docs/pages/cdp/cdp-zowe-profiles.md
@@ -35,7 +35,7 @@ zowe push bundle --name EXAMPLE --target-directory /u/example/bundles --zosmf-pr
 ```
 This is a much more economical and concise command-line than if were it necessary to enumerate all of the individual arguments from all of the profiles.
 
-As suggested above, to deploy a Node.js application from your workstation to one or more CICS regions, you will need to set up a minimum of three Zowe CLI profiles (optionally more if you wish to, say, deploy to multiple hosts) - you can read how to do it in detail [here](cdp-Create-Zowe-CLI-profiles).
+As suggested above, to deploy a Node.js application from your workstation to one or more CICS regions, you will need to set up a minimum of three Zowe CLI profiles (optionally more if you wish to, say, deploy to multiple hosts) - you can read how to do it in detail [here](cdp-Creating-Zowe-CLI-profiles).
 
 {% include tip.html content="For each profile type, the first profile you create becomes the default for that type. In many cases, you don't even have to type in the name of a specific profile if you know that the default profile will serve your needs." %}
 
diff --git a/src/api/BundlePush/BundlePusher.ts b/src/api/BundlePush/BundlePusher.ts

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ pipeline {`
`236`	`236`	`//sh("npm set @zowe:registry https://api.bintray.com/npm/ca/brightside/")`
`237`	`237`	`sh("npm set @zowe:registry https://registry.npmjs.org")`
`238`	`238`
`239`		`- sh("npm install -g @zowe/cli@daily")`
	`239`	`+ sh("npm install -g @zowe/cli@latest")`
`240`	`240`	`sh("zowe --version")`
`241`	`241`	`}`
`242`	`242`	`}`