switch create to zosmf

Author: pcoop

__tests__/api/BundleContent/BundleSimple.test.ts

@@ -14,7 +14,7 @@ import * as fs from "fs";
 
 describe("Bundle01", () => {
     afterEach(() => {
-      jest.resetAllMocks();
+      jest.restoreAllMocks();
     });
     it("should read an existing bundle", () => {
 

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -57,7 +57,7 @@ const DEFAULT_PARAMTERS: IHandlerParameters = {
 describe("BundleDeployer01", () => {
 
     afterEach(() => {
-        jest.resetAllMocks();
+        jest.restoreAllMocks();
     });
     it("should complain with missing zOSMF profile for deploy", async () => {
         const createSpy = jest.spyOn(ZosmfSession, "createBasicZosmfSession").mockImplementationOnce(() => { throw new Error( "Injected Create error" ); });

__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap

@@ -1,6 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 1`] = `"DFHDPLOY stopped processing due to an error."`;
+exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 1`] = `"DFHRL2055I"`;
+
+exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 2`] = `"DFHDPLOY stopped processing due to an error."`;
 
 exports[`BundleDeployer01 should complain if SYSTSPRT not found 1`] = `"SYSTSPRT output from DFHDPLOY not found. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
@@ -12,13 +14,17 @@ exports[`BundleDeployer01 should complain if cpsmhlq not found 1`] = `"Validatio
 
 exports[`BundleDeployer01 should complain if cpsmhlq not found2 1`] = `"EYU9ABSI not found in SEYUAUTH within the --cpsmhlq dataset: abcde12345abcde12345abcde12345abcde.SEYUAUTH"`;
 
-exports[`BundleDeployer01 should complain if status can't be determined 1`] = `"DFHDPLOY command completed, but status cannot be determined."`;
+exports[`BundleDeployer01 should complain if status can't be determined 1`] = `" "`;
+
+exports[`BundleDeployer01 should complain if status can't be determined 2`] = `"DFHDPLOY command completed, but status cannot be determined."`;
 
 exports[`BundleDeployer01 should complain with missing zOSMF profile for deploy 1`] = `"Injected Create error"`;
 
 exports[`BundleDeployer01 should complain with missing zOSMF profile for undeploy 1`] = `"Injected Create error"`;
 
-exports[`BundleDeployer01 should complete with warnings  1`] = `"DFHDPLOY completed with warnings."`;
+exports[`BundleDeployer01 should complete with warnings  1`] = `"DFHRL2043I"`;
+
+exports[`BundleDeployer01 should complete with warnings  2`] = `"DFHDPLOY completed with warnings."`;
 
 exports[`BundleDeployer01 should deploy successfully 1`] = `"Bundle deployment successful."`;
 
@@ -503,7 +509,9 @@ UNDEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should support verbose=true output for deploy 1`] = `
+exports[`BundleDeployer01 should support verbose=true output for deploy 1`] = `"DFHRL2012I"`;
+
+exports[`BundleDeployer01 should support verbose=true output for deploy 2`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
 //DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
 //STEPLIB  DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
@@ -522,7 +530,9 @@ DEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should support verbose=true output for undeploy 1`] = `
+exports[`BundleDeployer01 should support verbose=true output for undeploy 1`] = `"DFHRL2037I"`;
+
+exports[`BundleDeployer01 should support verbose=true output for undeploy 2`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
 //DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
 //STEPLIB  DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -62,7 +62,7 @@ const DEFAULT_PARAMETERS: IHandlerParameters = {
 
 describe("bundle Handler", () => {
     afterEach(() => {
-        jest.resetAllMocks();
+        jest.restoreAllMocks();
     });
     it("should complain with no name parameter", async () => {
         await testNameError(undefined, "--name parameter is not set");

__tests__/cli/deploy/bundle/DeployBundle.handler.test.ts

@@ -59,7 +59,7 @@ const DEFAULT_PARAMTERS: IHandlerParameters = {
 
 describe("bundle Handler", () => {
     afterEach(() => {
-        jest.resetAllMocks();
+        jest.restoreAllMocks();
     });
     it("should process the current directory", async () => {
         DEFAULT_PARAMTERS.arguments.nosave = "true";

__tests__/cli/generate/bundle/GenerateBundle.handler.test.ts

@@ -62,7 +62,7 @@ const DEFAULT_PARAMETERS: IHandlerParameters = {
 
 describe("bundle Handler", () => {
     afterEach(() => {
-        jest.resetAllMocks();
+        jest.restoreAllMocks();
     });
     it("should complain with missing parameters", async () => {
         const params = getCommonParms();

__tests__/cli/push/bundle/PushBundle.handler.test.ts

@@ -58,7 +58,7 @@ const DEFAULT_PARAMETERS: IHandlerParameters = {
 
 describe("bundle Handler", () => {
     afterEach(() => {
-        jest.resetAllMocks();
+        jest.restoreAllMocks();
     });
     it("should complain with no parameters", async () => {
 

__tests__/cli/undeploy/bundle/UndeployBundle.handler.test.ts

@@ -12,7 +12,7 @@
 "use strict";
 
 import { IHandlerParameters, AbstractSession, ITaskWithStatus, TaskStage } from "@zowe/imperative";
-import { List, ZosmfSession, SshSession, Shell, Upload, IUploadOptions, ZosFilesAttributes } from "@zowe/cli";
+import { List, ZosmfSession, SshSession, Shell, Upload, IUploadOptions, ZosFilesAttributes, Create } from "@zowe/cli";
 import { BundleDeployer } from "../BundleDeploy/BundleDeployer";
 import { Bundle } from "../BundleContent/Bundle";
 
@@ -71,7 +71,7 @@ export class BundlePusher {
     this.params.response.progress.startBar({task: this.progressBar});
 
     // Attempt to make the target bundledir
-    await this.makeBundleDir(sshSession);
+    await this.makeBundleDir(zosMFSession);
 
     // Check that the remote bundledir is suitable.
     await this.validateBundleDirExistsAndIsEmpty(zosMFSession);
@@ -246,9 +246,31 @@ export class BundlePusher {
     this.sshOutputText += data;
   }
 
-  private async makeBundleDir(sshSession: SshSession) {
+  private async makeBundleDir(zosMFSession: AbstractSession) {
     this.updateStatus("Making remote bundle directory");
-    await this.runSshCommandInRemoteDirectory(sshSession, this.params.arguments.targetdir, "mkdir " + this.params.arguments.name);
+
+    const WARNING = 4;
+    const ALREADY_EXISTS = 19;
+    try {
+      await Create.uss(zosMFSession, this.params.arguments.bundledir, "directory");
+    }
+    catch (error) {
+      try {
+        const json = JSON.parse(error.causeErrors);
+        if (json.category === 1 &&
+            json.rc === WARNING &&
+            json.reason === ALREADY_EXISTS) {
+          // if it already exists, no worries
+          return;
+        }
+      }
+      catch (innerError) {
+        // If this occurs we probably didn't receive an ImperativeError
+      }
+
+      throw new Error("A problem occurred attempting to create directory '" + this.params.arguments.bundledir + "'. " +
+                      "Problem is: " + error.message);
+    }
   }
 
   private async deleteBundleDirContents(sshSession: SshSession) {