agilicus 1.235.6__py3-none-any.whl → 1.235.7__py3-none-any.whl

agilicus/agilicus_api/api_client.py

@@ -77,7 +77,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.235.6/python'
+        self.user_agent = 'OpenAPI-Generator/1.235.7/python'
 
     def __enter__(self):
         return self

agilicus/agilicus_api/configuration.py

@@ -387,7 +387,7 @@ class Configuration(object):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2023.12.15\n"\
-               "SDK Package Version: 1.235.6".\
+               "SDK Package Version: 1.235.7".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

agilicus/agilicus_api_README.md

@@ -4,7 +4,7 @@ Agilicus is API-first. Modern software is controlled by other software, is open,
 The `agilicus_api` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 2023.12.15
-- Package version: 1.235.6
+- Package version: 1.235.7
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.agilicus.com/api](https://www.agilicus.com/api)
 

agilicus/features/features_main.py

@@ -15,13 +15,13 @@ from agilicus.output.table import format_table
 def cli_command_list_features(ctx, show_columns, reset_columns, **kwargs):
     results = features.list_features(ctx, **kwargs)
     spec = """
-       - metadata.id
-       - spec.name
-       - spec.priority
-       - spec.key
-       - spec.value
-       - status.products:
-           - spec.label
+       - metadata.id(newname=id)
+       - spec.name(newname=name)
+       - spec.priority(newname=priority)
+       - spec.key(newname=key)
+       - spec.value(newname=value)
+       - status.products(out_name=products):
+           - spec.label(newname=label)
     """
     columns = make_columns(
         ctx,
@@ -97,11 +97,11 @@ def cli_command_list_org_features(ctx, show_columns, reset_columns, **kwargs):
         ctx,
         results,
         """
-          - metadata.id
-          - spec.name
-          - spec.priority
-          - spec.key
-          - spec.value
+          - metadata.id(newname=id)
+          - spec.name(newname=name)
+          - spec.priority(newname=priority)
+          - spec.key(newname=key)
+          - spec.value(newname=value)
         """,
         show=show_columns,
         clear=reset_columns,

agilicus/main.py

@@ -6787,8 +6787,17 @@ def override_replace(
 @click.option("--usage-group-by-org", default=None, multiple=True)
 @click.option("--subscription-id", default=None)
 @click.option("--billing-account-id", default=None)
+@click.option("--feature-id", default=None, multiple=True)
+@click.option("--remove-feature-id", default=None, multiple=True)
 @click.pass_context
-def update_subscription(ctx, subscription_id, billing_account_id=None, **kwargs):
+def update_subscription(
+    ctx,
+    subscription_id,
+    billing_account_id=None,
+    feature_id=None,
+    remove_feature_id=None,
+    **kwargs,
+):
     """Update the min/max overrides in a customer subscription."""
     bsub = billing.get_billing_subscription(ctx, kwargs["billing_subscription_id"])
     usage_override = bsub.spec.usage_override
@@ -6822,8 +6831,23 @@ def update_subscription(ctx, subscription_id, billing_account_id=None, **kwargs)
     if billing_account_id:
         bsub.spec.billing_account_id = billing_account_id
 
+    if feature_id is not None:
+        for feature_id in feature_id:
+            bsub.spec.feature_overrides.append(feature_id)
+
+    if remove_feature_id is not None:
+        old_features = bsub.spec.feature_overrides
+        bsub.spec.feature_overrides = []
+        for feature_id in old_features:
+            if feature_id in remove_feature_id:
+                # needs to be removed.
+                continue
+            bsub.spec.feature_overrides.append(feature_id)
+
     sub = billing.update_subscription(
-        ctx, billing_subscription_id=kwargs["billing_subscription_id"], subscription=bsub
+        ctx,
+        billing_subscription_id=kwargs["billing_subscription_id"],
+        subscription=bsub,
     )
     output_entry(ctx, sub.to_dict())
 

agilicus/output/column_builder.py

@@ -0,0 +1,134 @@
+import yaml
+import re
+from collections import OrderedDict
+from . import table
+
+
+class ColumnBuilder:
+    def __init__(self, ctx, result_list):
+        self.ctx = ctx
+        self.result_list = result_list
+
+    def _get_column_names(self, subtable_column_name):
+        results = set()
+        if not self.result_list:
+            return results
+        obj = self.result_list[0]
+        if subtable_column_name:
+            obj = getattr(obj, subtable_column_name)
+            if not obj:
+                # nothing available
+                return results
+            obj = obj[0]
+        return set(obj.to_dict().keys())
+
+    def _make_subtable(self, table_name, format_doc):
+        m = re.search("(.*)\\((.+)\\).*", table_name)
+        all_options = {}
+        if m:
+            found = m.group(2)
+            for option in found.split(","):
+                split_str = option.split("=")
+                all_options[split_str[0]] = split_str[1]
+            table_name = m.group(1)
+        columns = self.build_columns(format_doc, subtable_column_name=table_name)
+        return table.subtable(
+            self.ctx,
+            table_name,
+            columns=columns,
+            optional=True,
+            **all_options,
+        )
+
+    def _get_output_column(self, column_name: str):
+        m = re.search("(.*)\\((.+)\\).*", column_name)
+        if m:
+            found = m.group(2)
+            all_options = {}
+            for option in found.split(","):
+                split_str = option.split("=")
+                all_options[split_str[0]] = split_str[1]
+            return table.column(m.group(1), optional=True, **all_options)
+        return table.column(column_name, optional=True)
+
+    def build_columns(
+        self,
+        format_doc,
+        subtable_column_name=None,
+        **kwargs,
+    ):
+        column_names = OrderedDict()
+        for column_name in format_doc:
+            if column_name == "all":
+                for c in self._get_column_names(subtable_column_name):
+                    column_names[c] = self._get_output_column(c)
+            elif isinstance(column_name, dict):
+                sub_table_col = list(column_name.keys())[0]
+                sub_table_val = column_name[sub_table_col]
+                column_names[sub_table_col] = self._make_subtable(
+                    sub_table_col,
+                    sub_table_val,
+                )
+            else:
+                column_names[column_name] = self._get_output_column(column_name)
+
+        return list(column_names.values())
+
+
+def make_columns(
+    ctx,
+    result_list,
+    base_columns,
+    show=None,
+    clear=False,
+    **kwargs,
+):
+    """
+    A generic build for making columns, configurable by user
+    to choose specific columns or subtables.
+
+    Add the following options to your command:
+    @click.option("--show-columns", type=str, default=None)
+    @click.option("--reset-columns", is_flag=True, default=False)
+
+    Then call make_columns (for example)
+    columns = make_columns(ctx, results, ["id", "email"], show=show, clear=clear)
+
+    This make the 'default' show have columns 'id', 'email'.
+
+    You may clear it, and start from scratch:
+
+    show just email:
+      --clear --show email
+
+    show email and the id
+      --clear --show id,email
+
+    show all columns
+      --clear --show all
+
+    show a subtable:
+      --clear --show "[id,email,upstream_user_identities: [all]]"
+
+    show a specific column in the subtable:
+      --clear --show "[id,email,upstream_user_identities: [spec.upstream_idp_id]]"
+
+     rename the output column
+      --clear --show "[id,email,upstream_user_identities: [spec.upstream_idp_id(newname=upstream_idp_id)]]"  # noqa
+
+    Note that the show format is a valid yaml doc. Its a list of columns, when
+    a mapping (dictionary) is found that is assumed to be a subtable, where the
+    key name is the subtable name
+    """
+    format_doc = []
+    if not clear and base_columns:
+        format_doc = yaml.safe_load(base_columns)
+
+    if show:
+        if "[" not in show:
+            # incase the user hasn't created a valid yaml list,
+            # make it a list.
+            show = "[" + show + "]"
+        format_doc.extend(yaml.safe_load(show))
+
+    return ColumnBuilder(ctx, result_list).build_columns(format_doc, **kwargs)

agilicus/output/table.py

@@ -1,9 +1,7 @@
 import operator
 import json
-import yaml
 from babel import numbers
 from datetime import timezone, datetime
-from collections import OrderedDict
 
 from agilicus import context
 from agilicus.output.json import convert_to_json
@@ -12,6 +10,7 @@ from dataclasses import dataclass
 from typing import Callable
 
 from prettytable import PrettyTable
+from . import column_builder
 
 
 def format_date(date_input):
@@ -289,109 +288,5 @@ def output_entry(ctx, entry):
         print(table)
 
 
-def get_column_names(result_list, subtable_column_name):
-    results = set()
-    if not result_list:
-        return results
-    obj = result_list[0]
-    if subtable_column_name:
-        obj = getattr(obj, subtable_column_name)
-        if not obj:
-            # nothing available
-            return results
-        obj = obj[0]
-    return set(obj.to_dict().keys())
-
-
-def make_subtable(ctx, result_list, table_name, format_doc):
-    columns = _build_columns(
-        ctx, result_list, format_doc, subtable_column_name=table_name
-    )
-    return subtable(
-        ctx,
-        table_name,
-        columns=columns,
-        optional=True,
-    )
-
-
-def make_columns(
-    ctx,
-    result_list,
-    base_columns,
-    show=None,
-    clear=False,
-    **kwargs,
-):
-    """
-    A generic build for making columns, configurable by user
-    to choose specific columns or subtables.
-
-    Add the following options to your command:
-    @click.option("--show-columns", type=str, default=None)
-    @click.option("--reset-columns", is_flag=True, default=False)
-
-    Then call make_columns (for example)
-    columns = make_columns(ctx, results, ["id", "email"], show=show, clear=clear)
-
-    This make the 'default' show have columns 'id', 'email'.
-
-    You may clear it, and start from scratch:
-
-    show just email:
-      --clear --show email
-
-    show email and the id
-      --clear --show id,email
-
-    show all columns
-      --clear --show all
-
-    show a subtable:
-      --clear --show id,email,upstream_user_identities: [all]
-
-    show a specific column in the subtable:
-      --clear --show id,email,upstream_user_identities: [spec.upstream_idp_id]
-
-    Note that the show format is a valid yaml doc. Its a list of columns, when
-    a mapping (dictionary) is found that is assumed to be a subtable, where the
-    key name is the subtable name
-    """
-    format_doc = []
-    if not clear and base_columns:
-        format_doc = yaml.safe_load(base_columns)
-
-    if show:
-        if "[" not in show:
-            # incase the user hasn't created a valid yaml list,
-            # make it a list.
-            show = "[" + show + "]"
-        format_doc.extend(yaml.safe_load(show))
-    return _build_columns(ctx, result_list, format_doc, **kwargs)
-
-
-def _build_columns(
-    ctx,
-    result_list,
-    format_doc,
-    subtable_column_name=None,
-    **kwargs,
-):
-    column_names = OrderedDict()
-    for column_name in format_doc:
-        if column_name == "all":
-            for c in get_column_names(result_list, subtable_column_name):
-                column_names[c] = column(c, optional=True)
-        elif isinstance(column_name, dict):
-            sub_table_col = list(column_name.keys())[0]
-            sub_table_val = column_name[sub_table_col]
-            column_names[sub_table_col] = make_subtable(
-                ctx,
-                result_list,
-                sub_table_col,
-                sub_table_val,
-            )
-        else:
-            column_names[column_name] = column(column_name, optional=True)
-
-    return list(column_names.values())
+def make_columns(*args, **kwargs):
+    return column_builder.make_columns(*args, **kwargs)

agilicus/output/tests/column_builder_test.py

@@ -0,0 +1,73 @@
+import agilicus
+from .. import column_builder
+
+
+def test_simple():
+    assert column_builder.make_columns(None, [], "") == []
+
+
+def test_show_single_column():
+    results = [
+        agilicus.User._from_openapi_data(
+            email=agilicus.Email("foo@bar.com"), type="user"
+        )
+    ]
+    columns = column_builder.make_columns(None, results, "[email]")
+    assert len(columns) == 1
+    assert columns[0].in_name == "email"
+    assert columns[0].out_name == "email"
+
+
+def test_show_multi_column():
+    results = [
+        agilicus.User._from_openapi_data(
+            id="one", email=agilicus.Email("foo@bar.com"), type="user"
+        )
+    ]
+    columns = column_builder.make_columns(None, results, "[id,email]")
+    assert len(columns) == 2
+    assert columns[0].in_name == "id"
+    assert columns[0].out_name == "id"
+
+    assert columns[1].in_name == "email"
+    assert columns[1].out_name == "email"
+
+
+def test_rename_col():
+    results = [
+        agilicus.User._from_openapi_data(
+            id="one", email=agilicus.Email("foo@bar.com"), type="user"
+        )
+    ]
+    columns = column_builder.make_columns(
+        None, results, "[id(newname=blah),email(newname=huh)]"
+    )
+    assert len(columns) == 2
+    assert columns[0].in_name == "id"
+    assert columns[0].out_name == "blah"
+
+    assert columns[1].in_name == "email"
+    assert columns[1].out_name == "huh"
+
+
+def test_subtable():
+    spec = agilicus.UpstreamUserIdentitySpec(
+        upstream_user_id="user-id", upstream_idp_id="idp-id", local_user_id="local-id"
+    )
+    identities = [agilicus.UpstreamUserIdentity(spec)]
+    results = [
+        agilicus.User._from_openapi_data(
+            id="one",
+            email=agilicus.Email("foo@bar.com"),
+            type="user",
+            upstream_user_identites=identities,
+        )
+    ]
+    columns = column_builder.make_columns(
+        None,
+        results,
+        "[id,email,upstream_user_identities: [upstream_user_id,local_user_id]]",
+    )
+    assert len(columns) == 3
+    assert columns[2].in_name == "upstream_user_identities"
+    assert columns[2].out_name == "upstream_user_identities"

{agilicus-1.235.6.dist-info → agilicus-1.235.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agilicus
-Version: 1.235.6
+Version: 1.235.7
 Summary: Agilicus SDK
 Home-page: https://www.agilicus.com/
 License: MIT

{agilicus-1.235.6.dist-info → agilicus-1.235.7.dist-info}/RECORD

@@ -67,9 +67,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=LYBkMTRfpgSYHuFgFnkndHdJn9J__dGbqK
 agilicus/agilicus_api/api/users_api_mock.py,sha256=wA_xiqL3Pz3KjljKlsmf5NveLZS1FpbaKJHBp7QvarY,15411
 agilicus/agilicus_api/api/whoami_api.py,sha256=g871DyNxDhGWCmkr-jiMan9gsz9vf9CTkhZ_0VG5iuQ,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=Dz7TDPg-wsr4tFY0caAIc8-VxRNY1XfoZbdVZgGRf_Q,38845
+agilicus/agilicus_api/api_client.py,sha256=zByfZSGzpdL56Th5cUFUiz31gx_C8uDPiIj8XDo8cPo,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=m_hg6OJsEsMp6mZ1mn9OlaTflLjrU3Jc-jvYD9gi_PA,2092
-agilicus/agilicus_api/configuration.py,sha256=5YS_GAMdnbQD6GJk2jxHZhqGGwd0-53-M0WdsdNF2lE,18447
+agilicus/agilicus_api/configuration.py,sha256=N3olY94-AK3IiVFHCZwHYtguOXLAL_d2TgcBhFpeQ8k,18447
 agilicus/agilicus_api/docs/APIKey.md,sha256=4cKuz4_l9HcEDnUrLwYbEnn9C2WoDayrjfrY1Ixgaf4,1747
 agilicus/agilicus_api/docs/APIKeyIntrospect.md,sha256=nJ-zkuFm3JMbWFDYYN_vYyQk1snGBtBvIxtCQxamhAU,1019
 agilicus/agilicus_api/docs/APIKeyIntrospectAuthorizationInfo.md,sha256=7RApOOLjvWQs5sw2jb25g7i3Kta1BiEY-s8VRXfppH8,725
@@ -2338,7 +2338,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=Lfg4RqEI4LW1TcMv
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=8rBBKZ1fEUFWalJ-Us0gW8YsEiQ0CvWx9rwvYXY2xSw,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=sU8X_0AYylgIY7t39Eu1S_0EkxfJF25QBxIVOQlrwoU,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=e_pj73f8a6buA5B0cZgLV4Pu2BXUyfFmLLxVvW3I3Tw,2746
-agilicus/agilicus_api_README.md,sha256=rflvt4yW40OJvrQxggv3Dxw7FETuzo9wvcF3sXi9EsY,150199
+agilicus/agilicus_api_README.md,sha256=ZPZtB66boJs_i4YT5e-fFnWfGU-JV_fMFIcBFGvO8VE,150199
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=3j7Yj82S8hr4IHw2uzYiJ1-kOq_9PT1G0-0ZbxflAQ0,48757
@@ -2365,7 +2365,7 @@ agilicus/env_config.py,sha256=sqg9hecJYA7jXj58TmZOvmYboqIKbZ5Rxl2Rqe75M4Q,7629
 agilicus/examples/update_user.py,sha256=jGaEVTWFFlD26soSEYYcAtlGfELU85z3YnXAwK5q4fM,1082
 agilicus/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agilicus/features/features.py,sha256=nqxAo69Bn1zafBB2VbiCXixa17jWMrxN6V0u3iyqs0c,2327
-agilicus/features/features_main.py,sha256=ptMGWWwoKmSWWbj-h87K2p9MEEVq1Afp4AzEg0Ak2-4,3601
+agilicus/features/features_main.py,sha256=InvXz-Eka6ySQAUM-u6KBkRPEY5lviHuZXeow5uqLto,3779
 agilicus/features.py,sha256=wnh3uD57xZRzt4aCYCrGXu4DaMKv2-uwZc3akUiXUYE,1118
 agilicus/file_shares.py,sha256=ZwO3OwfRsDTZu6VwDcvqyC5OeHWnoA9hQ8vzygXGeE8,4326
 agilicus/files.py,sha256=rgyUytII4LjsPdIIJVvqx8GnsUQmowDbGKK0VKGiglk,7272
@@ -2385,14 +2385,17 @@ agilicus/labels/labels_main.py,sha256=aXRNRT1CPiUc0x1Gh_VoCmzrbROzsC5e9ycrwPNT0q
 agilicus/launchers.py,sha256=Yy59dzHMCz9ZSs_mMjVGaTw3vdNX58WsmIfX56by69U,11077
 agilicus/logs.py,sha256=tS8c_sdre1Dncrl59GVGQ0L3d2jtwlVjvIMl3SHJraY,766
 agilicus/lookups.py,sha256=MNmNsKpP7Fq_poLAnL9xo_iptFilKM9ziGLyIe8VKaw,669
-agilicus/main.py,sha256=X0U93Gx8LG0cxYjjZWnV2WysRJE9AwFJU9bvAH5qDEs,255154
+agilicus/main.py,sha256=MIkxsAQM3MB2xMP-toZ1iRlQZiXJuEPh7oxFUert3Mk,255835
 agilicus/messages.py,sha256=Ydm-VhAsK23UnYdstv_HsOybBODfui5ubKc7F8R_dsw,5187
 agilicus/metrics.py,sha256=9l0T7ea4Gvcj7A1C4uC4mv6v26_S8HKnmIuxJjq3mQw,1424
 agilicus/orgs.py,sha256=hrKmF8RI4H1htQNWPiwFOzy2EPBLdgNpV4c9CMxYSiM,12701
 agilicus/output/__init__.py,sha256=UKZbHS4t15vazJuN46FN-3HHqkxMXU0p3df2VcsSLcY,110
+agilicus/output/column_builder.py,sha256=TWo4t8ygaTUv7qjD_moDroD1bKzzyTIao0FmLy5gs4o,4284
 agilicus/output/console.py,sha256=xBURxlA7H1kmQ7zIKuifs_aQJq1cvmCJ5CtQVSo3_Ns,400
 agilicus/output/json.py,sha256=5UU8Fm_b46y8iu3EPkg2eWwdbCyubgCxIdfecDTd4_Y,663
-agilicus/output/table.py,sha256=DKEvk2cD1u54iJzDEGe7BwHoPv4anT8I4C8ZBsAFfAw,10512
+agilicus/output/table.py,sha256=RzPMpaFPP5HP7h6LQSQF8nNnDBErJnOjosuCGiDS2jI,7542
+agilicus/output/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agilicus/output/tests/column_builder_test.py,sha256=fKP4V5sqXtmEIr-Q0gWVSFdBqCUtugZkP6G5gML_T7I,2130
 agilicus/pagination/pagination.py,sha256=AG2DI6Kurv6akZ6lV2M3ynDtE8C4js5x3wCOVzasCuI,1576
 agilicus/patches.py,sha256=qTqLOgCAcFZPcPOkgfqMnK9bnqTXMvj_0ERsjRFcZug,1384
 agilicus/permissions.py,sha256=uB65yuDFICp1N10m0cdUjgizx9MQzAbLbAsBSTw1Rcc,2117
@@ -2419,8 +2422,8 @@ agilicus/trusted_certs/trusted_certs_main.py,sha256=6dHHWXvNIcUa_nA9ptigL4Vibe4n
 agilicus/users.py,sha256=lT1EoyjwKjRoc0NoU6ANGHRSetN-t8AMgkllCKZP0UM,38746
 agilicus/version.py,sha256=G9OFdL1v_4dLDfk6I6taDNypM5bbO-JHAwilsu9LYgg,23
 agilicus/whoami.py,sha256=kqghtWMgZOd2rhKmfguDwCTm6A3gNS8Kj-S2IBxBtl0,206
-agilicus-1.235.6.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.235.6.dist-info/METADATA,sha256=p2K1arVkny7oaLBSpYybJXxSaOX0Gx_CvdOhKsMvlRA,3742
-agilicus-1.235.6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-agilicus-1.235.6.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.235.6.dist-info/RECORD,,
+agilicus-1.235.7.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.235.7.dist-info/METADATA,sha256=5kIvoRTQYYlA8PeqFzf4hi6dilXYLkKy6INVmDxj4uM,3742
+agilicus-1.235.7.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+agilicus-1.235.7.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.235.7.dist-info/RECORD,,