default .zosattributes

Author: pcoop

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -324,6 +324,50 @@ describe("BundlePusher01", () => {
         expect(existsSpy).toHaveBeenCalledTimes(1);
         expect(readSpy).toHaveBeenCalledTimes(2);
     });
+    it("should load zosattribs file", async () => {
+        existsSpy.mockImplementation((data: string) => {
+          if (data.indexOf(".zosattributes") > -1) {
+            return true;
+          }
+        });
+        readSpy.mockImplementation((data: string) => {
+          if (data.indexOf(".zosattributes") > -1) {
+            return "";
+          }
+          else if (data.indexOf("cics.xml") > -1) {
+            return "<manifest xmlns=\"http://www.ibm.com/xmlns/prod/cics/bundle\"></manifest>";
+          }
+        });
+
+        await runPushTest("__tests__/__resources__/ExampleBundle01", true,
+              "PUSH operation completed.");
+
+        expect(consoleText).not.toContain("WARNING: No .zosAttributes file found in the bundle directory, default values will be applied.");
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(1);
+        expect(shellSpy).toHaveBeenCalledTimes(1);
+        expect(membersSpy).toHaveBeenCalledTimes(2);
+        expect(submitSpy).toHaveBeenCalledTimes(2);
+        expect(existsSpy).toHaveBeenCalledTimes(2);
+        expect(readSpy).toHaveBeenCalledTimes(2);
+    });
+    it("should use a default zosattribs file", async () => {
+        await runPushTest("__tests__/__resources__/ExampleBundle01", true,
+              "PUSH operation completed.");
+
+        expect(consoleText).toContain("WARNING: No .zosAttributes file found in the bundle directory, default values will be applied.");
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(1);
+        expect(shellSpy).toHaveBeenCalledTimes(1);
+        expect(membersSpy).toHaveBeenCalledTimes(2);
+        expect(submitSpy).toHaveBeenCalledTimes(2);
+        expect(existsSpy).toHaveBeenCalledTimes(2);
+        expect(readSpy).toHaveBeenCalledTimes(1);
+    });
     it("should handle error with bundle upload", async () => {
         uploadSpy.mockImplementationOnce(() => { throw new Error("Injected upload error"); });
 

src/api/BundleContent/Bundle.ts

@@ -23,6 +23,37 @@ import { NodejsappBundlePart } from "./NodejsappBundlePart";
  */
 export class Bundle {
 
+  /**
+   * Get a template version of the .zosattributes file
+   * @returns {string}
+   * @memberof Bundle
+   */
+  public static getTemplateZosAttributesFile(): string {
+    return `#z/OS File Attributes Document
+#-----------------------------
+# This document specfies the encodings for the files within
+# the project in a form that is compatible with the
+# 'Zowe files upload dir-to-uss' command.
+#
+# Don't upload node_modules
+node_modules -
+# Don't upload things that start with dots
+.* -
+
+# Upload the following file types in binary
+*.jpg binary binary
+*.png binary binary
+*.gif binary binary
+*.zip binary binary
+*.eot binary binary
+*.svg binary binary
+*.ttf binary binary
+*.woff binary binary
+
+# Convert CICS Node.js profiles to EBCDIC
+*.profile ISO8859-1 IBM-1047`;
+  }
+
   private path = require("path");
   private fs = require("fs");
   private manifest: Manifest;
@@ -254,30 +285,7 @@ export class Bundle {
       return;
     }
 
-    const contents = "" +
-          "#z/OS File Attributes Document\n" +
-          "#-----------------------------\n" +
-          "# This document specfies the encodings for the files within\n" +
-          "# the project in a form that is compatible with the\n" +
-          "# 'Zowe files upload dir-to-uss' command.\n" +
-          "#\n" +
-          "# Don't upload node_modules\n" +
-          "node_modules -\n" +
-          "# Don't upload things that start with dots\n" +
-          ".* -\n" +
-          "\n" +
-          "# Upload the following file types in binary\n" +
-          "*.jpg binary binary\n" +
-          "*.png binary binary\n" +
-          "*.gif binary binary\n" +
-          "*.zip binary binary\n" +
-          "*.eot binary binary\n" +
-          "*.svg binary binary\n" +
-          "*.ttf binary binary\n" +
-          "*.woff binary binary\n" +
-          "\n" +
-          "# Convert CICS Node.js profiles to EBCDIC\n" +
-          "*.profile ISO8859-1 IBM-1047";
+    const contents = Bundle.getTemplateZosAttributesFile();
 
     // Write the zosattributes file
     try {

src/api/BundlePush/BundlePusher.ts

@@ -306,8 +306,8 @@ export class BundlePusher {
       const shell = await Shell.executeSshCwd(sshSession, sshCommand, directory, this.sshOutput.bind(this));
 
       // Did the SSH command work? It's unclear how to tell, but for starters let's look for common
-      // signifiers in the output text. Note that FSUM9195 implies that we've tried to delete an
-      // empty directory - that's permitted.
+      // signifiers in the output text. Note that FSUM9195 implies that we've tried to delete the
+      // contents of an empty directory - that's not a problem.
       const upperCaseOutputText = this.sshOutputText.toUpperCase();
       if (upperCaseOutputText.indexOf("ERROR ") > -1 ||
           (upperCaseOutputText.indexOf("FSUM") > -1 &&
@@ -354,7 +354,17 @@ export class BundlePusher {
                        "'. Problem is: " + error.message);
       }
     }
-    return undefined;
+
+    // A project specific .zosattributes has not been found, so use a default
+    const warningMsg = "WARNING: No .zosAttributes file found in the bundle directory, default values will be applied.";
+    this.params.response.progress.endBar();
+    this.params.response.console.log(warningMsg);
+    if (this.params.arguments.silent === undefined) {
+      const logger = Logger.getAppLogger();
+      logger.warn(warningMsg);
+    }
+    this.params.response.progress.startBar({task: this.progressBar});
+    return new ZosFilesAttributes(Bundle.getTemplateZosAttributesFile());
   }
 
   private updateStatus(status: string) {