zowe · zFernand0 · Jan 30, 2025 · Jan 16, 2025 · Jan 16, 2025 · Jan 16, 2025
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,7 +1,12 @@
 # Change Log
 All notable changes to the Zowe CLI package will be documented in this file.
 
+
+## Recent Changes
+- BugFix: The `zowe zos-files copy data-set` command overwrites the contents of the target data set without user confirmation. A `--safe-replace` option was added which prompts the user to confirm before overwriting the contents of the target data set. [#2369] (https://github.com/zowe/zowe-cli/issues/2369)
+
 ## `8.12.0`
+
 - Enhancement: The `zowe zos-files copy data-set` command no longer requires the target data set to be preallocated. [##2349] (https://github.com/zowe/zowe-cli/issues/2349)
 
 ## `8.10.4`

diff --git a/...zosfiles/__integration__/copy/ds/__snapshots__/cli.files.copy.ds.integration.test.ts.snap b/...zosfiles/__integration__/copy/ds/__snapshots__/cli.files.copy.ds.integration.test.ts.snap
diff --git a/packages/cli/__tests__/zosfiles/__unit__/copy/ds/Ds.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/copy/ds/Ds.handler.unit.test.ts
@@ -33,11 +33,24 @@ describe("DsHandler", () => {
 
         const fromDataSetName = "ABCD";
         const toDataSetName = "EFGH";
+        const enq = "SHR";
+        const replace = true;
+        const safeReplace = true;
+        const responseTimeout: any = undefined;
+
 
         const commandParameters: any = {
             arguments: {
                 fromDataSetName,
-                toDataSetName
+                toDataSetName,
+                enq,
+                replace,
+                safeReplace,
+                responseTimeout
+
+            },
+            response: {
+                console: { promptFn: jest.fn() }
             }
         };
 
@@ -49,7 +62,14 @@ describe("DsHandler", () => {
         expect(copyDatasetSpy).toHaveBeenLastCalledWith(
             dummySession,
             { dsn: commandParameters.arguments.toDataSetName },
-            { "from-dataset": { dsn: commandParameters.arguments.fromDataSetName } }
+            {
+                "from-dataset": { dsn: commandParameters.arguments.fromDataSetName },
+                "enq": commandParameters.arguments.enq,
+                "replace": commandParameters.arguments.replace,
+                "responseTimeout": commandParameters.arguments.responseTimeout,
+                "safeReplace": commandParameters.arguments.safeReplace,
+                "promptFn": expect.any(Function)
+            }
         );
         expect(response).toBe(defaultReturn);
     });
@@ -63,11 +83,22 @@ describe("DsHandler", () => {
         const fromMemberName = "mem1";
         const toDataSetName = "EFGH";
         const toMemberName = "mem2";
+        const enq = "SHR";
+        const replace = true;
+        const safeReplace = true;
+        const responseTimeout: any = undefined;
 
         const commandParameters: any = {
             arguments: {
                 fromDataSetName: `${fromDataSetName}(${fromMemberName})`,
-                toDataSetName: `${toDataSetName}(${toMemberName})`
+                toDataSetName: `${toDataSetName}(${toMemberName})`,
+                enq,
+                replace,
+                safeReplace,
+                responseTimeout
+            },
+            response: {
+                console: { promptFn: jest.fn() }
             }
         };
 
@@ -79,7 +110,14 @@ describe("DsHandler", () => {
         expect(copyDatasetSpy).toHaveBeenLastCalledWith(
             dummySession,
             { dsn: toDataSetName, member: toMemberName },
-            { "from-dataset": { dsn: fromDataSetName, member: fromMemberName } }
+            {
+                "from-dataset": { dsn: fromDataSetName, member: fromMemberName },
+                "enq": commandParameters.arguments.enq,
+                "replace": commandParameters.arguments.replace,
+                "responseTimeout": commandParameters.arguments.responseTimeout,
+                "safeReplace": commandParameters.arguments.safeReplace,
+                "promptFn": expect.any(Function)
+            }
         );
         expect(response).toBe(defaultReturn);
     });
@@ -93,13 +131,20 @@ describe("DsHandler", () => {
         const toDataSetName = "EFGH";
         const enq = "SHR";
         const replace = true;
+        const safeReplace = true;
+        const responseTimeout: any = undefined;
 
         const commandParameters: any = {
             arguments: {
                 fromDataSetName,
                 toDataSetName,
                 enq,
-                replace
+                replace,
+                safeReplace,
+                responseTimeout
+            },
+            response: {
+                console: { promptFn: jest.fn() }
             }
         };
 
@@ -114,9 +159,84 @@ describe("DsHandler", () => {
             {
                 "from-dataset": { dsn: commandParameters.arguments.fromDataSetName },
                 "enq": commandParameters.arguments.enq,
-                "replace": commandParameters.arguments.replace
+                "replace": commandParameters.arguments.replace,
+                "responseTimeout": commandParameters.arguments.responseTimeout,
+                "safeReplace": commandParameters.arguments.safeReplace,
+                "promptFn": expect.any(Function)
             }
         );
         expect(response).toBe(defaultReturn);
     });
+    it("should prompt the user and return true when input is 'y'", async () => {
+        const handler = new DsHandler();
+
+        expect(handler).toBeInstanceOf(ZosFilesBaseHandler);
+        const fromDataSetName = "ABCD";
+        const toDataSetName = "EFGH";
+        const enq = "SHR";
+        const replace = true;
+        const safeReplace = true;
+        const responseTimeout: any = undefined;
+
+        const commandParameters: any = {
+            arguments: {
+                fromDataSetName,
+                toDataSetName,
+                enq,
+                replace,
+                safeReplace,
+                responseTimeout
+            },
+            response: {
+                console: { promptFn: jest.fn() }
+            }
+        };
+        const promptMock = jest.fn();
+        promptMock.mockResolvedValue("y");
+
+        const promptFn = (handler as any)["promptForSafeReplace"]({ prompt: promptMock });
+        const result = await promptFn(commandParameters.arguments.toDataSetName);
+
+        expect(promptMock).toHaveBeenCalledWith(
+            `The dataset '${toDataSetName}' exists on the target system. This copy will result in data loss.` +
+            ` Are you sure you want to continue? [y/N]: `
+        );
+        expect(result).toBe(true);
+    });
+    it("should prompt the user and return true when input is 'N'", async () => {
+        const handler = new DsHandler();
+
+        expect(handler).toBeInstanceOf(ZosFilesBaseHandler);
+        const fromDataSetName = "ABCD";
+        const toDataSetName = "EFGH";
+        const enq = "SHR";
+        const replace = true;
+        const safeReplace = true;
+        const responseTimeout: any = undefined;
+
+        const commandParameters: any = {
+            arguments: {
+                fromDataSetName,
+                toDataSetName,
+                enq,
+                replace,
+                safeReplace,
+                responseTimeout
+            },
+            response: {
+                console: { promptFn: jest.fn() }
+            }
+        };
+        const promptMock = jest.fn();
+        promptMock.mockResolvedValue("N");
+
+        const promptFn = (handler as any)["promptForSafeReplace"]({ prompt: promptMock });
+        const result = await promptFn(commandParameters.arguments.toDataSetName);
+
+        expect(promptMock).toHaveBeenCalledWith(
+            `The dataset '${toDataSetName}' exists on the target system. This copy will result in data loss.` +
+            ` Are you sure you want to continue? [y/N]: `
+        );
+        expect(result).toBe(false);
+    });
 });
diff --git a/...ges/cli/__tests__/zosfiles/__unit__/copy/ds/__snapshots__/Ds.definition.unit.test.ts.snap b/...ges/cli/__tests__/zosfiles/__unit__/copy/ds/__snapshots__/Ds.definition.unit.test.ts.snap
@@ -10,6 +10,14 @@ Array [
     "name": "replace",
     "type": "boolean",
   },
+  Object {
+    "aliases": Array [
+      "safe-rep",
+    ],
+    "description": "Specify this option as true if you wish to replace like-named members or the content of the target data set. This option will prompt to confirm.",
+    "name": "safe-replace",
+    "type": "boolean",
+  },
 ]
 `;
 
@@ -35,5 +43,9 @@ Array [
     "description": "Copy the data set named 'USER.FROM.SET' to the data set named 'USER.TO.SET' and replace like-named members",
     "options": "\\"USER.FROM.SET\\" \\"USER.TO.SET\\" --replace",
   },
+  Object {
+    "description": "Copy the partitioned data set named 'TEST.PDS1' to the partitioned data set named 'TEST.PDS2'",
+    "options": "\\"USER.FROM.SET\\" \\"USER.TO.SET\\" --safe-replace",
+  },
 ]
 `;
diff --git a/packages/cli/src/zosfiles/-strings-/en.ts b/packages/cli/src/zosfiles/-strings-/en.ts
@@ -195,7 +195,9 @@ export default {
                     TODSNAME: "The name of the data set that you want to copy to"
                 },
                 OPTIONS: {
-                    REPLACE: "Specify this option as true if you wish to replace like-named members in the target data set"
+                    REPLACE: "Specify this option as true if you wish to replace like-named members in the target data set",
+                    SAFE_REPLACE: "Specify this option as true if you wish to replace like-named members or the content of the target data set. " +
+                     "This option will prompt to confirm."
                 },
                 EXAMPLES: {
                     EX1: "Copy the data set named 'USER.FROM.SET' to the data set named 'USER.TO.SET'",
@@ -204,7 +206,7 @@ export default {
                     EX4: "Copy the data set member named 'USER.FROM.SET(MEM1)' to the data set named 'USER.TO.SET'",
                     EX5: "Copy the data set named 'USER.FROM.SET' to the data set named 'USER.TO.SET' and replace like-named members",
                     EX6: "Copy the partitioned data set named 'TEST.PDS1' to the partitioned data set named 'TEST.PDS2'",
-                    EX7: "Copy the partionted data set named 'EXISTING.PDS' to a non-existent target 'NEW.PDS'"
+                    EX7: "Copy the partitioned data set named 'EXISTING.PDS' to a non-existent target 'NEW.PDS'"
                 }
             },
             DATA_SET_CROSS_LPAR: {

diff --git a/packages/cli/src/zosfiles/copy/ds/Ds.definition.ts b/packages/cli/src/zosfiles/copy/ds/Ds.definition.ts
@@ -53,6 +53,12 @@ export const DsDefinition: ICommandDefinition = {
             aliases: ["rep"],
             description: strings.OPTIONS.REPLACE,
             type: "boolean"
+        },
+        {
+            name: "safe-replace",
+            aliases: ["safe-rep"],
+            description: strings.OPTIONS.SAFE_REPLACE,
+            type: "boolean",
         }
     ] as ICommandOptionDefinition[]).sort((a, b) =>
         a.name.localeCompare(b.name)
@@ -77,6 +83,10 @@ export const DsDefinition: ICommandDefinition = {
         {
             description: strings.EXAMPLES.EX5,
             options: `"USER.FROM.SET" "USER.TO.SET" --replace`
+        },
+        {
+            description: strings.EXAMPLES.EX6,
+            options: `"USER.FROM.SET" "USER.TO.SET" --safe-replace`
         }
     ]
 };
diff --git a/packages/cli/src/zosfiles/copy/ds/Ds.handler.ts b/packages/cli/src/zosfiles/copy/ds/Ds.handler.ts
@@ -9,7 +9,7 @@
 *
 */
 
-import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
+import { AbstractSession, IHandlerParameters, IHandlerResponseConsoleApi } from "@zowe/imperative";
 import { Copy, IZosFilesResponse, IDataSet, ICopyDatasetOptions, ZosFilesUtils } from "@zowe/zos-files-for-zowe-sdk";
 import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
 
@@ -24,9 +24,21 @@ export default class DsHandler extends ZosFilesBaseHandler {
             "from-dataset": fromDataSet,
             enq: commandParameters.arguments.enq,
             replace: commandParameters.arguments.replace,
-            responseTimeout: commandParameters.arguments.responseTimeout
+            responseTimeout: commandParameters.arguments.responseTimeout,
+            safeReplace: commandParameters.arguments.safeReplace,
+            promptFn: this.promptForSafeReplace(commandParameters.response.console)
         };
 
         return Copy.dataSet(session, toDataSet, options);
     }
+
+    private promptForSafeReplace(console: IHandlerResponseConsoleApi) {
+        return async (targetDSN: string) => {
+            const answer: string = await console.prompt(
+                `The dataset '${targetDSN}' exists on the target system. This copy will result in data loss.` +
+                ` Are you sure you want to continue? [y/N]: `
+            );
+            return answer != null && (answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
+        };
+    }
 }
diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to the Imperative package will be documented in this file.
 
+## Recent Changes
+- Format fix: `DeferredPromise` and `DeferredPromise.unit.test` comment format changed to match standard.
+
 ## `8.11.0`
 
 - Enhancement: Added `DeferredPromise` class to Imperative to provide utilities for data synchronization. [#2405](https://github.com/zowe/zowe-cli/pull/2405)

diff --git a/packages/imperative/src/utilities/__tests__/DeferredPromise.unit.test.ts b/packages/imperative/src/utilities/__tests__/DeferredPromise.unit.test.ts
@@ -1,13 +1,13 @@
-/**
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- *
- */
+/*
+* This program and the accompanying materials are made available under the terms of the
+* Eclipse Public License v2.0 which accompanies this distribution, and is available at
+* https://www.eclipse.org/legal/epl-v20.html
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+* Copyright Contributors to the Zowe Project.
+*
+*/
 
 import { DeferredPromise, DeferredPromiseStatus } from "../src/DeferredPromise";
 

diff --git a/packages/imperative/src/utilities/src/DeferredPromise.ts b/packages/imperative/src/utilities/src/DeferredPromise.ts
@@ -1,13 +1,13 @@
-/**
- * This program and the accompanying materials are made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Copyright Contributors to the Zowe Project.
- *
- */
+/*
+* This program and the accompanying materials are made available under the terms of the
+* Eclipse Public License v2.0 which accompanies this distribution, and is available at
+* https://www.eclipse.org/legal/epl-v20.html
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+* Copyright Contributors to the Zowe Project.
+*
+*/
 
 /* Status of the deferred promise */
 export enum DeferredPromiseStatus {

diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md
@@ -2,8 +2,10 @@
 
 All notable changes to the Zowe z/OS files SDK package will be documented in this file.
 
-## `8.12.0`
+## Recent Changes
+- Bug Fix: The `Copy.data.set` function now prompts the user to confirm before overwriting the contents of the target data set with the addition of the `--safe-replace` option. [#2369] (https://github.com/zowe/zowe-cli/issues/2369)
 
+## `8.12.0`
 - Enhancement: The `Copy.dataset` function now creates a new data set if the entered target data set does not exist. [#2349](https://github.com/zowe/zowe-cli/issues/2349)
 - Enhancement: Added the `maxLength` option to List SDK functions (`allMembers`, `dataSetsMatchingPattern`, `membersMatchingPattern`) to specify the maximum number of items to return. [#2409](https://github.com/zowe/zowe-cli/pull/2409)
 - Enhancement: Added the `start` option to List SDK functions (`allMembers`, `dataSetsMatchingPattern`, `membersMatchingPattern`) to specify the first data set/member name to return in the response. [#2409](https://github.com/zowe/zowe-cli/pull/2409)