returns appropriate status codes on errors

trek10inc · May 11, 2021 · ebd1979 · ebd1979
1 parent 9187803
commit ebd1979
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 7 deletions.
diff --git a/awsume/__data__.py b/awsume/__data__.py
@@ -1,4 +1,4 @@
-version = '4.5.1a3'
+version = '4.5.1a4'
 
 name = 'awsume'
 author = 'Trek10, Inc'

diff --git a/awsume/awsumepy/app.py b/awsume/awsumepy/app.py
@@ -286,5 +286,6 @@ def run(self, system_arguments: list):
             logger.debug('', exc_info=True)
             if self.is_interactive:
                 safe_print('Awsume error: {}'.format(e), color=colorama.Fore.RED)
+                sys.exit(1)
             else:
                 raise
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -7,6 +7,7 @@
 - [#92](https://github.com/trek10inc/awsume/issues/92) Adds support for fish shell, including custom alias to target `awsume.fish`
 - Adds support for `data` argument in `exceptions.EarlyExit` to return data to non-interactive awsume executions
 - [#123](https://github.com/trek10inc/awsume/issues/123) `awsume -l` will not print profiles if awsume is executing non-interactively, instead it will return a dictionary with one key, `profiles`, that maps to another dictionary where each key is a profile name and each value is a dictionary containing that profile's configuration and credentials
+- [#142](https://github.com/trek10inc/awsume/issues/142) Returns appropriate exit codes on errors
 
 ## [4.5.0] - 2020-11-20 - `credential_process` support
 

diff --git a/shell_scripts/awsume b/shell_scripts/awsume
@@ -2,7 +2,11 @@
 
 #AWSUME_FLAG - what awsumepy told the shell to do
 #AWSUME_n - the data from awsumepy
-read AWSUME_FLAG AWSUME_1 AWSUME_2 AWSUME_3 AWSUME_4 AWSUME_5 AWSUME_6 AWSUME_7 <<< $(awsumepy "$@")
+
+AWSUME_OUTPUT=$(awsumepy "$@")
+AWSUME_STATUS=$?
+read AWSUME_FLAG AWSUME_1 AWSUME_2 AWSUME_3 AWSUME_4 AWSUME_5 AWSUME_6 AWSUME_7 <<< $(echo $AWSUME_OUTPUT)
+
 # remove carraige return
 AWSUME_FLAG=$(echo "$AWSUME_FLAG" | tr -d '\r')
 
@@ -173,3 +177,5 @@ elif [ "$AWSUME_FLAG" = "Awsume" ]; then
     fi
   done
 fi
+
+return $AWSUME_STATUS
diff --git a/shell_scripts/awsume.bat b/shell_scripts/awsume.bat
@@ -2,8 +2,10 @@
 
 set SHOW=
 
-awsumepy %* > ./temp.txt
-set /p AWSUME_TEXT=<./temp.txt
+awsumepy %* > %TEMP%\temp.txt
+set AWSUME_STATUS=%ERRORLEVEL%
+set /p AWSUME_TEXT=<%TEMP%\temp.txt
+del %TEMP%\temp.txt
 
 FOR %%A IN (%*) DO (
     IF "%%A"=="-s" (set "SHOW=y")
@@ -116,7 +118,7 @@ for /f "tokens=1,2,3,4,5,6,7,8 delims= " %%a in ("%AWSUME_TEXT%") do (
             set AWS_SECRET_ACCESS_KEY=%%c)
 
         if "%%d" NEQ "None" (
-            set AWS_SESSION_TOKEN=%%d
+            set AWS_SESSION_TOKEN=%%d)
 
         if "%%e" NEQ "None" (
             set AWS_REGION=%%e
@@ -140,7 +142,7 @@ for /f "tokens=1,2,3,4,5,6,7,8 delims= " %%a in ("%AWSUME_TEXT%") do (
                     echo set AWS_SECRET_ACCESS_KEY=%%c)
 
                 if "%%d" NEQ "None" (
-                    echo set AWS_SESSION_TOKEN=%%d
+                    echo set AWS_SESSION_TOKEN=%%d)
 
                 if "%%e" NEQ "None" (
                     echo set AWS_REGION=%%e
@@ -159,3 +161,5 @@ for /f "tokens=1,2,3,4,5,6,7,8 delims= " %%a in ("%AWSUME_TEXT%") do (
         )
     )
 )
+
+Exit /b %AWSUME_STATUS%
diff --git a/shell_scripts/awsume.fish b/shell_scripts/awsume.fish
@@ -2,14 +2,17 @@
 
 #AWSUME_FLAG - what awsumepy told the shell to do
 #AWSUME_n - the data from awsumepy
-awsumepy $argv | read AWSUME_FLAG AWSUME_1 AWSUME_2 AWSUME_3 AWSUME_4 AWSUME_5 AWSUME_6 AWSUME_7
+set AWSUME_OUTPUT (awsumepy $argv)
+set AWSUME_STATUS $status
+echo $AWSUME_OUTPUT | read AWSUME_FLAG AWSUME_1 AWSUME_2 AWSUME_3 AWSUME_4 AWSUME_5 AWSUME_6 AWSUME_7
 
 # remove carraige return
 set -gx AWSUME_FLAG (echo $AWSUME_FLAG | tr -d '\r')
 
 if test "$AWSUME_FLAG" = "usage:"
   awsumepy $argv
 
+
 else if test "$AWSUME_FLAG" = "Version"
   awsumepy $argv
 
@@ -165,3 +168,5 @@ else if test "$AWSUME_FLAG" = "Awsume"
     end
   end
 end
+
+exit $AWSUME_STATUS
diff --git a/shell_scripts/awsume.ps1 b/shell_scripts/awsume.ps1
@@ -4,6 +4,7 @@
 #AWSUME_n - the data from awsumepy
 $AWSUME_FLAG, $AWSUME_1, $AWSUME_2, $AWSUME_3, $AWSUME_4, $AWSUME_5, $AWSUME_6, $AWSUME_7 = `
 $(awsumepy $args) -split '\s+'
+$env:AWSUME_STATUS = $LASTEXITCODE
 
 #if incorrect flag/help
 if ( $AWSUME_FLAG -eq "usage:" ) {
@@ -184,3 +185,5 @@ elseif ( $AWSUME_FLAG -eq "Awsume") {
         }
     }
 }
+
+exit $env:AWSUME_STATUS