Merge remote-tracking branch 'origin/master' into auth-order-spike

Signed-off-by: Gene Johnston <[email protected]>

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.8.3",
+  "version": "8.8.4",
   "command": {
     "publish": {
       "ignoreChanges": [

packages/cli/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to the Zowe CLI package will be documented in this file.
 
+## Recent Changes
+
+-Enhancement: Added new command zowe zos-files download all-members-matching, (zowe files dl amm), to download members matching specified pattern(s). The success message for the Download.allMembers API was changed from originally "Data set downloaded successfully" to "Member(s) downloaded successfully." The change also alters the commandResponse when using the --rfj flag. [#2359](https://github.com/zowe/zowe-cli/pull/2359)
+
 ## `8.8.0`
 
 - Enhancement: Pass a `.zosattributes` file path for the download encoding format by adding the new `--attributes` flag to the `zowe zos-files upload` command. [#2322](https://github.com/zowe/zowe-cli/issues/2322)

packages/cli/__tests__/zosfiles/__system__/download/am/cli.files.download.am.system.test.ts

@@ -79,7 +79,6 @@ describe("Download All Member", () => {
             if (defaultSys.zosmf.basePath != null) {
                 TEST_ENVIRONMENT_NO_PROF.env[ZOWE_OPT_BASE_PATH] = defaultSys.zosmf.basePath;
             }
-
             const response = runCliScript(shellScript,
                 TEST_ENVIRONMENT_NO_PROF,
                 [dsname,
@@ -89,7 +88,7 @@ describe("Download All Member", () => {
                     defaultSys.zosmf.password]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
         });
     });
 
@@ -109,39 +108,39 @@ describe("Download All Member", () => {
             const response = runCliScript(shellScript, TEST_ENVIRONMENT, [dsname]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
         });
 
         it("should download all data set member of pds in binary format", () => {
             const shellScript = path.join(__dirname, "__scripts__", "command", "command_download_all_member.sh");
             const response = runCliScript(shellScript, TEST_ENVIRONMENT, [dsname, "--binary"]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
         });
 
         it("should download all data set member of pds in record format", () => {
             const shellScript = path.join(__dirname, "__scripts__", "command", "command_download_all_member.sh");
             const response = runCliScript(shellScript, TEST_ENVIRONMENT, [dsname, "--record"]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
         });
 
         it("should download all data set member of pds with response timeout", () => {
             const shellScript = path.join(__dirname, "__scripts__", "command", "command_download_all_member.sh");
             const response = runCliScript(shellScript, TEST_ENVIRONMENT, [dsname, "--responseTimeout 5"]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
         });
 
         it("should download all data set members with --max-concurrent-requests 2", () => {
             const shellScript = path.join(__dirname, "__scripts__", "command", "command_download_all_member_mcr.sh");
             const response = runCliScript(shellScript, TEST_ENVIRONMENT, [dsname, 2]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
         });
 
         it("should download all data set members of a large data set with --max-concurrent-requests 2", async () => {
@@ -156,7 +155,7 @@ describe("Download All Member", () => {
             const response = runCliScript(shellScript, TEST_ENVIRONMENT, [bigDsname, 2]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
             await Delete.dataSet(REAL_SESSION, bigDsname);
         });
 
@@ -165,7 +164,7 @@ describe("Download All Member", () => {
             const response = runCliScript(shellScript, TEST_ENVIRONMENT, [dsname, "--rfj"]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
         });
 
         it("should download all data set member to specified directory", () => {
@@ -174,7 +173,7 @@ describe("Download All Member", () => {
             const response = runCliScript(shellScript, TEST_ENVIRONMENT, [dsname, `-d ${testDir}`, "--rfj"]);
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(response.stdout.toString()).toContain("Data set downloaded successfully.");
+            expect(response.stdout.toString()).toContain("Member(s) downloaded successfully.");
             expect(response.stdout.toString()).toContain(testDir);
         });
 
@@ -186,7 +185,7 @@ describe("Download All Member", () => {
             const expectedResult = {member: "TEST"};
             expect(response.stderr.toString()).toBe("");
             expect(response.status).toBe(0);
-            expect(result.stdout).toContain("Data set downloaded successfully.");
+            expect(result.stdout).toContain("Member(s) downloaded successfully.");
             expect(result.stdout).toContain(testDir);
             expect(result.data.apiResponse.items[0]).toEqual(expectedResult);
         });

packages/cli/__tests__/zosfiles/__system__/download/amm/__scripts__/command_download_amm.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+dsn=$1
+pattern=$2
+rfj=$3
+set -e
+
+echo "================Z/OS FILES DOWNLOAD ALL MEMBER DATA SET==============="
+zowe zos-files download amm "$1" "$2" $3 $4
+if [ $? -gt 0 ]
+then
+    exit $?
+fi

packages/cli/__tests__/zosfiles/__system__/download/amm/__scripts__/command_download_amm_fully_qualified.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+dsn=$1
+pattern=$2
+HOST=$3
+PORT=$4
+USER=$5
+PASS=$6
+zowe zos-files download amm "$dsn" "$pattern" --host $HOST --port $PORT --user $USER --password $PASS --ru=false
+exit $?

packages/cli/__tests__/zosfiles/__system__/download/amm/__scripts__/command_download_amm_mcr.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+dsn=$1
+pattern=$2
+mcr=$3
+set -e
+
+echo "================Z/OS FILES DOWNLOAD ALL MEMBER DATA SET==============="
+zowe zos-files download amm "$dsn" "$pattern" --max-concurrent-requests "$mcr"
+if [ $? -gt 0 ]
+then
+    exit $?
+fi

packages/cli/__tests__/zosfiles/__system__/download/amm/__scripts__/command_download_amm_no_extension.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+dsn=$1
+pattern=$2
+rfj=$3
+set -e
+
+# echo "================Z/OS FILES DOWNLOAD ALL MEMBER DATA SET==============="
+zowe zos-files download amm "$1" "$2" -e "" $3
+if [ $? -gt 0 ]
+then
+    exit $?
+fi