use bundleid in remote dir

Author: pcoop

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -325,6 +325,51 @@ describe("BundlePusher01", () => {
         expect(readSpy).toHaveBeenCalledTimes(1);
         expect(uploadSpy).toHaveBeenCalledTimes(1);
     });
+    it("should handle custom bundle id", async () => {
+        uploadSpy.mockImplementationOnce(() => { throw new Error("Injected upload error"); });
+        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\" id=\"InjectedBundleId\" ></manifest>";
+          }
+        });
+
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
+              "A problem occurred uploading the bundle to the remote directory '/u/ThisDoesNotExist/InjectedBundleId_1.0.0'. Problem is: Injected upload error");
+
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(shellSpy).toHaveBeenCalledTimes(0);
+        expect(membersSpy).toHaveBeenCalledTimes(0);
+        expect(submitSpy).toHaveBeenCalledTimes(0);
+        expect(existsSpy).toHaveBeenCalledTimes(1);
+        expect(readSpy).toHaveBeenCalledTimes(1);
+        expect(uploadSpy).toHaveBeenCalledTimes(1);
+    });
+    it("should handle custom bundle id and version", async () => {
+        uploadSpy.mockImplementationOnce(() => { throw new Error("Injected upload error"); });
+        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\" id=\"InjectedBundleId\" " +
+                   " bundleMajorVer=\"33\" bundleMinorVer=\"22\" bundleMicroVer=\"11\"></manifest>";
+          }
+        });
+
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
+              "A problem occurred uploading the bundle to the remote directory '/u/ThisDoesNotExist/InjectedBundleId_33.22.11'. Problem is: Injected upload error");
+
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(shellSpy).toHaveBeenCalledTimes(0);
+        expect(membersSpy).toHaveBeenCalledTimes(0);
+        expect(submitSpy).toHaveBeenCalledTimes(0);
+        expect(existsSpy).toHaveBeenCalledTimes(1);
+        expect(readSpy).toHaveBeenCalledTimes(1);
+        expect(uploadSpy).toHaveBeenCalledTimes(1);
+    });
     it("should handle error with remote npm install", async () => {
         shellSpy.mockImplementation((session: any, cmd: string) => {
           if (cmd.indexOf("npm install") > -1) {

src/api/BundleContent/Bundle.ts

@@ -110,6 +110,16 @@ export class Bundle {
     this.manifest.setBundleId(id);
   }
 
+  /**
+   * Returns the Bundle's version value.
+   * @returns {string}
+   * @throws ImperativeError
+   * @memberof Bundle
+   */
+  public getVersion(): string {
+    return this.manifest.getBundleVersion();
+  }
+
   /**
    * Set the Bundle's version number.
    * @param {number} majorVersion - The major version number.

src/api/BundleContent/Manifest.ts

@@ -237,6 +237,29 @@ export class Manifest {
     this.manifestAsJson.manifest.id = mangledId;
   }
 
+  /**
+   * Returns the Bundle's version number.
+   *
+   * @returns {string}
+   * @throws ImperativeError
+   * @memberof Manifest
+   */
+  public getBundleVersion(): string {
+    if (this.manifestAsJson.manifest.bundleMajorVer === undefined) {
+      this.manifestAsJson.manifest.bundleMajorVer = 1;
+    }
+    if (this.manifestAsJson.manifest.bundleMinorVer === undefined) {
+      this.manifestAsJson.manifest.bundleMinorVer = 0;
+    }
+    if (this.manifestAsJson.manifest.bundleMicroVer === undefined) {
+      this.manifestAsJson.manifest.bundleMicroVer = 0;
+    }
+
+    return this.manifestAsJson.manifest.bundleMajorVer + "." +
+           this.manifestAsJson.manifest.bundleMinorVer + "." +
+           this.manifestAsJson.manifest.bundleMicroVer;
+  }
+
   /**
    * Set the Bundle's version number.
    * @param {number} majorVersion - The major version number.

src/api/BundlePush/BundlePusher.ts

@@ -44,7 +44,7 @@ export class BundlePusher {
     this.localDirectory = localDirectory;
     this.validateParameters();
 
-    // Construct a bundledir from the targetdir and bundle name
+    // Set an initial bundledir value for validation purposes (we'll replace it with a better value shortly)
     this.params.arguments.bundledir = this.path.posix.join(this.params.arguments.targetdir, this.params.arguments.name);
   }
 
@@ -59,6 +59,12 @@ export class BundlePusher {
     const bundle = new Bundle(this.localDirectory, true, true);
     bundle.validate();
 
+    // If the bundle has an id, use it in the target directory name
+    if (bundle.getId() !== undefined) {
+      this.params.arguments.bundledir = this.path.posix.join(this.params.arguments.targetdir, bundle.getId()) +
+                                        "_" + bundle.getVersion();
+    }
+
     // Create a zOSMF session
     const zosMFSession = await this.createZosMFSession();
     // Create an SSH session