agilicus 1.289.5__py3-none-any.whl → 1.401.1__py3-none-any.whl

agilicus/main.py

@@ -9,14 +9,13 @@ import requests
 import sys
 from datetime import date, datetime
 from urllib.parse import urlparse
-from prettytable import MSWORD_FRIENDLY
 from click_shell import shell
 from appdirs import user_data_dir
 
 import click
 import click_extension
 import os
-from prettytable import PrettyTable
+from prettytable import PrettyTable, TableStyle
 from colorama import init
 from agilicus.agilicus_api import ApiException
 from . import (
@@ -70,6 +69,9 @@ from .input_helpers import (
     SubObjectString,
     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
@@ -85,10 +87,12 @@ from .features.features import format_features
 from .credentials_commands import credentials_main
 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"]
 
 
@@ -376,9 +380,14 @@ def cli(
         context.save_refreshable_token(ctx, tokens.RefreshableAccessToken())
 
     if not org_id:
-        if not token:
-            token = context.get_token(ctx)
-        org_id = context.get_org_id(ctx, token)
+        # this is optional, used primarily for the prompt
+        try:
+            if not token:
+                token = context.get_token(ctx)
+                org_id = context.get_org_id(ctx, token)
+        except Exception as exc:
+            print("Exception in get_token: ", exc)
+            pass
 
     if org_id:
         org = orgs.get(ctx, org_id)
@@ -694,12 +703,11 @@ def list_audit_records(ctx, show_column, **kwargs):
 
 
 @cli.command(name="list-auth-audit-records")
-@click.option("--limit", type=int, default=50)
+@click.option("--limit", type=int, default=None)
 @click.option("--org-id", default=None)
 @click.option("--dt-from", default=None)
 @click.option("--dt-to", default=None)
 @click.option("--user-id", default=None)
-@click.option("--event", default=None)
 @click.option("--session-id", default=None)
 @click.option("--trace-id", default=None)
 @click.option("--upstream-user-id", default=None)
@@ -710,6 +718,7 @@ def list_audit_records(ctx, show_column, **kwargs):
 @click.option("--event", default=None)
 @click.option("--stage", default=None)
 @click.option("--request-id", default=None)
+@click.option("--map-email", is_flag=True, default=False)
 @click.pass_context
 def list_auth_audit_records(ctx, **kwargs):
     records = audits.query_auth_audits(ctx, **kwargs)
@@ -1038,8 +1047,8 @@ def list_useful_orgs_(ctx, **kwargs):
 @cli.command(name="list-orgs")
 @click.option("--org-id", default=None)
 @click.option("--issuer", default=None)
+@click.option("--name", default=None)
 @click.option("--billing_account_id", default=None)
-@click.option("--enabled", type=bool, default=None)
 @click.option("--shard", default=None)
 @click.option("--cluster", default=None)
 @click.option("--subdomain", default=None)
@@ -1209,6 +1218,26 @@ def remove_feature(ctx, feature, **kwargs):
 @cli.command(name="update-system-options")
 @click.argument("org-id")
 @click.option("--allowed-domains", multiple=True)
+@click.option(
+    "--license-constraints",
+    type=click_extension.JSONFile("r"),
+    help="a constraints file; - for stdin",
+)
+@click.option(
+    "--constraint-vars",
+    type=click_extension.JSONFile("r"),
+    help="a constraint variables file; - for stdin",
+)
+@click.option(
+    "--replace-constraints",
+    type=bool,
+    is_flag=True,
+)
+@click.option(
+    "--replace-vars",
+    type=bool,
+    is_flag=True,
+)
 @click.pass_context
 def update_system_options(ctx, org_id, **kwargs):
     result = orgs.replace_system_options(ctx, org_id, **kwargs)
@@ -1220,7 +1249,7 @@ def update_system_options(ctx, org_id, **kwargs):
 @click.pass_context
 def get_system_options(ctx, org_id):
     result = orgs.get_system_options(ctx, org_id)
-    output_entry(ctx, result)
+    output_entry(ctx, result.to_dict())
 
 
 @cli.command(name="add-org")
@@ -1253,6 +1282,20 @@ def add_org(ctx, **kwargs):
     )
 
 
+@cli.command(name="fixup-org")
+@click.argument("org-id")
+@click.option("--product-label-override", default=None)
+@click.pass_context
+def fixup_org(ctx, **kwargs):
+    output_entry(
+        ctx,
+        orgs.fixup(
+            ctx,
+            **kwargs,
+        ),
+    )
+
+
 @cli.command(name="add-sub-org")
 @click.argument("organisation")
 @click.option("--auto-create", type=bool, default=True)
@@ -1325,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
@@ -1387,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(
@@ -1442,6 +1509,7 @@ def set_http_config(ctx, *args, **kwargs):
 @cli.command(name="add-js-injection")
 @click.argument("service-id", default=None)
 @click.option("--inject-script", type=click.Path(exists=True))
+@click.option("--script-name", default=None)
 @click.option("--inject-preset", default=None)
 @click.option("--org-id", default=None)
 @click.pass_context
@@ -1501,6 +1569,7 @@ def delete_js_injection(ctx, *args, **kwargs):
 @click.option("--source-port-override", default=None)
 @click.option("--source-address-override", default=None)
 @click.option("--dynamic-source-port-override", type=bool, default=None)
+@click.option("--set-token-cookie", type=bool, default=None)
 @click.pass_context
 def update_application_service(ctx, id, **kwargs):
     output_entry(ctx, apps.update_application_service(ctx, id, **kwargs))
@@ -2510,6 +2579,7 @@ def get_token(ctx, **kwargs):
 @click.option("--scope", type=str, multiple=True)
 @click.option("--inherit-session", type=bool, default=False)
 @click.option("--create-refresh-token", is_flag=True)
+@click.option("--get-user", is_flag=True)
 @click.pass_context
 def create_token(
     ctx, user_id, org_id, role, duration, aud, scope, inherit_session, **kwargs
@@ -2618,7 +2688,7 @@ def list_files(ctx, oper_status, **kwargs):
                 _file["label"],
                 _file["created"],
                 _file["last_access"],
-                _file["size"],
+                _file.get("size", None),
                 _file["visibility"],
             ]
         )
@@ -3315,7 +3385,7 @@ def list_well_known_issuer_info(ctx, **kwargs):
 
 @cli.command(name="add-issuer")
 @click.argument("issuer", default=None)
-@click.argument("org-id", default=None)
+@click.argument("org-id", type=str, default=None)
 @click.option("--parent-issuer", default=None)
 @click.option("--upstream-redirect-uri", default=None)
 @click.pass_context
@@ -3328,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(
@@ -3690,6 +3760,9 @@ def list_oidc_upstream_providers(ctx, issuer_id=None, **kwargs):
 @click.option("--org-id", default=None)
 @click.option("--prompt-mode", default=None, type=click.Choice(("auto", "disabled")))
 @click.option("--oidc-flavor", type=click.Choice(["oidc", "microsoft"]), default="oidc")
+@click.option(
+    "--client-authorization-type", type=click.Choice(["federated-credential", ""])
+)
 @click.pass_context
 def update_oidc_upstream_provider(
     ctx,
@@ -5255,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)
@@ -5277,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)
@@ -5383,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
@@ -5390,7 +5483,7 @@ def list_agent_connectors(
     results = connectors.query_agents(ctx, **kwargs)
     table = connectors.format_agents_as_text(ctx, results, **kwargs)
     if output_msfriendly:
-        table.set_style(MSWORD_FRIENDLY)
+        table.set_style(TableStyle.MSWORD_FRIENDLY)
     if sort_by is not None and ctx.obj["output_format"] != "json":
         print(table.get_string(sortby=sort_by, reversesort=reverse_sort))
     else:
@@ -5565,6 +5658,11 @@ 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.pass_context
 def update_agent_connector(ctx, connector_id, **kwargs):
     result = connectors.replace_agent(ctx, connector_id, **kwargs)
@@ -5621,7 +5719,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,
@@ -5767,6 +5865,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)
@@ -5855,6 +5963,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)
@@ -6107,10 +6225,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."""
@@ -6179,6 +6311,7 @@ def list_resource_groups(ctx, **kwargs):
 @click.argument("id")
 @click.option("--org-id", default=None)
 @click.option("--name", default=None)
+@click.option("--bundle-id", default=None)
 @click.option("--resource-member", multiple=True, type=str)
 @click.option("--remove-resource-member", multiple=True, type=str)
 @click.option(
@@ -6192,6 +6325,9 @@ def list_resource_groups(ctx, **kwargs):
     type=click_extension.JSONFile("r"),
 )
 @click.option("--published", type=click.Choice(["no", "public"]), default=None)
+@click.option(
+    "--hide", type=click.Choice(["no", "all", "desktop", "profile"]), default=None
+)
 @click.pass_context
 def update_resource(ctx, id, resource_member, remove_resource_member, **kwargs):
     result = resources.update_resource(
@@ -7022,6 +7158,7 @@ def delete_upstream_alias_mapping(
 @click.option("--org-id", default=None)
 @click.option("--get-customer-data", is_flag=True, default=False)
 @click.option("--get-subscription-data", is_flag=True, default=False)
+@click.option("--get-usage-metrics", is_flag=True, default=False)
 @click.option("--limit", default=500, type=int)
 @click.option("--page-at-id", default="")
 @click.option("--page-size", default=100, type=int)
@@ -7036,14 +7173,15 @@ def list_billing_accounts(ctx, **kwargs):
 @cli.command(name="list-billing-subscriptions")
 @click.option("--org-id", default=None)
 @click.option("--billing-account-id", default=None)
-@click.option("--limit", default=500, type=int)
-@click.option("--page-at-id", default=None)
+@click.option("--limit", default=None, type=int)
+@click.option("--page-at-id", default="")
 @click.option("--page-size", default=100, type=int)
 @click.option("--get-subscription-data", is_flag=True, default=False)
 @click.option("--get-usage-metrics", is_flag=True, default=False)
 @click.option("--get-stripe-status", is_flag=True, default=False)
 @click.option("--has-cancel-detail", is_flag=True, default=None)
 @click.option("--active-orgs-since", default=None, type=click.DateTime())
+@click.option("--filter", type=click.Choice(billing.BILLING_SUBSCRIPTIONS_FILTER_TYPES))
 @click.pass_context
 def list_billing_subscriptions(ctx, get_stripe_status=False, **kwargs):
     if get_stripe_status:
@@ -7150,6 +7288,26 @@ def delete_billing_account(ctx, **kwargs):
 @click.option("--customer-id", default=None)
 @click.option("--product-id", default=None)
 @click.option("--dev-mode/--prod-mode", is_flag=True, default=None)
+@click.option(
+    "--license-constraints",
+    type=click_extension.JSONFile("r"),
+    help="a constraints file; - for stdin",
+)
+@click.option(
+    "--constraint-vars",
+    type=click_extension.JSONFile("r"),
+    help="a constraint variables file; - for stdin",
+)
+@click.option(
+    "--replace-constraints",
+    type=bool,
+    is_flag=True,
+)
+@click.option(
+    "--replace-vars",
+    type=bool,
+    is_flag=True,
+)
 @click.pass_context
 def update_billing_account(ctx, **kwargs):
     account = billing.replace_billing_account(ctx, **kwargs)
@@ -7202,6 +7360,21 @@ def show_billing_accounts(ctx, **kwargs):
     output_entry(ctx, account.to_dict())
 
 
+@cli.command(name="migrate-billing-account-currency")
+@click.argument("billing-account-id")
+@click.option("--new-currency", required=True)
+@click.option(
+    "--subscription-lifecycle-strategy",
+    required=True,
+    type=click.Choice(billing.LIFECYCLE_STRATEGIES),
+    default="start_now",
+)
+@click.pass_context
+def migrate_billing_account_currency(ctx, **kwargs):
+    result = billing.migrate_billing_account_currency(ctx, **kwargs)
+    output_entry(ctx, result.to_dict())
+
+
 def override_replace(
     metric, usage_override, usage_min, usage_max, usage_step, group_by_org
 ):
@@ -7244,6 +7417,20 @@ def override_replace(
 @click.option("--subscription-reconcile", default=None)
 @click.option("--trial-period", type=int, default=None)
 @click.option("--dev-mode", is_flag=True, default=None)
+@click.option("--license-id", default=None)
+@click.option("--add-license", is_flag=True)
+@click.option(
+    "--product-table-version",
+    type=str,
+    default=None,
+    help="when adding license, override a table version",
+)
+@click.option(
+    "--product-name",
+    type=str,
+    default=None,
+    help="when adding license, override a product name",
+)
 @click.pass_context
 def update_subscription(
     ctx,
@@ -7254,6 +7441,10 @@ def update_subscription(
     product_id=None,
     subscription_reconcile=None,
     dev_mode=None,
+    license_id=None,
+    add_license=None,
+    product_table_version=None,
+    product_name=None,
     **kwargs,
 ):
     """Update the min/max overrides in a customer subscription."""
@@ -7309,11 +7500,16 @@ def update_subscription(
 
     if dev_mode is not None:
         bsub.spec.dev_mode = dev_mode
+    if license_id is not None:
+        bsub.spec.license_id = license_id
 
     params = {}
     if subscription_reconcile is not None:
         params["subscription_reconcile"] = subscription_reconcile
 
+    if add_license:
+        add_license_to_billing_sub(ctx, bsub, product_name, product_table_version)
+
     sub = billing.update_subscription(
         ctx,
         billing_subscription_id=kwargs["billing_subscription_id"],
@@ -7361,6 +7557,7 @@ def cancel_billing_subscription(ctx, org_id, billing_subscription_id, *args, **k
 @click.argument("billing-subscription-id")
 @click.option("--description", default=None)
 @click.option("--trial-period", type=int, default=None)
+@click.option("--currency", type=str, required=True)
 @click.pass_context
 def new_billing_subscription(ctx, *args, **kwargs):
     account = billing.new_billing_subscription(ctx, *args, **kwargs)
@@ -7466,6 +7663,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)
@@ -7872,6 +8079,33 @@ def watch_issuers(ctx, **kwargs):
 @click.option(
     "--authentication-config-upstream-ntlm-passthrough", type=bool, default=None
 )
+@click.option("--client-injection-enabled", type=bool, default=None)
+@click.option("--client-injection-version", default=None)
+@click.option(
+    "--client-injection-login-type",
+    type=click.Choice(["form", "basic", "automatic", "bearer", "disabled"]),
+)
+@click.option("--client-injection-login-fetch-path", multiple=True, default=())
+@click.option(
+    "--client-injection-login-detect-login-type",
+    type=click.Choice(["automatic", "fetch"]),
+)
+@click.option("--client-injection-login-detect-login-fetch-path", default=None)
+@click.option("--client-injection-login-inject-key-name", default=None)
+@click.option(
+    "--client-injection-login-form-inject-credentials", type=bool, default=None
+)
+@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,
@@ -7909,6 +8143,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)
@@ -7995,6 +8284,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
@@ -8209,7 +8503,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)
@@ -8302,6 +8607,22 @@ def add_remote_app(ctx, **kwargs):
     output_entry(ctx, result)
 
 
+@cli.command(name="get-user-access-info")
+@click.argument("user-id", default=None, required=False)
+@click.argument("org-id", default=None, required=False)
+@click.option(
+    "--if-none-match", default=None, help="use sha256 of last fetched to short-circuit"
+)
+@click.pass_context
+def get_user_access_info(ctx, user_id, org_id, **kwargs):
+    user_id = get_user_id_from_input_or_ctx(ctx, org_id)
+    org_id = get_org_from_input_or_ctx(ctx, org_id)
+    result, _, headers = users.get_user_ssh_access_info(
+        ctx, user_id, org_id=org_id, **kwargs
+    )
+    output_entry(ctx, result.to_dict(), headers)
+
+
 @cli.command(name="update-remote-app")
 @click.option("--desktop-id", required=True)
 @click.option("--command-path", default=None)
@@ -8590,6 +8911,8 @@ def delete_connector_services(ctx, *args, **kwargs):
 @cli.command(name="list-support-requests")
 @click.option("--org-id", default=None)
 @click.option("--user-id", default=None)
+@click.option("--supporting-user-org-id", default=None)
+@click.option("--expired", default=None, type=bool)
 @click.option("--limit", default=500)
 @click.pass_context
 def list_support_requests(ctx, **kwargs):
@@ -8598,17 +8921,15 @@ def list_support_requests(ctx, **kwargs):
     print(table)
 
 
-@cli.command(name="add-support-request")
-@click.argument("org-id", type=str)
-@click.argument("supporting-user-email", type=str)
+@cli.command(name="create-support-request")
+@click.option("--org-id", type=str, default=None)
+@click.option("--supporting-user-email", type=str)
 @click.option("--supporting-user-org-id", type=str)
 @click.option("--expiry", type=click.DateTime(), default=None)
 @click.option("--viewer-only-permissions", default=False, type=bool)
 @click.pass_context
-def add_support_user(
-    ctx, org_id, supporting_user_org_id, supporting_user_email, **kwargs
-):
-    result = users.add_support_request(ctx, org_id, supporting_user_email, **kwargs)
+def create_support_request(ctx, org_id, **kwargs):
+    result = users.create_support_request(ctx, org_id, **kwargs)
     output_entry(ctx, result)
 
 
@@ -8652,6 +8973,61 @@ def create_support_request_message(
     )
 
 
+@cli.command(name="create-support-request-acknowledgement")
+@click.argument("org-id", type=str)
+@click.argument("supporting-user-id", type=str)
+@click.argument("support-request-id", type=str)
+@click.pass_context
+def create_support_request_acknowledgement(
+    ctx, org_id, supporting_user_id, support_request_id, **kwargs
+):
+    """
+    Adds an acknowledgment for support request SUPPORT_REQUEST_ID.
+
+    ORG_ID is the supportting user's organization.
+    """
+    result = users.create_support_request_acknowledgement(
+        ctx, org_id, supporting_user_id, support_request_id, **kwargs
+    )
+    output_entry(ctx, result)
+
+
+@cli.command(name="show-support-request-acknowledgement")
+@click.argument("support-request-acknowledgement-id")
+@click.option("--org-id", default=None)
+@click.pass_context
+def show_support_request_acknowledgement(
+    ctx, support_request_acknowledgement_id, **kwargs
+):
+    result = users.show_support_request_acknowledgement(
+        ctx, support_request_acknowledgement_id, **kwargs
+    )
+    output_entry(ctx, result)
+
+
+@cli.command(name="list-support-request-acknowledgements")
+@click.option("--org-id", type=str, default=None, help="org id of the supporting user")
+@click.option("--support-request-id", default=None)
+@click.option("--expired", default=None, type=bool)
+@click.option("--limit", default=500)
+@click.pass_context
+def list_support_request_acknowledgements(ctx, **kwargs):
+    ids = users.list_support_request_acknowledgements(ctx, **kwargs)
+    table = users.format_support_request_acknowledgement_as_text(ctx, ids)
+    print(table)
+
+
+@cli.command(name="delete-support-request-acknowledgement")
+@click.argument("support-request-acknowledgement-id")
+@click.pass_context
+def delete_support_request_acknowledgement(
+    ctx, support_request_acknowledgement_id, **kwargs
+):
+    users.delete_support_request_acknowledgement(
+        ctx, support_request_acknowledgement_id, **kwargs
+    )
+
+
 @cli.command(name="add-fake-oidc-issuer")
 @click.argument("issuer-id")
 @click.option("--org-id", default=None)
@@ -8730,6 +9106,27 @@ def list_regional_locations(ctx, **kwargs):
     print(format_table(ctx, locations, columns))
 
 
+@cli.command(name="list-org-upstream-user-identities")
+@click.option("--org-id", default=None)
+@click.option("--limit", default=500)
+@click.pass_context
+def list_org_upstream_user_identities(ctx, **kwargs):
+    org_upstreams = users.list_org_upstream_user_identities(ctx, **kwargs)
+    columns = make_columns(
+        ctx,
+        org_upstreams,
+        """
+          - metadata.id(newname=id)
+          - spec.user_id(newname=user_id)
+          - spec.org_id(newname=org_id)
+          - spec.last_login(newname=last_login)
+          - status.upstream_user_identity.spec.upstream_idp_id(newname=upstream_idp_id)
+          - status.upstream_user_identity.spec.upstream_user_id(newname=upstream_user_id)
+        """,
+    )
+    print(format_table(ctx, org_upstreams, columns))
+
+
 def main():
     trusted_certs_main.add_commands(cli)
     hosts_main.add_commands(cli)
@@ -8743,6 +9140,8 @@ def main():
     policy_config_main.add_commands(cli)
     messages_main.add_commands(cli)
     databases.add_commands(cli)
+    licensing_main.add_commands(cli)
+    deployments_main.add_commands(cli)
 
     cli(auto_envvar_prefix="AGILICUS")