cortexapps-cli 1.7.0__tar.gz → 1.10.0__tar.gz

{cortexapps_cli-1.7.0 → cortexapps_cli-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cortexapps-cli
-Version: 1.7.0
+Version: 1.10.0
 Summary: Command Line Interface for cortexapps
 License: MIT
 License-File: LICENSE
@@ -18,7 +18,7 @@ Requires-Dist: click (<8.2)
 Requires-Dist: pyyaml (>=6.0.1,<7)
 Requires-Dist: requests (>=2.32.4,<3.0.0)
 Requires-Dist: typer (>=0.12.5,<0.13.0)
-Requires-Dist: urllib3 (>=2.2.2)
+Requires-Dist: urllib3 (>=2.6.0)
 Project-URL: Bug Tracker, https://github.com/cortexapps/cli/issues
 Project-URL: Changes,  https://github.com/cortexapps/cli/blob/main/HISTORY.md
 Project-URL: Documentation,  https://github.com/cortexapps/cli/blob/main/README.rst

{cortexapps_cli-1.7.0 → cortexapps_cli-1.10.0}/cortexapps_cli/commands/backup.py

@@ -698,3 +698,7 @@ def import_tenant(
                 print(f"cortex scorecards create -f \"{file_path}\"")
             elif import_type == "workflows":
                 print(f"cortex workflows create -f \"{file_path}\"")
+
+    # Exit with non-zero code if any imports failed
+    if total_failed > 0:
+        raise typer.Exit(1)

{cortexapps_cli-1.7.0 → cortexapps_cli-1.10.0}/cortexapps_cli/commands/integrations_commands/newrelic.py

@@ -1,16 +1,24 @@
+from enum import Enum
 import json
 from rich import print_json
 import typer
 from typing_extensions import Annotated
+from cortexapps_cli.command_options import ListCommandOptions
+from cortexapps_cli.utils import print_output_with_context
 
 app = typer.Typer(help="New Relic commands", no_args_is_help=True)
 
-@app.command()
+class Region(str, Enum):
+    US = "US"
+    EU = "EU"
+
+@app.command(no_args_is_help=True)
 def add(
     ctx: typer.Context,
-    alias: str = typer.Option(..., "--alias", "-a", help="Alias for this configuration"),
-    api_key: str = typer.Option(..., "--api-key", "-api", help="API key"),
-    host: str = typer.Option(None, "--host", "-h", help="Optional host name"),
+    alias: str = typer.Option(None, "--alias", "-a", help="Alias for this configuration"),
+    account_id: str = typer.Option(None, "--account-id", "-acc", help="New Relic account ID"),
+    personal_key: str = typer.Option(None, "--personal-key", "-pk", help="New Relic personal API key"),
+    region: Region = typer.Option(Region.US, "--region", "-r", help="Region (US or EU)"),
     is_default: bool = typer.Option(False, "--is-default", "-i", help="If this is the default configuration"),
     file_input: Annotated[typer.FileText, typer.Option("--file", "-f", help="JSON file containing configurations, if command line options not used; can be passed as stdin with -, example: -f-")] = None,
 ):
@@ -21,40 +29,56 @@ def add(
     client = ctx.obj["client"]
 
     if file_input:
-        if alias or api_key or is_default or host:
-            raise typer.BadParameter("When providing a custom event definition file, do not specify any other custom event attributes")
+        if alias or account_id or personal_key:
+            raise typer.BadParameter("When providing a file, do not specify --alias, --account-id, or --personal-key")
         data = json.loads("".join([line for line in file_input]))
     else:
+        if not alias or not account_id or not personal_key:
+            raise typer.BadParameter("--alias, --account-id, and --personal-key are required when not using --file")
+        if not personal_key.startswith("NRAK"):
+            raise typer.BadParameter("--personal-key must start with 'NRAK'")
         data = {
            "alias": alias,
-           "apiKey": api_key,
-           "host": host,
+           "accountId": account_id,
+           "personalKey": personal_key,
+           "region": region.value,
            "isDefault": is_default,
-        }       
+        }
 
-        # remove any data elements that are None - can only be is_default
-        data = {k: v for k, v in data.items() if v is not None}
-    
     r = client.post("api/v1/newrelic/configuration", data=data)
     print_json(data=r)
 
-@app.command()
+@app.command(no_args_is_help=True)
 def add_multiple(
     ctx: typer.Context,
     file_input: Annotated[typer.FileText, typer.Option("--file", "-f", help="JSON file containing configurations; can be passed as stdin with -, example: -f-")] = None,
 ):
     """
     Add multiple configurations
+
+    JSON file format:
+    \b
+    {
+      "configurations": [
+        {
+          "accountId": 1,
+          "alias": "text",
+          "isDefault": true,
+          "personalKey": "text",
+          "region": "US"
+        }
+      ]
+    }
     """
 
     client = ctx.obj["client"]
 
     data = json.loads("".join([line for line in file_input]))
 
-    r = client.put("api/v1/newrelic/configurations", data=data)
+    r = client.post("api/v1/newrelic/configurations", data=data)
     print_json(data=r)
 
-@app.command()
+@app.command(no_args_is_help=True)
 def delete(
     ctx: typer.Context,
     alias: str = typer.Option(..., "--alias", "-a", help="The alias of the configuration"),
@@ -81,7 +105,7 @@ def delete_all(
     r = client.delete("api/v1/newrelic/configurations")
     print_json(data=r)
 
-@app.command()
+@app.command(no_args_is_help=True)
 def get(
     ctx: typer.Context,
     alias: str = typer.Option(..., "--alias", "-a", help="The alias of the configuration"),
@@ -98,6 +122,12 @@ def get(
 @app.command()
 def list(
     ctx: typer.Context,
+    table_output: ListCommandOptions.table_output = False,
+    csv_output: ListCommandOptions.csv_output = False,
+    columns: ListCommandOptions.columns = [],
+    no_headers: ListCommandOptions.no_headers = False,
+    filters: ListCommandOptions.filters = [],
+    sort: ListCommandOptions.sort = [],
 ):
     """
     Get all configurations
@@ -105,8 +135,16 @@ def list(
 
     client = ctx.obj["client"]
 
+    if (table_output or csv_output) and not ctx.params.get('columns'):
+        ctx.params['columns'] = [
+            "Alias=alias",
+            "AccountId=accountId",
+            "Region=region",
+            "IsDefault=isDefault",
+        ]
+
     r = client.get("api/v1/newrelic/configurations")
-    print_json(data=r)
+    print_output_with_context(ctx, r)
 
 @app.command()
 def get_default(
@@ -122,7 +160,7 @@ def get_default(
     print_json(data=r)
 
 
-@app.command()
+@app.command(no_args_is_help=True)
 def update(
     ctx: typer.Context,
     alias: str = typer.Option(..., "--alias", "-a", help="The alias of the configuration"),
@@ -142,7 +180,7 @@ def update(
     r = client.put("api/v1/newrelic/configuration/" + alias, data=data)
     print_json(data=r)
 
-@app.command()
+@app.command(no_args_is_help=True)
 def validate(
     ctx: typer.Context,
     alias: str = typer.Option(..., "--alias", "-a", help="The alias of the configuration"),
@@ -153,7 +191,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/newrelic/configurations/validate" + alias)
+    r = client.post("api/v1/newrelic/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -166,5 +204,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/newrelic/configurations")
+    r = client.post("api/v1/newrelic/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.7.0 → cortexapps_cli-1.10.0}/cortexapps_cli/cortex_client.py

@@ -149,6 +149,23 @@ class CortexClient:
                 # try to parse the error message
                 error = response.json()
                 status = response.status_code
+
+                # Check for validation error format with violations array
+                if 'violations' in error and isinstance(error['violations'], list):
+                    print(f'[red][bold]HTTP Error {status}[/bold][/red]: Validation failed')
+                    for violation in error['violations']:
+                        title = violation.get('title', 'Validation Error')
+                        description = violation.get('description', 'No description')
+                        violation_type = violation.get('violationType', '')
+                        pointer = violation.get('pointer', '')
+                        print(f'  [yellow]{title}[/yellow]: {description}')
+                        if pointer:
+                            print(f'    [dim]Location: {pointer}[/dim]')
+                        if violation_type:
+                            print(f'    [dim]Type: {violation_type}[/dim]')
+                    raise typer.Exit(code=1)
+
+                # Standard error format with message/details
                 message = error.get('message', 'Unknown error')
                 details = error.get('details', 'No details')
                 request_id = error.get('requestId', 'No request ID')
@@ -156,8 +173,12 @@ class CortexClient:
                 print(error_str)
                 raise typer.Exit(code=1)
             except json.JSONDecodeError:
-                # if we can't parse the error message, just raise the HTTP error
-                response.raise_for_status()
+                # if we can't parse the error message, print a clean error and exit
+                status = response.status_code
+                reason = response.reason or 'Unknown error'
+                error_str = f'[red][bold]HTTP Error {status}[/bold][/red]: {reason}'
+                print(error_str)
+                raise typer.Exit(code=1)
 
         if raw_response:
             return response

{cortexapps_cli-1.7.0 → cortexapps_cli-1.10.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 = "1.7.0"
+version = "1.10.0"
 description = "Command Line Interface for cortexapps"
 license = "MIT"
 authors = [
@@ -19,7 +19,7 @@ classifiers = [
 python = "^3.11"
 requests = "^2.32.4"
 pyyaml = ">= 6.0.1, < 7"
-urllib3 = ">= 2.2.2"
+urllib3 = ">= 2.6.0"
 typer = "^0.12.5"
 click = "<8.2"