agilicus 1.303.5__py3-none-any.whl → 1.402.0__py3-none-any.whl

agilicus/deployments/deployments_main.py

@@ -0,0 +1,182 @@
+import click
+from agilicus.output.table import make_columns
+from agilicus.output.table import output_entry
+from agilicus.output.table import format_table
+from agilicus.command_helpers import Command
+from . import deployments
+
+
+cmd = Command()
+
+
+@cmd.command(name="list-deployments")
+@click.option("--limit", default=500)
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_list_deployments(ctx, **kwargs):
+    results = deployments.list_deployments(ctx, **kwargs)
+    columns = make_columns(
+        ctx,
+        results,
+        """
+          - metadata.id(newname=id)
+          - spec.name(newname=name)
+          - status.parameters:
+            - name
+            - type
+          - status.schema_errors
+        """,
+    )
+    print(format_table(ctx, results, columns))
+
+
+@cmd.command(name="get-deployment")
+@click.argument("deployment-id")
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_get_deployment(ctx, **kwargs):
+    result = deployments.get_deployment(ctx, **kwargs)
+    output_entry(ctx, result.to_dict())
+
+
+@cmd.command(name="delete-deployment")
+@click.argument("deployment-id")
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_delete_deployment(ctx, **kwargs):
+    deployments.delete_deployment(ctx, **kwargs)
+
+
+@cmd.command(name="add-deployment")
+@click.argument("name")
+@click.option("--schema", type=click.Path(exists=True))
+@click.option("--schema-name", default=None)
+@click.option("--org-id", default=None)
+@click.option("--description", default=None)
+@click.pass_context
+def cli_command_add_deployment(ctx, **kwargs):
+    result = deployments.add_deployment(ctx, **kwargs)
+    output_entry(ctx, result.to_dict())
+
+
+@cmd.command(name="list-deployment-instances")
+@click.option("--limit", default=500)
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_list_deployment_instances(ctx, **kwargs):
+    results = deployments.list_deployment_instances(ctx, **kwargs)
+    columns = make_columns(
+        ctx,
+        results,
+        """
+          - metadata.id(newname=id)
+          - spec.name(newname=name)
+          - spec.inputs:
+            - name
+            - value_as_string
+          - status.status
+          - status.resources:
+            - template_name
+            - name
+            - id
+            - type
+            - shared
+        """,
+    )
+    print(format_table(ctx, results, columns))
+
+
+@cmd.command(name="get-deployment-instance")
+@click.argument("deployment-instance-id")
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_get_deployment_instance(ctx, **kwargs):
+    result = deployments.get_deployment_instance(ctx, **kwargs)
+    output_entry(ctx, result.to_dict())
+
+
+@cmd.command(name="delete-deployment-instance")
+@click.argument("deployment-instance-id")
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_delete_deployment_instance(ctx, **kwargs):
+    deployments.delete_deployment_instance(ctx, **kwargs)
+
+
+@cmd.command(name="list-deployment-templates")
+@click.option("--limit", default=500)
+@click.option("--org-id", default=None)
+@click.option("--system-templates", default=True)
+@click.option(
+    "--deployment-template-type", type=click.Choice(["model", "schema"]), default=None
+)
+@click.pass_context
+def cli_command_list_deployment_templates(ctx, **kwargs):
+    results = deployments.list_deployment_templates(ctx, **kwargs)
+    columns = make_columns(
+        ctx,
+        results,
+        """
+          - metadata.id(newname=id)
+          - spec.org_id(newname=org_id)
+          - spec.name(newname=name)
+          - spec.template_type(newname=template_type)
+        """,
+    )
+    print(format_table(ctx, results, columns))
+
+
+@cmd.command(name="add-deployment-instance")
+@click.argument("deployment-id")
+@click.argument("name")
+@click.option("--org-id", default=None)
+@click.option("--description", default=None)
+@click.option("--input", multiple=True)
+@click.pass_context
+def cli_command_add_deployment_instance(ctx, **kwargs):
+    result = deployments.add_deployment_instance(ctx, **kwargs)
+    output_entry(ctx, result.to_dict())
+
+
+@cmd.command(name="get-deployment-template")
+@click.argument("deployment-template-id")
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_get_deployment_template(ctx, **kwargs):
+    result = deployments.get_deployment_template(ctx, **kwargs)
+    output_entry(ctx, result.to_dict())
+
+
+@cmd.command(name="add-deployment-template")
+@click.argument("name")
+@click.argument("template-type", type=click.Choice(["model", "schema"]))
+@click.argument("template", type=click.Path(exists=True))
+@click.option("--org-id", default=None)
+@click.option("--description", default=None)
+@click.pass_context
+def cli_command_add_deployment_template(ctx, **kwargs):
+    result = deployments.add_deployment_template(ctx, **kwargs)
+    output_entry(ctx, result.to_dict())
+
+
+@cmd.command(name="update-system-templates")
+@click.argument("templates", type=click.Path(exists=True))
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_update_system_templates(ctx, **kwargs):
+    if not ctx.obj.get("ADMIN_MODE"):
+        print("must run in --admin mode")
+        return
+    deployments.update_system_templates(ctx, **kwargs)
+
+
+@cmd.command(name="delete-deployment-template")
+@click.argument("deployment-template-id")
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_delete_deployment_template(ctx, **kwargs):
+    deployments.delete_deployment_template(ctx, **kwargs)
+
+
+def add_commands(cli):
+    cmd.add_to_cli(cli)

agilicus/desktops.py

@@ -28,13 +28,17 @@ from .output.table import (
     format_table,
     metadata_column,
 )
-from .resource_helpers import map_resource_published
+from .pagination import normalize_page_args
+from .resource_helpers import map_resource_published, standard_page_fields
+
+page_fields = standard_page_fields
 
 
 def list_desktop_resources(ctx, **kwargs):
     apiclient = context.get_apiclient_from_ctx(ctx)
     update_org_from_input_or_ctx(kwargs, ctx, **kwargs)
     params = strip_none(kwargs)
+    params = normalize_page_args(params)
     query_results = apiclient.app_services_api.list_desktop_resources(**params)
     return query_results.desktop_resources
 

agilicus/file_shares.py

@@ -13,13 +13,17 @@ from .output.table import (
     format_table,
     metadata_column,
 )
-from .resource_helpers import map_resource_published
+from .pagination import normalize_page_args
+from .resource_helpers import map_resource_published, standard_page_fields
+
+page_fields = standard_page_fields
 
 
 def list_file_share_services(ctx, **kwargs):
     apiclient = context.get_apiclient_from_ctx(ctx)
     update_org_from_input_or_ctx(kwargs, ctx, **kwargs)
     kwargs = strip_none(kwargs)
+    kwargs = normalize_page_args(kwargs)
     query_results = apiclient.app_services_api.list_file_share_services(**kwargs)
     return query_results.file_share_services
 

agilicus/forwarders.py

@@ -1,4 +1,5 @@
 import agilicus
+from . import apps
 from . import context
 from .input_helpers import get_org_from_input_or_ctx
 from .output.table import (
@@ -59,6 +60,8 @@ def replace(
     application_service_id=None,
     bind_address=None,
     protocol=None,
+    port_range=None,
+    source_port_override=None,
     **kwargs,
 ):
     token = context.get_token(ctx)
@@ -89,6 +92,15 @@ def replace(
     if protocol:
         forwarder.spec.protocol = protocol
 
+    if port_range is not None:
+        forwarder.spec.config = apps.configure_port(forwarder.spec.config, port_range)
+
+    if source_port_override is not None:
+        if forwarder.spec.config is None:
+            forwarder.spec.config = agilicus.NetworkServiceConfig()
+        forwarder.spec.config.source_port_override = apps.parse_ports(
+            source_port_override
+        )
     return apiclient.app_services_api.replace_service_forwarder(
         id, service_forwarder=forwarder
     )

agilicus/input_helpers.py

@@ -9,6 +9,9 @@ from typing import Any, Dict
 
 from . import context
 
+search_direction_values = ["forwards", "backwards"]
+page_sort_order_values = ["asc", "desc"]
+
 
 def update_if_not_none(obj: dict, new_values: dict):
     for k, v in new_values.items():

agilicus/launchers.py

@@ -9,8 +9,13 @@ from .output.table import (
     column,
     subtable,
 )
+from .pagination import normalize_page_args
+from .resource_helpers import standard_page_fields
+
 import agilicus
 
+page_fields = standard_page_fields
+
 
 def get(ctx, id, **kwargs):
     token = context.get_token(ctx)
@@ -68,6 +73,7 @@ def query(ctx, **kwargs):
     kwargs = input_helpers.strip_none(kwargs)
 
     kwargs["org_id"] = org_id
+    kwargs = normalize_page_args(kwargs)
     query_results = apiclient.launchers_api.list_launchers(**kwargs)
     return query_results.launchers
 

agilicus/main.py

@@ -70,6 +70,8 @@ from .input_helpers import (
     pop_item_if_none,
     get_org_from_input_or_ctx,
     get_user_id_from_input_or_ctx,
+    search_direction_values,
+    page_sort_order_values,
 )
 
 from .output.console import output_formatted
@@ -87,10 +89,10 @@ from .files_pkg import files_main
 from .policy_config import policy_config_main
 from .licensing import licensing_main
 from .licensing.licenses import add_license_to_billing_sub
+from .deployments import deployments_main
 
 from .version import __version__
 
-search_direction_values = ["forwards", "backwards"]
 sort_order_values = ["ascending", "descending"]
 
 
@@ -1366,6 +1368,16 @@ def output_list_apps(ctx, orgs_by_id, apps_list):
     default=None,
     is_flag=True,
 )
+@click.option(
+    "--page-on", multiple=True, type=click.Choice(apps.page_fields), default=None
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
 @click.pass_context
 def list_applications(ctx, organisation, org_id, **kwargs):
     # get all orgs
@@ -1428,6 +1440,20 @@ def list_environments(ctx, organisation, org_id, filter, **kwargs):
 @click.option("--hostname_or_service_name", default=None)
 @click.option("--external_hostname_or_service", default=None)
 @click.option("--show-status", is_flag=True, default=False)
+@click.option(
+    "--page-on",
+    multiple=True,
+    type=click.Choice(apps.application_service_page_fields),
+    default=None,
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
+@click.option("--limit", default=None, type=int)
 @click.pass_context
 def list_application_services(ctx, protocol_type_list, **kwargs):
     services = apps.get_application_services(
@@ -3372,7 +3398,7 @@ def add_issuer(ctx, **kwargs):
 @click.option("--issuer", default=None)
 @click.option("--org-id", default=None)
 @click.option("--theme-file-id", type=str, default=None)
-@click.option("--upstream-redirect-uri", default=None)
+@click.option("--upstream-redirect-uri", type=str, default=None)
 @click.option("--saml-state-encryption-key", default=None)
 @click.option("--enabled/--disabled", default=None)
 @click.option(
@@ -5302,7 +5328,7 @@ def show_api_key_introspection(ctx, email, api_key, include_suborgs=False, **kwa
 @cli.command(help="list all connectors")
 @click.option("--org-id", default=None)
 @click.option("--name", default=None)
-@click.option("--limit", default=None)
+@click.option("--limit", default=None, type=int)
 @click.option("--show-stats", type=bool, default=True)
 @click.option("--no-down", is_flag=True, type=bool, default=False)
 @click.option("--page-at-id", default=None)
@@ -5324,6 +5350,16 @@ def show_api_key_introspection(ctx, email, api_key, include_suborgs=False, **kwa
     default=None,
     help="show connectors that are running the specified version",
 )
+@click.option(
+    "--page-on", multiple=True, type=click.Choice(connectors.page_fields), default=None
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
 @click.pass_context
 def list_connectors(ctx, **kwargs):
     results = connectors.query(ctx, **kwargs)
@@ -5430,6 +5466,16 @@ def delete_agent_connector_instance(ctx, **kwargs):
 @click.option("--reverse-sort", is_flag=True, default=False)
 @click.option("--page-at-id", default=None)
 @click.option("--show-stats", default=None, type=bool)
+@click.option(
+    "--page-on", multiple=True, type=click.Choice(connectors.page_fields), default=None
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
 @click.pass_context
 def list_agent_connectors(
     ctx, output_msfriendly=False, sort_by=None, reverse_sort=False, **kwargs
@@ -5612,6 +5658,12 @@ def show_agent_connector_info(ctx, connector_id, **kwargs):
     default=None,
     type=bool,
 )
+@click.option(
+    "--ntp-forwarding-bind",
+    default=None,
+    type=click.Choice(connectors.INTERNAL_SERVICE_BIND),
+)
+@click.option("--ntp-forwarding-custom-bind", default=None, type=str)
 @click.pass_context
 def update_agent_connector(ctx, connector_id, **kwargs):
     result = connectors.replace_agent(ctx, connector_id, **kwargs)
@@ -5668,7 +5720,7 @@ def set_agent_connector_stats(
 
 @cli.command(name="get-agent-connector-stats")
 @click.argument("connector-id")
-@click.option("--org-id", default=None)
+@click.option("--org-id", type=str, default=None)
 @click.pass_context
 def get_agent_connector_stats(
     ctx,
@@ -5814,6 +5866,16 @@ def reissue_csr(ctx, **kwargs):
 @click.option("--updated-since", default=None, type=click.DateTime())
 @click.option("--resource-id", default=None)
 @click.option("--limit", default=500)
+@click.option(
+    "--page-on", multiple=True, type=click.Choice(desktops.page_fields), default=None
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
 @click.pass_context
 def list_file_share_services(ctx, name=None, **kwargs):
     shares = file_shares.list_file_share_services(ctx, name=name, **kwargs)
@@ -5902,6 +5964,16 @@ def delete_file_share_service(ctx, file_share_service_id, **kwargs):
 @click.option("--has-remote-app", type=bool, default=None)
 @click.option("--resource-id", default=None)
 @click.option("--limit", default=500)
+@click.option(
+    "--page-on", multiple=True, type=click.Choice(desktops.page_fields), default=None
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
 @click.pass_context
 def list_desktop_resources(ctx, name=None, **kwargs):
     resources = desktops.list_desktop_resources(ctx, name=name, **kwargs)
@@ -6154,10 +6226,24 @@ def bulk_delete_resource_permission(ctx, **kwargs):
     type=resources.resource_type_enum,
 )
 @click.option("--page-at-id", default=None)
-@click.option("--limit", default=500)
+@click.option("--limit", default=None, type=int)
+@click.option("--get-all", default=False, is_flag=True)
 @click.option("--show-columns", type=str, default=None)
 @click.option("--reset-columns", is_flag=True, default=False)
 @click.option("--show-stats", is_flag=True, default=None)
+@click.option(
+    "--page-on",
+    multiple=True,
+    type=click.Choice(resources.resource_page_fields),
+    default=None,
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
 @click.pass_context
 def list_resources(ctx, reset_columns=None, show_columns=None, **kwargs):
     """Lists generic resources, which can be filtered by type, organisation, etc."""
@@ -6727,6 +6813,10 @@ def list_forwarders(ctx, **kwargs):
 @click.option("--application-service-id", default=None)
 @click.option("--bind-address", default=None)
 @click.option("--protocol", default=None)
+@click.option(
+    "--port-range", type=str, default=None, help="comma seperated list of port ranges"
+)
+@click.option("--source-port-override", default=None)
 @click.pass_context
 def update_forwarder(ctx, id, **kwargs):
     result = forwarders.replace(ctx, id, **kwargs)
@@ -7578,6 +7668,16 @@ def add_launcher(ctx, resource_member, **kwargs):
 @click.option("--limit", default=500)
 @click.option("--resource-id", default=None)
 @click.option("--expand-resource-members", is_flag=True, default=False)
+@click.option(
+    "--page-on", multiple=True, type=click.Choice(launchers.page_fields), default=None
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
 @click.pass_context
 def list_launchers(ctx, **kwargs):
     ids = launchers.query(ctx, **kwargs)
@@ -7822,7 +7922,7 @@ def delete_audit_destination(ctx, destination_id, **kwargs):
 
 @cli.command(name="add-audit-destination-filter")
 @click.argument("destination-id")
-@click.option("--org-id", default=None)
+@click.option("--org-id", type=str, default=None)
 @click.option(
     "--filter-type", required=True, type=click.Choice(audit_destinations.FILTER_TYPES)
 )
@@ -8003,6 +8103,14 @@ def watch_issuers(ctx, **kwargs):
 @click.option("--client-injection-login-form-username-field", default=None)
 @click.option("--client-injection-login-form-password-field", default=None)
 @click.option("--client-injection-debug", type=bool, default=None)
+@click.option("--client-injection-login-form-username-credential", default=None)
+@click.option("--client-injection-login-form-password-credential", default=None)
+@click.option("--client-injection-login-form-username-query-selector", default=None)
+@click.option("--client-injection-login-form-password-query-selector", default=None)
+@click.option("--client-injection-login-form-username-next-selector", default=None)
+@click.option("--client-injection-login-form-password-next-selector", default=None)
+@click.option("--client-injection-login-form-login-selector", default=None)
+@click.option("--client-injection-login-form-submit-selector", default=None)
 @click.pass_context
 def update_application_configs(
     ctx,
@@ -8040,6 +8148,61 @@ def update_application_configs(
         )
 
 
+@cli.command(name="update-client-inject-form-config")
+@click.argument("app")
+@click.argument("env_name")
+@click.option("--org-id", default=None)
+@click.option("--username-query-selector", default=None)
+@click.option("--password-query-selector", default=None)
+@click.option("--username-next-selector", default=None)
+@click.option("--password-next-selector", default=None)
+@click.option("--login-selector", default=None)
+@click.option("--submit-selector", default=None)
+@click.option("--reset", is_flag=True)
+@click.pass_context
+def update_form_config(
+    ctx,
+    app,
+    env_name,
+    org_id,
+    reset=False,
+    username_query_selector=None,
+    password_query_selector=None,
+    username_next_selector=None,
+    password_next_selector=None,
+    login_selector=None,
+    submit_selector=None,
+    **kwargs,
+):
+    _env = apps.get_env(ctx, app, env_name, org_id)
+    _app = _get_app(ctx, app, org_id=org_id)
+    if _env and _app:
+        application_configs = _env.get("application_configs", {})
+        if reset:
+            client_injection = application_configs.setdefault("client_injection", {})
+            login_config = client_injection.setdefault("login_config", {})
+            inject_form_config = login_config.setdefault("form_config", {})
+            inject_form_config["config"] = {}
+        apps.update_application_configs(
+            application_configs,
+            client_injection_login_form_username_query_selector=username_query_selector,
+            client_injection_login_form_password_query_selector=password_query_selector,
+            client_injection_login_form_username_next_selector=username_next_selector,
+            client_injection_login_form_password_next_selector=password_next_selector,
+            client_injection_login_form_login_selector=login_selector,
+            client_injection_login_form_submit_selector=submit_selector,
+            **kwargs,
+        )
+
+        apps.update_env(
+            ctx,
+            _app["id"],
+            env_name,
+            org_id,
+            application_configs=application_configs,
+        )
+
+
 @cli.command(name="list-feature-tags")
 @click.option("--name", default=None)
 @click.option("--page-at-name", default=None)
@@ -8126,6 +8289,11 @@ def add_point_of_presence(ctx, **kwargs):
 )
 @click.option("--requests-enabled", type=bool, default=None)
 @click.option("--routing-ces", default=None)
+@click.option(
+    "--overwrite-org-domains",
+    is_flag=True,
+    help="overwrites the org domains rather than adding to them",
+)
 @click.pass_context
 def update_point_of_presence(
     ctx, point_of_presence_id, add_cluster_id, remove_cluster_id, **kwargs
@@ -8340,7 +8508,18 @@ def get_connector_stats_config(ctx, **kwargs):
 @click.option("--name-slug", default=None)
 @click.option("--updated-since", default=None, type=click.DateTime())
 @click.option("--resource-id", default=None)
-@click.option("--limit", default=500)
+@click.option("--limit", type=int, default=None)
+@click.option("--get-all", is_flag=True, default=False)
+@click.option(
+    "--page-on", multiple=True, type=click.Choice(ssh.page_fields), default=None
+)
+@click.option("--page-at-key", multiple=True, type=str, default=None)
+@click.option(
+    "--page-sort", multiple=True, type=click.Choice(page_sort_order_values), default=None
+)
+@click.option(
+    "--search-direction", type=click.Choice(search_direction_values), default=None
+)
 @click.pass_context
 def list_ssh_resources(ctx, name=None, **kwargs):
     resources = ssh.list_ssh_resources(ctx, name=name, **kwargs)
@@ -8967,6 +9146,7 @@ def main():
     messages_main.add_commands(cli)
     databases.add_commands(cli)
     licensing_main.add_commands(cli)
+    deployments_main.add_commands(cli)
 
     cli(auto_envvar_prefix="AGILICUS")
 

agilicus/pagination/__init__.py

@@ -0,0 +1,3 @@
+from .input import normalize_page_args
+
+__all__ = ["normalize_page_args"]