Merge pull request #19 from zosconnect/issue/18

Handle file loading errors
zosconnect · Mar 26, 2019 · 5664d41 · 5664d41
2 parents 3a49d33 + bf049d3
commit 5664d41
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 6 deletions.
diff --git a/src/cli/api/install/install.handler.ts b/src/cli/api/install/install.handler.ts
@@ -7,7 +7,13 @@ import { ConnectionUtil } from "../../../connection";
 export default class ApiInstallHandler implements ICommandHandler {
     public async process(commandParameters: IHandlerParameters) {
         const filePath = commandParameters.arguments.file;
-        const fileBuf = fs.readFileSync(filePath);
+        let fileBuf;
+        try {
+            fileBuf = fs.readFileSync(filePath);
+        } catch (error) {
+            commandParameters.response.console.error(`Unable to load AAR file (${error.message})`);
+            return;
+        }
 
         const profile = commandParameters.profiles.get("zosconnect");
         const session = ConnectionUtil.getSession(profile);

diff --git a/src/cli/api/update/update.handler.ts b/src/cli/api/update/update.handler.ts
@@ -7,7 +7,13 @@ import { ConnectionUtil } from "../../../connection";
 export default class ApiUpdateHander implements ICommandHandler {
     public async process(commandParameters: IHandlerParameters) {
         const filePath = commandParameters.arguments.file;
-        const fileBuf = fs.readFileSync(filePath);
+        let fileBuf;
+        try {
+            fileBuf = fs.readFileSync(filePath);
+        } catch (error) {
+            commandParameters.response.console.error(`Unable to load AAR file (${error.message})`);
+            return;
+        }
 
         const profile = commandParameters.profiles.get("zosconnect");
         const session = ConnectionUtil.getSession(profile);

diff --git a/src/cli/apirequester/install/install.handler.ts b/src/cli/apirequester/install/install.handler.ts
@@ -7,7 +7,13 @@ import { ConnectionUtil } from "../../../connection";
 export default class ApiRequsterInstallHandler implements ICommandHandler {
     public async process(commandParameters: IHandlerParameters): Promise<void> {
         const filePath = commandParameters.arguments.file;
-        const fileBuf = fs.readFileSync(filePath);
+        let fileBuf;
+        try {
+            fileBuf = fs.readFileSync(filePath);
+        } catch (error) {
+            commandParameters.response.console.error(`Unable to load ARA file (${error.message})`);
+            return;
+        }
 
         const profile = commandParameters.profiles.get("zosconnect");
         const session = ConnectionUtil.getSession(profile);

diff --git a/src/cli/apirequester/update/update.handler.ts b/src/cli/apirequester/update/update.handler.ts
@@ -7,7 +7,13 @@ import { ConnectionUtil } from "../../../connection";
 export default class ApiRequesterUpdateHander implements ICommandHandler {
     public async process(commandParameters: IHandlerParameters) {
         const filePath = commandParameters.arguments.file;
-        const fileBuf = fs.readFileSync(filePath);
+        let fileBuf;
+        try {
+            fileBuf = fs.readFileSync(filePath);
+        } catch (error) {
+            commandParameters.response.console.error(`Unable to load ARA file (${error.message})`);
+            return;
+        }
 
         const profile = commandParameters.profiles.get("zosconnect");
         const session = ConnectionUtil.getSession(profile);

diff --git a/src/cli/service/install/install.handler.ts b/src/cli/service/install/install.handler.ts
@@ -7,7 +7,13 @@ import { ConnectionUtil } from "../../../connection";
 export default class ServiceInstallHandler implements ICommandHandler {
     public async process(commandParameters: IHandlerParameters): Promise<void> {
         const filePath = commandParameters.arguments.file;
-        const fileBuf = fs.readFileSync(filePath);
+        let fileBuf;
+        try {
+            fileBuf = fs.readFileSync(filePath);
+        } catch (error) {
+            commandParameters.response.console.error(`Unable to load SAR file (${error.message})`);
+            return;
+        }
 
         const profile = commandParameters.profiles.get("zosconnect");
         const session = ConnectionUtil.getSession(profile);

diff --git a/src/cli/service/update/update.handler.ts b/src/cli/service/update/update.handler.ts
@@ -7,7 +7,13 @@ import { ConnectionUtil } from "../../../connection";
 export default class UpdateHandler implements ICommandHandler {
     public async process(commandParameters: IHandlerParameters): Promise<void> {
         const filePath = commandParameters.arguments.file;
-        const fileBuf = fs.readFileSync(filePath);
+        let fileBuf;
+        try {
+            fileBuf = fs.readFileSync(filePath);
+        } catch (error) {
+            commandParameters.response.console.error(`Unable to load SAR file (${error.message})`);
+            return;
+        }
 
         const profile = commandParameters.profiles.get("zosconnect");
         const session = ConnectionUtil.getSession(profile);