Merge pull request #65 from steven-deboer/main

Fix exit code issue for version
PaloAltoNetworks · Jun 23, 2022 · abcdd68 · abcdd68
2 parents 109c31c + 15915bc
commit abcdd68
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -78,6 +78,15 @@ jobs:
         run: |
           pc --config environment check
 
+      - name: Check CWPP version  # (previously exit code 1, should pass now)
+        env:
+          PC_SAAS_API_ENDPOINT: ${{ secrets.PC_SAAS_API_ENDPOINT }}
+          PC_COMPUTE_API_ENDPOINT: ${{ secrets.PC_COMPUTE_API_ENDPOINT }}
+          PC_ACCESS_KEY: ${{ secrets.PC_ACCESS_KEY }}
+          PC_SECRET_KEY: ${{ secrets.PC_SECRET_KEY }}
+        run: |
+          pc --config environment check
+
       - name: Check usage
         env:
           PC_SAAS_API_ENDPOINT: ${{ secrets.PC_SAAS_API_ENDPOINT }}

diff --git a/prismacloud/cli/__init__.py b/prismacloud/cli/__init__.py
@@ -339,6 +339,9 @@ def cli_output(data, sort_values=False):
         # There is no dataframe, might be just a single value, like version.
         click.echo(data)
         logging.debug("Error: %s", _exc)
+        # We have shown normal data through this exception.
+        # Exit with code 0 instead of 1.
+        sys.exit(0)
 
 
 def flatten_nested_json_df(data_frame):

diff --git a/prismacloud/cli/version.py b/prismacloud/cli/version.py
@@ -1 +1 @@
-version = "0.4.34"
+version = "0.4.35"