Fix cmd output

docker · Aug 21, 2020 · 16d491f · 16d491f
1 parent 04f461c
commit 16d491f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/aws.ts b/src/aws.ts
@@ -6,6 +6,10 @@ export const isECR = async (registry: string): Promise<boolean> => {
   return registry.includes('amazonaws');
 };
 
+export const getRegion = async (registry: string): Promise<string> => {
+  return registry.substring(registry.indexOf('ecr.') + 4, registry.indexOf('.amazonaws'));
+};
+
 export const getCLI = async (): Promise<string> => {
   return io.which('aws', true);
 };
@@ -14,8 +18,11 @@ export const getCLICmdOutput = async (args: string[]): Promise<string> => {
   return execm.exec(await getCLI(), args, true).then(res => {
     if (res.stderr != '' && !res.success) {
       throw new Error(res.stderr);
+    } else if (res.stderr != '') {
+      return res.stderr.trim();
+    } else {
+      return res.stdout.trim();
     }
-    return res.stdout;
   });
 };
 
@@ -30,7 +37,3 @@ export const parseCLIVersion = async (stdout: string): Promise<string | undefine
   }
   return undefined;
 };
-
-export const getRegion = async (registry: string): Promise<string> => {
-  return registry.substring(registry.indexOf('ecr.') + 4, registry.indexOf('.amazonaws'));
-};