cortexapps-cli 0.17.0__tar.gz → 0.19.0__tar.gz

{cortexapps_cli-0.17.0 → cortexapps_cli-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cortexapps-cli
-Version: 0.17.0
+Version: 0.19.0
 Summary: Command Line Interface for cortexapps
 License: MIT
 Author: Cortex Apps
@@ -268,7 +268,7 @@ Your cortex config file will require api keys for both tenants.  It would look l
 
 .. code:: bash
 
- cortex backup import -d <directory created by export>
+ cortex -t myTenant backup import -d <directory created by export>
 
 
 **NOTE:** some content will not be exported, including integration configurations and resources that
@@ -383,6 +383,24 @@ Modify all github basepath values for domain entitities, changing '-' to '_'
      cortex catalog descriptor -y -t ${domain} | yq ".info.x-cortex-git.github.basepath |= sub(\"-\", \"_\")" | cortex catalog create -f-
   done
 
+-----------------------------------------------------------------------------
+Modify deploys based on selection criteria
+-----------------------------------------------------------------------------
+
+This example fixes a typo in the deployment environment field, changing PYPI.org to PyPI.org.
+
+It loops over each selected array element based on the search criteria, removes the uuid attribute (because that is not included in the payload), 
+assigns the environment attribute to the correct value and invokes the CLI with that input.
+
+.. code:: bash
+
+  cortex deploys list -t cli > /tmp/deploys.json
+  for uuid in `cat /tmp/deploys.json | jq -r '.deployments[] | select(.environment=="PYPI.org") | .uuid'`
+  do
+     cat /tmp/deploys.json | jq ".deployments[] | select (.uuid==\"${uuid}\") | del(.uuid) | .environment = \"PyPI.org\"" | cortex deploys update-by-uuid -t cli -u ${uuid} -f-
+  done
+
+
 ====================================
 
 .. |PyPI download month| image:: https://img.shields.io/pypi/dm/cortexapps-cli.svg

{cortexapps_cli-0.17.0 → cortexapps_cli-0.19.0}/README.rst

@@ -247,7 +247,7 @@ Your cortex config file will require api keys for both tenants.  It would look l
 
 .. code:: bash
 
- cortex backup import -d <directory created by export>
+ cortex -t myTenant backup import -d <directory created by export>
 
 
 **NOTE:** some content will not be exported, including integration configurations and resources that
@@ -362,6 +362,24 @@ Modify all github basepath values for domain entitities, changing '-' to '_'
      cortex catalog descriptor -y -t ${domain} | yq ".info.x-cortex-git.github.basepath |= sub(\"-\", \"_\")" | cortex catalog create -f-
   done
 
+-----------------------------------------------------------------------------
+Modify deploys based on selection criteria
+-----------------------------------------------------------------------------
+
+This example fixes a typo in the deployment environment field, changing PYPI.org to PyPI.org.
+
+It loops over each selected array element based on the search criteria, removes the uuid attribute (because that is not included in the payload), 
+assigns the environment attribute to the correct value and invokes the CLI with that input.
+
+.. code:: bash
+
+  cortex deploys list -t cli > /tmp/deploys.json
+  for uuid in `cat /tmp/deploys.json | jq -r '.deployments[] | select(.environment=="PYPI.org") | .uuid'`
+  do
+     cat /tmp/deploys.json | jq ".deployments[] | select (.uuid==\"${uuid}\") | del(.uuid) | .environment = \"PyPI.org\"" | cortex deploys update-by-uuid -t cli -u ${uuid} -f-
+  done
+
+
 ====================================
 
 .. |PyPI download month| image:: https://img.shields.io/pypi/dm/cortexapps-cli.svg

{cortexapps_cli-0.17.0 → cortexapps_cli-0.19.0}/cortexapps_cli/cortex.py

@@ -571,7 +571,7 @@ def debug_json(r, method):
         json_data = json.dumps(data)
         print(json_data, file=sys.stderr)
 
-def exit(r, method, expected_rc=200):
+def exit(r, method, expected_rc=200, err=None):
     if r.status_code != expected_rc:
         sys.stderr.write(r.reason + "\n")
         if r.status_code == 401:
@@ -580,6 +580,8 @@ def exit(r, method, expected_rc=200):
             else:
                 sys.stderr.write("\nCheck your api_key in " + config['config_file'] + ".\n")
         debug_json(r, method)
+        if err:
+            print(err)
         sys.exit(r.status_code)
     else:
         debug_json(r, method)
@@ -592,26 +594,47 @@ def api_key(headers):
 # these methods into a single generic method.
 def get(url, headers={}):
     api_key(headers)
-    r = requests.get(config['url'] + url, headers=headers)
+
+    err = 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')
 
 def put(url, headers={}, payload=""):
     api_key(headers)
 
-    r = requests.put(config['url'] + url, headers=headers, data=payload)
+    err = None
+    try:
+        r = requests.put(config['url'] + url, headers=headers, data=payload)
+        r.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        err = e.response.text
     exit(r, 'PUT')
 
 def delete(url, headers={}, payload="", expected_rc=200):
     api_key(headers)
 
-    r = requests.delete(config['url'] + url, headers=headers, data=payload)
+    err = None
+    try:
+        r = requests.delete(config['url'] + url, headers=headers, data=payload)
+        r.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        err = e.response.text
     exit(r, 'DELETE', expected_rc)
 
 def post(url, headers={}, payload="", expected_rc=200):
     api_key(headers)
 
-    r = requests.post(config['url'] + url, headers=headers,data=payload)
-    exit(r, 'POST', expected_rc)
+    err = None
+    try:
+        r = requests.post(config['url'] + url, headers=headers,data=payload)
+        r.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        err = e.response.text
+    exit(r, 'POST', expected_rc, err)
 
 # Generate HTTP API options.  Everything in the Namespace argparse object is
 # added to the URL with the exception of those listed in the array below.
@@ -1638,6 +1661,23 @@ def docs_update(args):
     put("/api/v1/catalog/" + args.tag + "/documentation/openapi", headers, payload=read_json_from_yaml(args))
 # Docs End
 
+# Gitops Logs Start
+def subparser_gitops_logs_opts(subparsers):
+    p = subparsers.add_parser('gitops-logs', help='Gitops logs commands')
+    sp = p.add_subparsers(help='gitops-logs subcommand help')
+
+    subparser_gitops_logs_get(sp)
+
+def subparser_gitops_logs_get(subparser):
+    sp = subparser.add_parser('get', help='Retrieve GitOps logs')
+    add_argument_page(sp)
+    add_argument_page_size(sp)
+    sp.set_defaults(func=gitops_logs_get)
+
+def gitops_logs_get(args):
+    get("/api/v1/gitops-logs/" + parse_opts(args))
+# Gitops Logs End
+
 # Groups start
 def subparser_groups_opts(subparsers):
     p = subparsers.add_parser('groups', help='groups commands')
@@ -3894,6 +3934,7 @@ def cli(argv=sys.argv[1:]):
     subparser_deploys_opts(sp)
     subparser_discovery_audit_opts(sp)
     subparser_docs_opts(sp)
+    subparser_gitops_logs_opts(sp)
     subparser_groups_opts(sp)
     subparser_integrations_opts(sp)
     subparser_ip_allowlist_opts(sp)

{cortexapps_cli-0.17.0 → cortexapps_cli-0.19.0}/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.17.0"
+version = "0.19.0"
 description = "Command Line Interface for cortexapps"
 license = "MIT"
 authors = [