cortexapps-cli 1.9.0__tar.gz → 1.13.0__tar.gz

{cortexapps_cli-1.9.0 → cortexapps_cli-1.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cortexapps-cli
-Version: 1.9.0
+Version: 1.13.0
 Summary: Command Line Interface for cortexapps
 License: MIT
 License-File: LICENSE

{cortexapps_cli-1.9.0 → cortexapps_cli-1.13.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.9.0 → cortexapps_cli-1.13.0}/cortexapps_cli/cortex_client.py

@@ -1,3 +1,4 @@
+import importlib.metadata
 import requests
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
@@ -71,6 +72,11 @@ class CortexClient:
         self.tenant = tenant
         self.base_url = base_url
 
+        try:
+            self.version = importlib.metadata.version('cortexapps_cli')
+        except importlib.metadata.PackageNotFoundError:
+            self.version = 'unknown'
+
         logging.basicConfig(level=numeric_level)
         self.logger = logging.getLogger(__name__)
 
@@ -110,6 +116,7 @@ class CortexClient:
         req_headers = {
             'Authorization': f'Bearer {self.api_key}',
             'Content-Type': content_type,
+            'User-Agent': f'cortexapps-cli/{self.version}',
             **headers
         }
         url = '/'.join([self.base_url.rstrip('/'), endpoint.lstrip('/')])

{cortexapps_cli-1.9.0 → cortexapps_cli-1.13.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.9.0"
+version = "1.13.0"
 description = "Command Line Interface for cortexapps"
 license = "MIT"
 authors = [