cortexapps-cli 0.26.4__tar.gz → 0.26.6__tar.gz

{cortexapps_cli-0.26.4 → cortexapps_cli-0.26.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cortexapps-cli
-Version: 0.26.4
+Version: 0.26.6
 Summary: Command Line Interface for cortexapps
 License: MIT
 Author: Cortex Apps

{cortexapps_cli-0.26.4 → cortexapps_cli-0.26.6}/cortexapps_cli/cortex.py

@@ -423,13 +423,13 @@ def add_argument_page(subparser, help_text='Page number to return, 0 indexed'):
             metavar=''
     )
 
-def add_argument_page_size(subparser, help_text='Page size for results, default = 50'):
+def add_argument_page_size(subparser, help_text='Page size for results'):
     subparser.add_argument(
             '-z',
             '--pageSize',
             help=help_text,
             required=False,
-            default=50,
+            default=argparse.SUPPRESS,
             metavar=''
     )
 
@@ -607,7 +607,8 @@ def exit(r, method, expected_rc=200, err=None):
         debug_json(r, method)
         if err:
             print(f'{method} {r.url} => {r.status_code} {r.reason}')
-            print(err)
+            if err != None:
+                print(err)
         
         if not config.get('is_importing', False) or r.status_code != 409 or r.status_code != 400:
             sys.exit(r.status_code)
@@ -643,12 +644,17 @@ def get(url, headers={}):
     api_key(headers)
 
     err = None
+    details = None
     try:
         r = requests.get(config['url'] + url, headers=headers)
         r.raise_for_status()
     except requests.exceptions.RequestException as e:
         err = e.response.text
-    exit(r, 'GET')
+        if err != "":
+            if details in e.response.json():
+               details = e.response.json()['details']
+    exit(r, 'GET', err = details)
+
 
 def put(url, headers={}, payload=""):
     api_key(headers)
@@ -809,6 +815,9 @@ def export(args):
                 f1 = open(catalog_directory + "/" + output_tag + ".yaml", 'w')
                 f1.write(str(descriptor) + "\n")
 
+    # Remove page from args so we don't paginate subsequent calls.
+    delattr(args, 'page')
+
     if any(export_type == "ALL" or export_type == "ip-allowlist" for export_type in args.types.split()):
         print("Getting IP Allowlist definitions")
         ip_allowlist_json=json_directory + "/ip-allowlist.json"

{cortexapps_cli-0.26.4 → cortexapps_cli-0.26.6}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "cortexapps-cli"
 # version will be incremented via command line as part of github actions build
-version = "0.26.4"
+version = "0.26.6"
 description = "Command Line Interface for cortexapps"
 license = "MIT"
 authors = [