cortexapps-cli 1.0.2__tar.gz → 1.0.4__tar.gz

{cortexapps_cli-1.0.2 → cortexapps_cli-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cortexapps-cli
-Version: 1.0.2
+Version: 1.0.4
 Summary: Command Line Interface for cortexapps
 License: MIT
 Author: Cortex Apps
@@ -464,6 +464,20 @@ This recipe does the following:
        cortex catalog descriptor -y -t ${entity} | yq "with(.info.x-cortex-owners[]; select(.type | downcase == \"group\") | select(.provider == null) | .provider = \"${provider}\" )" | cortex catalog create -f-
     done
 
+-----------------------------------------------------------------------------
+Export all workflows
+-----------------------------------------------------------------------------
+
+This recipe creates YAML files for each Workflow.  This may be helpful if you are considering enabling GitOps for Workflows and you want to export current Workflows as a starting point.
+
+.. code:: bash
+
+    for workflow in `cortex workflows list --csv --no-headers --columns tag`
+    do
+       echo "workflow = $workflow"
+       cortex workflows get --tag $workflow --yaml > $workflow.yaml
+    done
+
 -----------------------------------------------------------------------------
 Obfuscating a Cortex export
 -----------------------------------------------------------------------------

{cortexapps_cli-1.0.2 → cortexapps_cli-1.0.4}/README.rst

@@ -439,6 +439,20 @@ This recipe does the following:
        cortex catalog descriptor -y -t ${entity} | yq "with(.info.x-cortex-owners[]; select(.type | downcase == \"group\") | select(.provider == null) | .provider = \"${provider}\" )" | cortex catalog create -f-
     done
 
+-----------------------------------------------------------------------------
+Export all workflows
+-----------------------------------------------------------------------------
+
+This recipe creates YAML files for each Workflow.  This may be helpful if you are considering enabling GitOps for Workflows and you want to export current Workflows as a starting point.
+
+.. code:: bash
+
+    for workflow in `cortex workflows list --csv --no-headers --columns tag`
+    do
+       echo "workflow = $workflow"
+       cortex workflows get --tag $workflow --yaml > $workflow.yaml
+    done
+
 -----------------------------------------------------------------------------
 Obfuscating a Cortex export
 -----------------------------------------------------------------------------

{cortexapps_cli-1.0.2 → cortexapps_cli-1.0.4}/cortexapps_cli/commands/integrations_commands/github.py

@@ -35,64 +35,63 @@ def add(
         # 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/github/configuration", data=data)
+    r = client.post("api/v1/github/configurations/app", data=data)
     print_json(data=r)
 
 @app.command()
-def add_multiple(
+def delete(
     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,
+    alias: str = typer.Option(..., "--alias", "-a", help="The alias of the configuration"),
 ):
     """
-    Add multiple configurations
+    Delete a configuration
     """
 
     client = ctx.obj["client"]
 
-    data = json.loads("".join([line for line in file_input]))
-
-    r = client.put("api/v1/aws/configurations", data=data)
+    r = client.delete("api/v1/github/configurations/app/" + alias)
     print_json(data=r)
 
 @app.command()
-def delete(
+def delete_all(
     ctx: typer.Context,
-    alias: str = typer.Option(..., "--alias", "-a", help="The alias of the configuration"),
 ):
     """
-    Delete a configuration
+    Delete all configurations
     """
 
     client = ctx.obj["client"]
 
-    r = client.delete("api/v1/github/configuration/" + alias)
+    r = client.delete("api/v1/github/configurations")
     print_json(data=r)
 
 @app.command()
-def delete_all(
+def get(
     ctx: typer.Context,
+    alias: str = typer.Option(..., "--alias", "-a", help="The alias of the configuration"),
 ):
     """
-    Delete all configurations
+    Get a single app configuration
     """
 
     client = ctx.obj["client"]
 
-    r = client.delete("api/v1/github/configurations")
+    r = client.get("api/v1/github/configurations/app/" + alias)
     print_json(data=r)
 
+
 @app.command()
-def get(
+def get_personal(
     ctx: typer.Context,
     alias: str = typer.Option(..., "--alias", "-a", help="The alias of the configuration"),
 ):
     """
-    Get a configuration
+    Get a personal configuration
     """
 
     client = ctx.obj["client"]
 
-    r = client.get("api/v1/github/configuration/" + alias)
+    r = client.get("api/v1/github/configurations/personal/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -129,7 +128,7 @@ def update(
     is_default: bool = typer.Option(False, "--is-default", "-i", help="If this is the default configuration"),
 ):
     """
-    Update a configuration
+    Update a single app configuration
     """
 
     client = ctx.obj["client"]
@@ -139,7 +138,7 @@ def update(
        "isDefault": is_default
     }
 
-    r = client.put("api/v1/github/configuration/" + alias, data=data)
+    r = client.put("api/v1/github/configurations/app/" + alias, data=data)
     print_json(data=r)
 
 @app.command()
@@ -153,7 +152,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/github/configurations/validate" + alias)
+    r = client.post("api/v1/github/configurations/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -166,7 +165,7 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/github/configurations")
+    r = client.post("api/v1/github/configurations/validate")
     print_json(data=r)
 
 @app.command()

{cortexapps_cli-1.0.2 → cortexapps_cli-1.0.4}/cortexapps_cli/commands/integrations_commands/prometheus.py

@@ -8,9 +8,11 @@ app = typer.Typer(help="Prometheus commands", no_args_is_help=True)
 @app.command()
 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"),
+    alias: str = typer.Option(None,  "--alias", "-a", help="Alias for this configuration"),
     host: str = typer.Option(None, "--host", "-h", help="Optional host name"),
+    username: str = typer.Option(None, "--username", "-u", help="username"),
+    password: str = typer.Option(None, "--password", "-p", help="password"),
+    tenant_id: str = typer.Option(None, "--tenant", "-t", help="Optional tenant id"),
     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,19 +23,23 @@ 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 host or username or password or tenant_id or is_default:
+            raise typer.BadParameter("When providing a prometheus definition file, do not specify any other attributes")
         data = json.loads("".join([line for line in file_input]))
     else:
+        
         data = {
            "alias": alias,
-           "apiKey": api_key,
            "host": host,
-           "isDefault": is_default,
+           "username": username,
+           "password": password,
+           "tenant_id": tenant_id,
+           "is_default": 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}
+        for k, v in data.items():
+            if v is None:
+                raise typer.BadParameter("Missing required parameter: " + k)
     
     r = client.post("api/v1/prometheus/configuration", data=data)
     print_json(data=r)
@@ -51,7 +57,7 @@ def add_multiple(
 
     data = json.loads("".join([line for line in file_input]))
 
-    r = client.put("api/v1/aws/configurations", data=data)
+    r = client.put("api/v1/prometheus/configurations", data=data)
     print_json(data=r)
 
 @app.command()

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