cortexapps-cli 0.24.1__tar.gz → 0.24.3__tar.gz

{cortexapps_cli-0.24.1 → cortexapps_cli-0.24.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cortexapps-cli
-Version: 0.24.1
+Version: 0.24.3
 Summary: Command Line Interface for cortexapps
 License: MIT
 Author: Cortex Apps
@@ -251,6 +251,125 @@ Your cortex config file will require api keys for both tenants.  It would look l
 are automatically imported by Cortex.  Cortex does not have access to any keys, so it cannot export any
 integration configurations.
 
+
+---------------------------------------------------------
+Export all services from one tenant; import into another
+---------------------------------------------------------
+
+This example shows how to export services from a tenant named :code:`myTenant-dev` and import those services into a tenant
+named :code:`myTenant`.  It is similar to the full export example "`Export from one tenant; import into another`_", but only
+exports/imports services.
+
+Your cortex config file will require api keys for both tenants.  It would look like this:
+
+.. code-block::
+
+ [myTenant]
+ api_key = <your API Key for myTenant>
+
+ [myTenant-dev]
+ api_key = <your API Key for myTenant-dev>
+
+
+**Option 1: export service YAMLs to a directory and then import them**
+
+This option is helpful in case you want to save the entity YAML files.  It makes it easy to restart or retry an import
+because you will have all YAMLs saved on disk.
+
+**Export**
+
+.. code:: bash
+
+ mkdir -p /tmp/cortex-export
+ cd /tmp/cortex-export
+ for service in `cortex -t myTenant catalog list -t service | jq -r ".entities[].tag" | sort`
+ do
+    cortex -t myTenant catalog descriptor -y -t ${service} > ${service}.yaml
+ done
+
+**Import**
+
+.. code:: bash
+
+ cd /tmp/cortex-export
+ for file in `ls -1 *.yaml`
+ do
+    cortex -t myTenant-dev catalog create -f ${file}
+ done
+
+**Option 2: combine the export and import in a single command**
+
+This option is simpler and doesn't require any disk operations.  However, if it fails for any reason you have to run the 
+entire export/import in its entirety.
+
+.. code:: bash
+
+ for service in `cortex -t myTenant catalog list -t service | jq -r ".entities[].tag" | sort`
+ do
+    echo "Processing service: ${service}"
+    cortex -t myTenant catalog descriptor -y -t ${service} | cortex -t myTenant-dev catalog create -f-
+ done
+
+---------------------------------------------------------
+Export all domains from one tenant; import into another
+---------------------------------------------------------
+
+This example shows how to export domains from a tenant named :code:`myTenant-dev` and import those domains into a tenant
+named :code:`myTenant`.  It is similar to the full export example "`Export from one tenant; import into another`_", but only
+exports/imports domains.
+
+Your cortex config file will require api keys for both tenants.  It would look like this:
+
+.. code-block::
+
+ [myTenant]
+ api_key = <your API Key for myTenant>
+
+ [myTenant-dev]
+ api_key = <your API Key for myTenant-dev>
+
+
+**Option 1: export domain YAMLs to a directory and then import them**
+
+This option is helpful in case you want to save the entity YAML files.  It makes it easy to restart or retry an import
+because you will have all YAMLs saved on disk.
+
+**Export**
+
+.. code:: bash
+
+ mkdir -p /tmp/cortex-export
+ cd /tmp/cortex-export
+ for domain in `cortex -t myTenant catalog list -t domain | jq -r ".entities[].tag" | sort`
+ do
+    echo "creating ${domain}.yaml"
+    cortex -t myTenant catalog descriptor -y -t ${domain} > ${domain}.yaml
+ done
+
+**Import**
+
+.. code:: bash
+
+ cd /tmp/cortex-export
+ for file in `ls -1 *.yaml`
+ do
+    cortex -t myTenant-dev catalog create -f ${file}
+ done
+
+**Option 2: combine the export and import in a single command**
+
+This option is simpler and doesn't require any disk operations.  However, if it fails for any reason you have to run the 
+entire export/import in its entirety.
+
+.. code:: bash
+
+ for domain in `cortex -t myTenant catalog list -t domain | jq -r ".entities[].tag" | sort`
+ do
+    echo "Processing domain: ${domain}"
+    cortex -t myTenant catalog descriptor -y -t ${domain} | cortex -t myTenant-dev catalog create -f-
+ done
+
+
 ------------------------
 Iterate over all domains
 ------------------------
@@ -480,6 +599,37 @@ Run this command for two different scorecards and diff the csv files to compare
 
   sdiff -s /tmp/scorecard1.csv /tmp/scorecard2.csv
 
+-----------------------------------------------------------------------------
+Backup all Workday teams
+-----------------------------------------------------------------------------
+
+This recipe is helpful if you change your Workday report and want to save your existing teams in case you want to restore them.
+
+For each team it will create two files:
+- a JSON file that contains the Workday data
+- a Cortex team YAML file that refers to the Workday team
+
+.. code:: bash
+
+    for team in `cortex teams list | jq -r '.teams[] | select (.type == "IDP") | select (.idpGroup.provider == "WORKDAY") | .teamTag'`
+    do
+        cortex teams get -t ${team} > ${team}.json
+        cortex catalog descriptor -y -t ${team} > ${team}.yaml
+    done
+
+-----------------------------------------------------------------------------
+Delete all Workday teams
+-----------------------------------------------------------------------------
+
+This recipe is helpful if you want to remove all Workday teams and import from scratch.
+
+.. code:: bash
+
+    for team in `cortex teams list | jq -r '.teams[] | select (.type == "IDP") | select (.idpGroup.provider == "WORKDAY") | .teamTag'`
+    do
+        cortex teams delete -t ${team}
+    done
+
 ====================================
 
 .. |PyPI download month| image:: https://img.shields.io/pypi/dm/cortexapps-cli.svg

{cortexapps_cli-0.24.1 → cortexapps_cli-0.24.3}/README.rst

@@ -230,6 +230,125 @@ Your cortex config file will require api keys for both tenants.  It would look l
 are automatically imported by Cortex.  Cortex does not have access to any keys, so it cannot export any
 integration configurations.
 
+
+---------------------------------------------------------
+Export all services from one tenant; import into another
+---------------------------------------------------------
+
+This example shows how to export services from a tenant named :code:`myTenant-dev` and import those services into a tenant
+named :code:`myTenant`.  It is similar to the full export example "`Export from one tenant; import into another`_", but only
+exports/imports services.
+
+Your cortex config file will require api keys for both tenants.  It would look like this:
+
+.. code-block::
+
+ [myTenant]
+ api_key = <your API Key for myTenant>
+
+ [myTenant-dev]
+ api_key = <your API Key for myTenant-dev>
+
+
+**Option 1: export service YAMLs to a directory and then import them**
+
+This option is helpful in case you want to save the entity YAML files.  It makes it easy to restart or retry an import
+because you will have all YAMLs saved on disk.
+
+**Export**
+
+.. code:: bash
+
+ mkdir -p /tmp/cortex-export
+ cd /tmp/cortex-export
+ for service in `cortex -t myTenant catalog list -t service | jq -r ".entities[].tag" | sort`
+ do
+    cortex -t myTenant catalog descriptor -y -t ${service} > ${service}.yaml
+ done
+
+**Import**
+
+.. code:: bash
+
+ cd /tmp/cortex-export
+ for file in `ls -1 *.yaml`
+ do
+    cortex -t myTenant-dev catalog create -f ${file}
+ done
+
+**Option 2: combine the export and import in a single command**
+
+This option is simpler and doesn't require any disk operations.  However, if it fails for any reason you have to run the 
+entire export/import in its entirety.
+
+.. code:: bash
+
+ for service in `cortex -t myTenant catalog list -t service | jq -r ".entities[].tag" | sort`
+ do
+    echo "Processing service: ${service}"
+    cortex -t myTenant catalog descriptor -y -t ${service} | cortex -t myTenant-dev catalog create -f-
+ done
+
+---------------------------------------------------------
+Export all domains from one tenant; import into another
+---------------------------------------------------------
+
+This example shows how to export domains from a tenant named :code:`myTenant-dev` and import those domains into a tenant
+named :code:`myTenant`.  It is similar to the full export example "`Export from one tenant; import into another`_", but only
+exports/imports domains.
+
+Your cortex config file will require api keys for both tenants.  It would look like this:
+
+.. code-block::
+
+ [myTenant]
+ api_key = <your API Key for myTenant>
+
+ [myTenant-dev]
+ api_key = <your API Key for myTenant-dev>
+
+
+**Option 1: export domain YAMLs to a directory and then import them**
+
+This option is helpful in case you want to save the entity YAML files.  It makes it easy to restart or retry an import
+because you will have all YAMLs saved on disk.
+
+**Export**
+
+.. code:: bash
+
+ mkdir -p /tmp/cortex-export
+ cd /tmp/cortex-export
+ for domain in `cortex -t myTenant catalog list -t domain | jq -r ".entities[].tag" | sort`
+ do
+    echo "creating ${domain}.yaml"
+    cortex -t myTenant catalog descriptor -y -t ${domain} > ${domain}.yaml
+ done
+
+**Import**
+
+.. code:: bash
+
+ cd /tmp/cortex-export
+ for file in `ls -1 *.yaml`
+ do
+    cortex -t myTenant-dev catalog create -f ${file}
+ done
+
+**Option 2: combine the export and import in a single command**
+
+This option is simpler and doesn't require any disk operations.  However, if it fails for any reason you have to run the 
+entire export/import in its entirety.
+
+.. code:: bash
+
+ for domain in `cortex -t myTenant catalog list -t domain | jq -r ".entities[].tag" | sort`
+ do
+    echo "Processing domain: ${domain}"
+    cortex -t myTenant catalog descriptor -y -t ${domain} | cortex -t myTenant-dev catalog create -f-
+ done
+
+
 ------------------------
 Iterate over all domains
 ------------------------
@@ -459,6 +578,37 @@ Run this command for two different scorecards and diff the csv files to compare
 
   sdiff -s /tmp/scorecard1.csv /tmp/scorecard2.csv
 
+-----------------------------------------------------------------------------
+Backup all Workday teams
+-----------------------------------------------------------------------------
+
+This recipe is helpful if you change your Workday report and want to save your existing teams in case you want to restore them.
+
+For each team it will create two files:
+- a JSON file that contains the Workday data
+- a Cortex team YAML file that refers to the Workday team
+
+.. code:: bash
+
+    for team in `cortex teams list | jq -r '.teams[] | select (.type == "IDP") | select (.idpGroup.provider == "WORKDAY") | .teamTag'`
+    do
+        cortex teams get -t ${team} > ${team}.json
+        cortex catalog descriptor -y -t ${team} > ${team}.yaml
+    done
+
+-----------------------------------------------------------------------------
+Delete all Workday teams
+-----------------------------------------------------------------------------
+
+This recipe is helpful if you want to remove all Workday teams and import from scratch.
+
+.. code:: bash
+
+    for team in `cortex teams list | jq -r '.teams[] | select (.type == "IDP") | select (.idpGroup.provider == "WORKDAY") | .teamTag'`
+    do
+        cortex teams delete -t ${team}
+    done
+
 ====================================
 
 .. |PyPI download month| image:: https://img.shields.io/pypi/dm/cortexapps-cli.svg

{cortexapps_cli-0.24.1 → cortexapps_cli-0.24.3}/cortexapps_cli/cortex.py

@@ -106,6 +106,10 @@ def check_config_file(config_file, replace_string):
 # config file.
 def get_config(config, args, argv, parser, replace_string):
     if os.environ.get('CORTEX_API_KEY'):
+        if args.tenant:
+            if not args.quiet:
+                print("WARNING: tenant setting overidden by CORTEX_API_KEY", file=sys.stderr)
+
         cortex_base_url = os.environ.get('CORTEX_BASE_URL', default='https://api.getcortexapp.com')
         config.update({"url": cortex_base_url})
         config.update({"api_key": os.environ.get("CORTEX_API_KEY")})
@@ -582,15 +586,37 @@ def exit(r, method, expected_rc=200, err=None):
                 sys.stderr.write("\nCheck your api_key in " + config['config_file'] + ".\n")
         debug_json(r, method)
         if err:
+            print(f'{method} {r.url} => {r.status_code} {r.reason}')
             print(err)
-        sys.exit(r.status_code)
+        
+        if not config.get('is_importing', False) or r.status_code != 409 or r.status_code != 400:
+            sys.exit(r.status_code)
     else:
         debug_json(r, method)
         print(r.text)
 
+
 def api_key(headers):
     headers.update({"Authorization": "Bearer " + config['api_key']})
 
+
+charset_utf8 = "charset=UTF-8"
+
+
+def default_headers(content_type='application/json', other={}):
+
+    if not content_type.endswith(charset_utf8):
+        content_type = content_type + ";" + charset_utf8
+
+    h = {
+        'Content-Type': content_type 
+    }
+    
+    for k, v in other.items():
+        h[k] = v
+    
+    return h
+
 # There might be a more efficient use of the requests library to combine
 # these methods into a single generic method.
 def get(url, headers={}):
@@ -838,6 +864,7 @@ def import_from_export(args):
     scorecard_directory = args.directory + "/scorecards"
     teams_directory = args.directory + "/teams"
     resource_definitions_directory = args.directory + "/resource-definitions"
+    config.update({"is_importing": True})
 
     # Default behavior is to output to terminal, so redirect stdout so it
     # can be captured as a string.
@@ -950,8 +977,10 @@ def subparser_catalog_create_or_update(subparser):
     sp.set_defaults(func=catalog_create_or_update)
 
 def catalog_create_or_update(args):
-    headers = { 'Content-Type': 'application/openapi;charset=UTF-8' }
-    post("/api/v1/open-api" + parse_opts(args), headers, read_file(args))
+    post(
+        "/api/v1/open-api" + parse_opts(args),
+        default_headers('application/openapi'), read_file(args)
+    )
 
 def subparser_catalog_delete(subparser):
     sp = subparser.add_parser('delete', help='delete entity')
@@ -1174,8 +1203,7 @@ def subparser_custom_data_add(subparser):
     sp.set_defaults(func=custom_data_add)
 
 def custom_data_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
-    post("/api/v1/catalog/" + args.tag + "/custom-data", headers, read_file(args))
+    post("/api/v1/catalog/" + args.tag + "/custom-data", default_headers(), read_file(args))
 
 def subparser_custom_data_bulk(subparser):
     sp = subparser.add_parser('bulk', help='Add multiple key/values of custom data to multiple entities')
@@ -1184,8 +1212,7 @@ def subparser_custom_data_bulk(subparser):
     sp.set_defaults(func=custom_data_bulk)
 
 def custom_data_bulk(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
-    put("/api/v1/catalog/custom-data", headers, read_file(args))
+    put("/api/v1/catalog/custom-data", default_headers(), read_file(args))
 
 def subparser_custom_data_delete(subparser):
     sp = subparser.add_parser('delete', help='Delete custom data for entity')
@@ -1255,8 +1282,7 @@ def subparser_custom_events_create(subparser):
     sp.set_defaults(func=custom_events_create)
 
 def custom_events_create(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
-    post("/api/v1/catalog/" + args.tag + "/custom-events", headers, read_file(args))
+    post("/api/v1/catalog/" + args.tag + "/custom-events", default_headers(), read_file(args))
 
 def subparser_custom_events_delete_all(subparser):
     sp = subparser.add_parser('delete-all', help='Delete all custom events for an entity') 
@@ -1304,8 +1330,7 @@ def subparser_custom_events_update_by_uuid(subparser):
     sp.set_defaults(func=custom_events_update_by_uuid)
 
 def custom_events_update_by_uuid(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
-    put("/api/v1/catalog/" + args.tag + "/custom-events/" + args.uuid, headers, read_file(args))
+    put("/api/v1/catalog/" + args.tag + "/custom-events/" + args.uuid, default_headers(), read_file(args))
 # Custom Events end
 
 # Groups start
@@ -1323,8 +1348,7 @@ def subparser_groups_add(subparser):
     sp.set_defaults(func=groups_add)
 
 def groups_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
-    put("/api/v1/catalog/"+ args.tag + "/groups", headers, payload=read_file(args))
+    put("/api/v1/catalog/"+ args.tag + "/groups", default_headers(), payload=read_file(args))
 
 def subparser_groups_delete(subparser):
     sp = subparser.add_parser('delete', help='Delete group from entity')
@@ -1333,7 +1357,7 @@ def subparser_groups_delete(subparser):
     sp.set_defaults(func=groups_delete)
 
 def groups_delete(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     delete("/api/v1/catalog/"+ args.tag + "/groups", headers, read_file(args))
 
 def subparser_groups_get(subparser):
@@ -1381,7 +1405,7 @@ def subparser_dependencies_add(subparser):
     sp.set_defaults(func=dependencies_add)
 
 def dependencies_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/" + args.callerTag + "/dependencies/" + args.calleeTag, headers, payload=read_file(args), expected_rc=201)
 
 def subparser_dependencies_add_in_bulk(subparser):
@@ -1412,7 +1436,7 @@ def subparser_dependencies_add_in_bulk(subparser):
     sp.set_defaults(func=dependencies_add_in_bulk)
 
 def dependencies_add_in_bulk(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/catalog/dependencies", headers, payload=read_file(args))
 
 def subparser_dependencies_delete(subparser):
@@ -1462,7 +1486,7 @@ def subparser_dependencies_delete_in_bulk(subparser):
     sp.set_defaults(func=dependencies_delete_in_bulk)
 
 def dependencies_delete_in_bulk(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     delete("/api/v1/catalog/dependencies", headers, payload=read_file(args), expected_rc=204)
 
 def subparser_dependencies_get(subparser):
@@ -1496,7 +1520,7 @@ def subparser_dependencies_update(subparser):
     sp.set_defaults(func=dependencies_update)
 
 def dependencies_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/catalog/" + args.callerTag + "/dependencies/" + args.calleeTag + parse_opts(args), headers, payload=read_file(args))
 # Dependencies end
 
@@ -1520,7 +1544,7 @@ def subparser_deploys_add(subparser):
     sp.set_defaults(func=deploys_add)
 
 def deploys_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/" + args.tag + "/deploys", headers, payload=read_file(args))
 
 def subparser_deploys_list(subparser):
@@ -1576,7 +1600,7 @@ def subparser_deploys_update_by_uuid(subparser):
     sp.set_defaults(func=deploys_update_by_uuid)
 
 def deploys_update_by_uuid(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/catalog/" + args.tag + "/deploys/" + args.uuid, headers, payload=read_file(args))
 # Deploys end
 
@@ -1666,7 +1690,7 @@ def subparser_docs_update(subparser):
     sp.set_defaults(func=docs_update)
 
 def docs_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/catalog/" + args.tag + "/documentation/openapi", headers, payload=read_json_from_yaml(args))
 # Docs End
 
@@ -1702,7 +1726,7 @@ def subparser_groups_add(subparser):
     sp.set_defaults(func=groups_add)
 
 def groups_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/catalog/"+ args.tag + "/groups", headers, payload=read_file(args))
 
 def subparser_groups_delete(subparser):
@@ -1712,7 +1736,7 @@ def subparser_groups_delete(subparser):
     sp.set_defaults(func=groups_delete)
 
 def groups_delete(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     delete("/api/v1/catalog/"+ args.tag + "/groups", headers, read_file(args))
 
 def subparser_groups_get(subparser):
@@ -1816,7 +1840,7 @@ def subparser_integrations_aws_add(subparser):
     sp.set_defaults(func=integrations_aws_add)
 
 def integrations_aws_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     payload="{ \"accountId\": \"" + args.accountId + "\", \"role\": \"" + args.role + "\"}"
     post("/api/v1/aws/configurations", headers, payload=payload)
 
@@ -1826,7 +1850,7 @@ def subparser_integrations_aws_update(subparser):
     sp.set_defaults(func=integrations_aws_update)
 
 def integrations_aws_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/aws/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_aws_delete(subparser):
@@ -1880,7 +1904,7 @@ def subparser_integrations_azure_resources_add(subparser):
     sp.set_defaults(func=integrations_azure_resources_add)
 
 def integrations_azure_resources_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/azure-resources/configuration", headers, payload=read_file(args))
 
 def subparser_integrations_azure_resources_add_multiple(subparser):
@@ -1907,7 +1931,7 @@ def subparser_integrations_azure_resources_add_multiple(subparser):
     sp.set_defaults(func=integrations_azure_resources_add_multiple)
 
 def integrations_azure_resources_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/azure-resources/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_azure_resources_delete(subparser):
@@ -1954,7 +1978,7 @@ def subparser_integrations_azure_resources_update(subparser):
     sp.set_defaults(func=integrations_azure_resources_update)
 
 def integrations_azure_resources_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/azure-resources/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_azure_resources_validate(subparser):
@@ -1994,7 +2018,7 @@ def subparser_integrations_coralogix_add(subparser):
     sp.set_defaults(func=integrations_coralogix_add)
 
 def integrations_coralogix_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/coralogix/configuration/", headers, payload=read_file(args))
 
 def subparser_integrations_coralogix_add_multiple(subparser):
@@ -2016,7 +2040,7 @@ def subparser_integrations_coralogix_add_multiple(subparser):
     sp.set_defaults(func=integrations_coralogix_add_multiple)
 
 def integrations_coralogix_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/coralogix/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_coralogix_delete(subparser):
@@ -2063,7 +2087,7 @@ def subparser_integrations_coralogix_update(subparser):
     sp.set_defaults(func=integrations_coralogix_update)
 
 def integrations_coralogix_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/coralogix/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_coralogix_validate(subparser):
@@ -2122,7 +2146,7 @@ def subparser_integrations_github_add(subparser):
     sp.set_defaults(func=integrations_github_add)
 
 def integrations_github_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/github/configurations/app", headers, payload=read_file(args))
 
 def subparser_integrations_github_add_personal(subparser):
@@ -2143,7 +2167,7 @@ def subparser_integrations_github_add_personal(subparser):
     sp.set_defaults(func=integrations_github_add_personal)
 
 def integrations_github_add_personal(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/github/configurations/personal", headers, payload=read_file(args))
 
 def subparser_integrations_github_delete(subparser):
@@ -2214,7 +2238,7 @@ def subparser_integrations_github_update(subparser):
     sp.set_defaults(func=integrations_github_update)
 
 def integrations_github_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/github/configurations/app/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_github_update_personal(subparser):
@@ -2224,7 +2248,7 @@ def subparser_integrations_github_update_personal(subparser):
     sp.set_defaults(func=integrations_github_update_personal)
 
 def integrations_github_update_personal(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/github/configurations/personal/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_github_validate(subparser):
@@ -2264,7 +2288,7 @@ def subparser_integrations_gitlab_add(subparser):
     sp.set_defaults(func=integrations_gitlab_add)
 
 def integrations_gitlab_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/gitlab/configuration/", headers, payload=read_file(args))
 
 def subparser_integrations_gitlab_add_multiple(subparser):
@@ -2293,7 +2317,7 @@ def subparser_integrations_gitlab_add_multiple(subparser):
     sp.set_defaults(func=integrations_gitlab_add_multiple)
 
 def integrations_gitlab_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/gitlab/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_gitlab_delete(subparser):
@@ -2340,7 +2364,7 @@ def subparser_integrations_gitlab_update(subparser):
     sp.set_defaults(func=integrations_gitlab_update)
 
 def integrations_gitlab_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/gitlab/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_gitlab_validate(subparser):
@@ -2378,7 +2402,7 @@ def subparser_integrations_datadog_add(subparser):
     sp.set_defaults(func=integrations_datadog_add)
 
 def integrations_datadog_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/datadog/configuration/", headers, payload=read_file(args))
 
 def subparser_integrations_datadog_add_multiple(subparser):
@@ -2404,7 +2428,7 @@ def subparser_integrations_datadog_add_multiple(subparser):
     sp.set_defaults(func=integrations_datadog_add_multiple)
 
 def integrations_datadog_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/datadog/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_datadog_delete(subparser):
@@ -2451,7 +2475,7 @@ def subparser_integrations_datadog_update(subparser):
     sp.set_defaults(func=integrations_datadog_update)
 
 def integrations_datadog_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/datadog/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_datadog_validate(subparser):
@@ -2502,7 +2526,7 @@ def subparser_integrations_incidentio_add(subparser):
     sp.set_defaults(func=integrations_incidentio_add)
 
 def integrations_incidentio_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/incidentio/configuration", headers, payload=read_file(args))
 
 def subparser_integrations_incidentio_add_multiple(subparser):
@@ -2531,7 +2555,7 @@ def subparser_integrations_incidentio_add_multiple(subparser):
     sp.set_defaults(func=integrations_incidentio_add_multiple)
 
 def integrations_incidentio_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/incidentio/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_incidentio_delete(subparser):
@@ -2578,7 +2602,7 @@ def subparser_integrations_incidentio_update(subparser):
     sp.set_defaults(func=integrations_incidentio_update)
 
 def integrations_incidentio_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/incidentio/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_incidentio_validate(subparser):
@@ -2618,7 +2642,7 @@ def subparser_integrations_launchdarkly_add(subparser):
     sp.set_defaults(func=integrations_launchdarkly_add)
 
 def integrations_launchdarkly_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/launchdarkly/configuration/", headers, payload=read_file(args))
 
 def subparser_integrations_launchdarkly_add_multiple(subparser):
@@ -2640,7 +2664,7 @@ def subparser_integrations_launchdarkly_add_multiple(subparser):
     sp.set_defaults(func=integrations_launchdarkly_add_multiple)
 
 def integrations_launchdarkly_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/launchdarkly/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_launchdarkly_delete(subparser):
@@ -2687,7 +2711,7 @@ def subparser_integrations_launchdarkly_update(subparser):
     sp.set_defaults(func=integrations_launchdarkly_update)
 
 def integrations_launchdarkly_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/launchdarkly/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_launchdarkly_validate(subparser):
@@ -2740,7 +2764,7 @@ def subparser_integrations_newrelic_add(subparser):
     sp.set_defaults(func=integrations_newrelic_add)
 
 def integrations_newrelic_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/newrelic/configuration", headers, payload=read_file(args))
 
 def subparser_integrations_newrelic_add_multiple(subparser):
@@ -2766,7 +2790,7 @@ def subparser_integrations_newrelic_add_multiple(subparser):
     sp.set_defaults(func=integrations_newrelic_add_multiple)
 
 def integrations_newrelic_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/newrelic/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_newrelic_delete(subparser):
@@ -2813,7 +2837,7 @@ def subparser_integrations_newrelic_update(subparser):
     sp.set_defaults(func=integrations_newrelic_update)
 
 def integrations_newrelic_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/newrelic/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_newrelic_validate(subparser):
@@ -2851,7 +2875,7 @@ def subparser_integrations_prometheus_add(subparser):
     sp.set_defaults(func=integrations_prometheus_add)
 
 def integrations_prometheus_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/prometheus/configuration/", headers, payload=read_file(args))
 
 def subparser_integrations_prometheus_add_multiple(subparser):
@@ -2874,7 +2898,7 @@ def subparser_integrations_prometheus_add_multiple(subparser):
     sp.set_defaults(func=integrations_prometheus_add_multiple)
 
 def integrations_prometheus_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/prometheus/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_prometheus_delete(subparser):
@@ -2921,7 +2945,7 @@ def subparser_integrations_prometheus_update(subparser):
     sp.set_defaults(func=integrations_prometheus_update)
 
 def integrations_prometheus_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/prometheus/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_prometheus_validate(subparser):
@@ -2955,7 +2979,7 @@ def subparser_integrations_pagerduty_add(subparser):
     sp.set_defaults(func=integrations_pagerduty_add)
 
 def integrations_pagerduty_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/pagerduty/configuration/", headers, payload=read_file(args))
 
 def subparser_integrations_pagerduty_delete(subparser):
@@ -3001,7 +3025,7 @@ def subparser_integrations_sonarqube_add(subparser):
     sp.set_defaults(func=integrations_sonarqube_add)
 
 def integrations_sonarqube_add(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/sonarqube/configuration/", headers, payload=read_file(args))
 
 def subparser_integrations_sonarqube_add_multiple(subparser):
@@ -3022,7 +3046,7 @@ def subparser_integrations_sonarqube_add_multiple(subparser):
     sp.set_defaults(func=integrations_sonarqube_add_multiple)
 
 def integrations_sonarqube_add_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/sonarqube/configurations", headers, payload=read_file(args))
 
 def subparser_integrations_sonarqube_delete(subparser):
@@ -3069,7 +3093,7 @@ def subparser_integrations_sonarqube_update(subparser):
     sp.set_defaults(func=integrations_sonarqube_update)
 
 def integrations_sonarqube_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/sonarqube/configuration/" + args.alias, headers, payload=read_file(args))
 
 def subparser_integrations_sonarqube_validate(subparser):
@@ -3124,7 +3148,7 @@ def subparser_ip_allowlist_replace(subparser):
     sp.set_defaults(func=ip_allowlist_replace)
 
 def ip_allowlist_replace(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/ip-allowlist", headers, read_file(args))
 
 def subparser_ip_allowlist_validate(subparser):
@@ -3144,10 +3168,10 @@ def subparser_ip_allowlist_validate(subparser):
                 }
                 '''))
     add_argument_file(sp, 'file containing JSON-formatted content of IP allowlist entries')
-    sp.set_defaults(func=ip_allowlist_get)
+    sp.set_defaults(func=ip_allowlist_validate)
 
 def ip_allowlist_validate(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/ip-allowlist/validate", headers, read_file(args))
 # IP Allowlist end
 
@@ -3213,7 +3237,7 @@ def subparser_packages_upload_go(subparser):
     sp.set_defaults(func=packages_upload_go)
 
 def packages_upload_go(args):
-    headers = { 'Content-Type': 'application/text;charset=UTF-8' }
+    headers = default_headers('application/text')
     post("/api/v1/catalog/"+ args.tag + "/packages/go/gosum", headers, read_file(args))
 
 def subparser_packages_delete_go(subparser):
@@ -3239,7 +3263,7 @@ def subparser_packages_upload_java_single(subparser):
     sp.set_defaults(func=packages_upload_java_single)
 
 def packages_upload_java_single(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/java", headers, read_file(args))
 
 def subparser_packages_upload_java_multiple(subparser):
@@ -3249,7 +3273,7 @@ def subparser_packages_upload_java_multiple(subparser):
     sp.set_defaults(func=packages_upload_java_multiple)
 
 def packages_upload_java_multiple(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/java/bulk", headers, read_file(args))
 
 def subparser_packages_delete_java(subparser):
@@ -3275,7 +3299,7 @@ def subparser_packages_upload_python_pipfile(subparser):
     sp.set_defaults(func=packages_upload_python_pipfile)
 
 def packages_upload_python_pipfile(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/python/pipfile", headers, read_file(args))
 
 def subparser_packages_upload_python_requirements(subparser):
@@ -3285,7 +3309,7 @@ def subparser_packages_upload_python_requirements(subparser):
     sp.set_defaults(func=packages_upload_python_requirements)
 
 def packages_upload_python_requirements(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/python/requirements", headers, read_file(args))
 
 def subparser_packages_delete_python(subparser):
@@ -3312,7 +3336,7 @@ def subparser_packages_upload_node_package(subparser):
     sp.set_defaults(func=packages_upload_node_package)
 
 def packages_upload_node_package(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/node/package-json", headers, read_file(args))
 
 def subparser_packages_upload_node_package_lock(subparser):
@@ -3322,7 +3346,7 @@ def subparser_packages_upload_node_package_lock(subparser):
     sp.set_defaults(func=packages_upload_node_package_lock)
 
 def packages_upload_node_package_lock(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/node/package-lock", headers, read_file(args))
 
 def subparser_packages_upload_node_yarn_lock(subparser):
@@ -3332,7 +3356,7 @@ def subparser_packages_upload_node_yarn_lock(subparser):
     sp.set_defaults(func=packages_upload_node_yarn_lock)
 
 def packages_upload_node_yarn_lock(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/node/yarn-lock", headers, read_file(args))
 
 def subparser_packages_delete_node(subparser):
@@ -3358,7 +3382,7 @@ def subparser_packages_upload_nuget_csproj(subparser):
     sp.set_defaults(func=packages_upload_nuget_csproj)
 
 def packages_upload_nuget_csproj(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/dotnet/nuget/csproj", headers, read_file(args))
 
 def subparser_packages_upload_nuget_packages_lock(subparser):
@@ -3368,7 +3392,7 @@ def subparser_packages_upload_nuget_packages_lock(subparser):
     sp.set_defaults(func=packages_upload_nuget_packages_lock)
 
 def packages_upload_nuget_packages_lock(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/"+ args.tag + "/packages/dotnet/nuget/packages-lock", headers, read_file(args))
 
 def subparser_packages_delete_nuget(subparser):
@@ -3422,7 +3446,7 @@ def subparser_plugins_create(subparser):
     sp.set_defaults(func=plugins_create)
 
 def plugins_create(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/plugins", headers, payload=read_file(args))
 
 def subparser_plugins_delete(subparser):
@@ -3479,7 +3503,7 @@ def subparser_plugins_update(subparser):
     sp.set_defaults(func=plugins_update)
 
 def plugins_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/plugins/" + args.tag, headers, payload=read_file(args))
 # Plugins end
 
@@ -3527,7 +3551,7 @@ def subparser_queries_run(subparser):
     sp.set_defaults(func=queries_run)
 
 def queries_run(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     if hasattr(args, "wait"):
        query_output = io.StringIO()
        with redirect_stdout(query_output):
@@ -3651,7 +3675,7 @@ def subparser_resource_definitions_create(subparser):
     sp.set_defaults(func=resource_definitions_create)
 
 def resource_definitions_create(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/catalog/definitions", headers, read_file(args))
 
 def subparser_resource_definitions_list(subparser):
@@ -3685,7 +3709,7 @@ def subparser_resource_definitions_update(subparser):
     sp.set_defaults(func=resource_definitions_update)
 
 def resource_definitions_update(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/catalog/definitions/" + args.type + parse_opts(args), headers, payload=read_file(args))
 # Resource Definitions end
 
@@ -3709,7 +3733,7 @@ def subparser_scorecards_create_or_update(subparser):
     sp.set_defaults(func=scorecards_create_or_update)
 
 def scorecards_create_or_update(args):
-    headers = { 'Content-Type': 'application/yaml;charset=UTF-8' }
+    headers = default_headers('application/yaml')
     post("/api/v1/scorecards/descriptor", headers, read_file(args))
 
 def subparser_scorecards_delete(subparser):
@@ -3806,7 +3830,7 @@ def subparser_teams_hierarchies_create(subparser):
     sp.set_defaults(func=teams_hierarchies_create)
 
 def teams_hierarchies_create(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/teams/departments", headers, read_file(args))
 
 def subparser_teams_hierarchies_get(subparser):
@@ -3853,7 +3877,7 @@ def subparser_teams_create(subparser):
     sp.set_defaults(func=teams_create)
 
 def teams_create(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/teams", headers, read_file(args))
 
 def subparser_teams_get(subparser):
@@ -3903,7 +3927,7 @@ def subparser_teams_update_metadata(subparser):
     sp.set_defaults(func=teams_update_metadata)
 
 def teams_update_metadata(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     put("/api/v1/teams/" + args.teamTag, headers, read_file(args))
 
 def subparser_teams_update_members(subparser):
@@ -3913,7 +3937,7 @@ def subparser_teams_update_members(subparser):
     sp.set_defaults(func=teams_update_members)
 
 def teams_update_members(args):
-    headers = { 'Content-Type': 'application/json;charset=UTF-8' }
+    headers = default_headers()
     post("/api/v1/teams" + parse_opts(args) + "/members", headers, read_file(args))
 # Teams end
 
@@ -3931,6 +3955,7 @@ def cli(argv=sys.argv[1:]):
     parser.add_argument('-c', '--config', help='Config location, default = ~/.cortex/config', default=os.path.expanduser('~') + '/.cortex/config')
     parser.add_argument('-d', '--debug', help='Writes request debug information as JSON to stderr', action='store_true')
     parser.add_argument('-n', '--noObfuscate', help='Do not obfuscate bearer token when debugging', action='store_true')
+    parser.add_argument('-q', '--quiet', help='Suppress warning messages when overriding tenant settings with environment variables', action='store_true')
     parser.add_argument('-t', '--tenant', default='default', help='tenant name defined in ~/.cortex/config, defaults to \'default\'',metavar='')
     parser.add_argument('-v', '--version', action='version', version=version())
     sp = parser.add_subparsers(help='sub-command help')

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