updated PDS check to dsorg.startWith(PO)

Signed-off-by: Pujal <pujal.gandhi@broadcom.com>
zowe · Feb 26, 2025 · 1c328ef · 1c328ef
1 parent b91b989
commit 1c328ef
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 21 deletions.
diff --git a/packages/zosfiles/__tests__/__system__/methods/copy/Copy.system.test.ts b/packages/zosfiles/__tests__/__system__/methods/copy/Copy.system.test.ts
@@ -160,7 +160,7 @@ describe("Copy", () => {
                     let error;
                     let response;
 
-                    const uploadFileToDatasetSpy = jest.spyOn(Upload, 'fileToDataset').mockImplementation(async (session, filePath, dsn) => {
+                    const uploadFileToDatasetSpy = jest.spyOn(Upload, 'fileToDataset').mockImplementation(async (session, filePath) => {
                         if (filePath === fileLocation) {
                             throw new Error("Truncation of a record occurred during an I/O operation");
                         }

diff --git a/packages/zosfiles/__tests__/__unit__/methods/copy/Copy.unit.test.ts b/packages/zosfiles/__tests__/__unit__/methods/copy/Copy.unit.test.ts
@@ -600,23 +600,27 @@ describe("Copy", () => {
                         expectedPayload
                     );
                 });
+
                 it("should call Create.dataSetLike and create a new data set if the target data set inputted does not exist", async() => {
-                    dataSetExistsSpy.mockResolvedValue(false);
+                    dataSetExistsSpy.mockResolvedValueOnce(true);
+                    dataSetExistsSpy.mockResolvedValueOnce(false);
                     const response = await Copy.dataSet(
                         dummySession,
                         {dsn: toDataSetName},
                         {"from-dataset": {
                             dsn:fromDataSetName
                         }}
                     );
-                    expect(createSpy).toHaveBeenCalled();
+
+                    expect(createSpy).toHaveBeenCalledWith(dummySession, toDataSetName, fromDataSetName);
                     expect(response).toEqual({
                         success: true,
                         commandResponse: util.format(ZosFilesMessages.dataSetCopiedIntoNew.message, toDataSetName)
                     });
                 });
                 it("should not create a new data set if the target data set inputted exists", async() => {
-                    dataSetExistsSpy.mockResolvedValue(true);
+                    dataSetExistsSpy.mockResolvedValueOnce(true);
+                    dataSetExistsSpy.mockResolvedValueOnce(true);
                     const response = await Copy.dataSet(
                         dummySession,
                         {dsn: toDataSetName},
@@ -689,6 +693,21 @@ describe("Copy", () => {
                     commandResponse: `The source and target data sets are identical.`
                 });
             });
+            it("should return early if the source data set does not exist", async() => {
+                dataSetExistsSpy.mockResolvedValueOnce(false);
+                dataSetExistsSpy.mockResolvedValueOnce(true);
+                const response = await Copy.dataSet(
+                    dummySession,
+                    {dsn: toDataSetName},
+                    {"from-dataset": {
+                        dsn: fromDataSetName
+                    }}
+                );
+                expect(response).toEqual({
+                    success: false,
+                    commandResponse: `Data set copied aborted. The source data set was not found.`
+                });
+            });
         });
         describe("Failure Scenarios", () => {
             it("should fail if the zOSMF REST client fails", async () => {

diff --git a/packages/zosfiles/src/constants/ZosFiles.messages.ts b/packages/zosfiles/src/constants/ZosFiles.messages.ts
@@ -148,7 +148,6 @@ export const ZosFilesMessages: { [key: string]: IMessageDefinition } = {
     dataSetCopiedIntoNew: {
         message: `Source contents were successfully copied into a new data set - %s`
     },
-
     /**
      * Message indicating that the data set was created successfully
      * @type {IMessageDefinition}

diff --git a/packages/zosfiles/src/methods/copy/Copy.ts b/packages/zosfiles/src/methods/copy/Copy.ts
@@ -60,6 +60,14 @@ export class Copy {
         const safeReplace: boolean = options.safeReplace;
         const overwriteMembers: boolean = options.replace;
 
+        const sourceDataSetExists = await this.dataSetExists(session, options["from-dataset"].dsn);
+        if(!sourceDataSetExists) {
+            return {
+                success: false,
+                commandResponse: ZosFilesMessages.datasetCopiedAbortedNoTargetDS.message
+            };
+        }
+
         if(options["from-dataset"].dsn === toDataSetName && toMemberName === options["from-dataset"].member) {
             return {
                 success: false,

diff --git a/packages/zosfiles/src/methods/download/Download.ts b/packages/zosfiles/src/methods/download/Download.ts
@@ -360,7 +360,7 @@ export class Download {
                 }
 
                 if (options.directory == null) {
-                    if (dataSetObj.dsorg === "PO" || dataSetObj.dsorg === "PO-E") {
+                    if (dataSetObj.dsorg && dataSetObj.dsorg.startsWith("PO")) {
                         mutableOptions.directory = ZosFilesUtils.getDirsFromDataSet(dataSetObj.dsname);
                     } else {
                         mutableOptions.file = `${dataSetObj.dsname}.` +
@@ -371,7 +371,7 @@ export class Download {
                         mutableOptions.directory = undefined;
                         mutableOptions.extension = undefined;
                     }
-                } else if (dataSetObj.dsorg === "PO" || dataSetObj.dsorg === "PO-E") {
+                } else if (dataSetObj.dsorg && dataSetObj.dsorg.startsWith("PO")) {
                     mutableOptions.directory = `${mutableOptions.directory}/${ZosFilesUtils.getDirsFromDataSet(dataSetObj.dsname)}`;
                 } else {
                     mutableOptions.file = `${dataSetObj.dsname}.${mutableOptions.extension ?? ZosFilesUtils.DEFAULT_FILE_EXTENSION}`;
@@ -397,7 +397,7 @@ export class Download {
                             dataSetObj.status = downloadResponse.commandResponse;
                         }
                     });
-                } else if (dataSetObj.dsorg === "PO" || dataSetObj.dsorg === "PO-E") {
+                } else if (dataSetObj.dsorg.startsWith("PO")) {
                     poDownloadTasks.push({
                         handler: Download.allMembers.bind(this),
                         dsname: dataSetObj.dsname,

diff --git a/packages/zosfiles/src/methods/search/Search.ts b/packages/zosfiles/src/methods/search/Search.ts
@@ -87,7 +87,7 @@ export class Search {
                 if (resp.dsorg && !(resp.migr && resp.migr.toLowerCase() === "yes")) {
                     if (resp.dsorg === "PS") {                                      // Sequential
                         searchItemsQueue.push({dsn: resp.dsname});
-                    } else if (resp.dsorg === "PO" || resp.dsorg === "PO-E") {      // Partitioned
+                    } else if (resp.dsorg.startsWith("PO")) {      // Partitioned
                         partitionedDataSets.push(resp.dsname);
                     }
                 }

diff --git a/packages/zosfiles/src/methods/upload/Upload.ts b/packages/zosfiles/src/methods/upload/Upload.ts
@@ -348,19 +348,16 @@ export class Upload {
                 // If dsnameIndex === -1, it means we could not find the given data set.
                 // We will attempt the upload anyways so that we can forward/throw the proper error from z/OS MF
                 const dsInfo = listResponse.apiResponse.items[dsnameIndex];
-                switch (dsInfo.dsorg) {
-                    case "PO":
-                    case "PO-E":
-                        isUploadToPds = true;
-                        break;
-                    default:
+                if(dsInfo.dsorg.startsWith("PO")) {
+                    isUploadToPds = true;
+                }
+                else {
                     // if loading to a physical sequential data set and multiple files found then error
-                        if (uploadFileList.length > 1) {
-                            throw new ImperativeError({
-                                msg: ZosFilesMessages.uploadDirectoryToPhysicalSequentialDataSet.message
-                            });
-                        }
-                        break;
+                    if (uploadFileList.length > 1) {
+                        throw new ImperativeError({
+                            msg: ZosFilesMessages.uploadDirectoryToPhysicalSequentialDataSet.message
+                        });
+                    }
                 }
             }
         }