agilicus 1.247.1__py3-none-any.whl → 1.247.2__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.247.1/python'
+        self.user_agent = 'OpenAPI-Generator/1.247.2/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: 2024.03.27\n"\
-               "SDK Package Version: 1.247.1".\
+               "SDK Package Version: 1.247.2".\
                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: 2024.03.27
-- Package version: 1.247.1
+- Package version: 1.247.2
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.agilicus.com/api](https://www.agilicus.com/api)
 

agilicus/main.py

@@ -5843,13 +5843,19 @@ def bulk_delete_resource_permission(ctx, **kwargs):
 )
 @click.option("--page-at-id", default=None)
 @click.option("--limit", default=500)
+@click.option("--show-columns", type=str, default=None)
+@click.option("--reset-columns", is_flag=True, default=False)
 @click.pass_context
-def list_resources(ctx, **kwargs):
+def list_resources(ctx, reset_columns=None, show_columns=None, **kwargs):
     """Lists generic resources, which can be filtered by type, organisation, etc."""
     if kwargs["name"] is None:
         kwargs.pop("name")
+    if show_columns and "resource_urls" in show_columns:
+        kwargs["resource_urls"] = True
     results = resources.query_resources(ctx, **kwargs)
-    table = resources.format_resources(ctx, results)
+    table = resources.format_resources(
+        ctx, results, show_columns=show_columns, reset_columns=reset_columns
+    )
     print(table)
 
 

agilicus/resources.py

@@ -4,6 +4,9 @@ from . import context
 from .input_helpers import get_org_from_input_or_ctx, update_if_not_none
 from .input_helpers import get_user_id_from_input_or_ctx
 from .input_helpers import update_org_from_input_or_ctx, strip_none
+from agilicus.output.table import make_columns
+
+
 from .output.table import (
     subobject_column,
     format_table,
@@ -115,29 +118,19 @@ def query_resources(ctx, org_id=None, **kwargs):
     return []
 
 
-def format_resources(ctx, resources):
-    member_columns = [
-        metadata_column("id"),
-        spec_column("name"),
-        spec_column("resource_type"),
-    ]
-    columns = [
-        metadata_column("id"),
-        spec_column("org_id", "org id"),
-        spec_column("resource_type", "type"),
-        spec_column("name", "name"),
-        status_column("resource_stats.overall_status", "status", optional=True),
-        status_column(
-            "resource_stats.last_warning_message", "last_warning", optional=True
-        ),
-        status_column(
-            "resource_stats.session_stats.total", "good_sessions", optional=True
-        ),
-        status_column(
-            "resource_stats.session_stats.failed", "failed_sessions", optional=True
-        ),
-        subtable(ctx, "status.resource_members", member_columns),
-    ]
+def format_resources(ctx, resources, show_columns=None, reset_columns=None):
+    columns = make_columns(
+        ctx,
+        resources,
+        """
+          - metadata.id(newname=id)
+          - spec.resource_type(newname=resource_type)
+          - spec.name(newname=name)
+          - status.resource_stats.overall_status(newname=status)
+        """,
+        show=show_columns,
+        clear=reset_columns,
+    )
     return format_table(ctx, resources, columns)
 
 

{agilicus-1.247.1.dist-info → agilicus-1.247.2.dist-info}/METADATA

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

{agilicus-1.247.1.dist-info → agilicus-1.247.2.dist-info}/RECORD

@@ -69,9 +69,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=z4V55AwJp62PxplUKbrTM5YbQbbzJZVXz_
 agilicus/agilicus_api/api/users_api_mock.py,sha256=wA_xiqL3Pz3KjljKlsmf5NveLZS1FpbaKJHBp7QvarY,15411
 agilicus/agilicus_api/api/whoami_api.py,sha256=O9uBd6bnhVoFPylDygpP8d-6oNzf3f_Illc34kwEWRk,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=bZbCnM_t3N4fvaXfppBJ36ZxQylN5cMRzZ8JpGnhExA,38845
+agilicus/agilicus_api/api_client.py,sha256=Wwl7myx5UA1Pkrbu_jBaCugkirDcuNfGjaYLifPCais,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=QnjTuP08uv9bNvzdrnwROJ4u8C1DVic2YC7kEISgLDY,2161
-agilicus/agilicus_api/configuration.py,sha256=d4F1dcXtSK-YJiXbBaMRsMyRPfVLH_PuybD7dT9s07A,18447
+agilicus/agilicus_api/configuration.py,sha256=CTArCVv6EXjkQl7cZXrjlg4AP7RSbNGe0d9-CQtMrxk,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
@@ -2420,7 +2420,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=zevPipdTp5dJo7TJ
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=dO_SVhKPsz_amF-F4MkHzBEkvxp85c0mbGLvEJOEwh0,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=5n9yxO8J6MxD208gPPcEz9GxTLA5IqHiGz_QCWbFMoM,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=A6Gt1muXu3HPnj6KjN_rQIqa5Ti_AgrQTfUP163TWU4,2746
-agilicus/agilicus_api_README.md,sha256=uh5Gq-A6Mr3BR1YfAU2gfbg4iXrkllOoOaN_Xf_Oz8I,156066
+agilicus/agilicus_api_README.md,sha256=mJwjKkt4XMQCR0R0unxkbIByaYww79cedhUibVW1mCI,156066
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=8k_tGraPUVKJURksZwKR8eNGW-4CSPv54FYcApQ3Ly8,50857
@@ -2469,7 +2469,7 @@ agilicus/labels/labels_main.py,sha256=i3HA1ZuMG6N28mwmlhAMt4N95RNpm4eDS3EVRChjRu
 agilicus/launchers.py,sha256=XRW8cO_S7HHs-Cc6_baol9AOOsuGlMto7bLcsKYk6qA,11199
 agilicus/logs.py,sha256=tS8c_sdre1Dncrl59GVGQ0L3d2jtwlVjvIMl3SHJraY,766
 agilicus/lookups.py,sha256=MNmNsKpP7Fq_poLAnL9xo_iptFilKM9ziGLyIe8VKaw,669
-agilicus/main.py,sha256=xPfS-8DrLgiv8vZ5V1pG0PoqRWU8-DEVyQalpGeKfd8,263868
+agilicus/main.py,sha256=J9UAbEjKmw9BytzzwxyW9ZAeV0Ca4zcfqOiG3spdves,264191
 agilicus/messages.py,sha256=Ydm-VhAsK23UnYdstv_HsOybBODfui5ubKc7F8R_dsw,5187
 agilicus/metrics.py,sha256=v4rwpvqDzeNG5GKNoZ7t34X5qUgly5IW2s-kXlS2vQM,2315
 agilicus/orgs.py,sha256=rwTuumHWz0_QPqWNdDPPdAJRGTTNUxVw7bBkxU5a8n8,12874
@@ -2491,7 +2491,7 @@ agilicus/products/products.py,sha256=he27jN3MUyXBdTdV2HRyvUYb0zD3W1TGsuC7NHLKngQ
 agilicus/products/products_main.py,sha256=saa2-e5oeHW6D5AWPcld99KwgQ9nBY3hoW8Jz_5nfMQ,3421
 agilicus/regions.py,sha256=21SzUJ9_hC8DiWLSLJ-vtSb1tWLhlcPXH9JhmXD_ypU,3343
 agilicus/resource_helpers.py,sha256=fyfqAxjfnIth1KlHNALlLtYYXIZzlWEJmSZNLdj2JV0,380
-agilicus/resources.py,sha256=nlH4cezzfaiq4M7BK7iwXFUYF3kG9_Su6sFEEXX6I2M,10163
+agilicus/resources.py,sha256=CbtuB0SlxtkC6iarzfTBesT2Kpmbw5OZ84HfTp7O1iw,9790
 agilicus/response.py,sha256=tI2-dAJwhBuuDplSsouuMmCmKHSwR_Mx71af8tgsuYo,468
 agilicus/rules/rules.py,sha256=ALHJr_tX2iGDKGKUMTteAp0iUQExqNGAhz3hcypxaF0,21019
 agilicus/rules/rules_main.py,sha256=hHyeY0WzFT2l1AQlA1C1PJQLuaEAgRhSbIUALHIyaa8,10750
@@ -2509,8 +2509,8 @@ agilicus/trusted_certs/trusted_certs_main.py,sha256=6dHHWXvNIcUa_nA9ptigL4Vibe4n
 agilicus/users.py,sha256=cBqZwqNz_9lcEJuFL5YTUFpbN56kL0-maBlM29KWWrQ,38728
 agilicus/version.py,sha256=G9OFdL1v_4dLDfk6I6taDNypM5bbO-JHAwilsu9LYgg,23
 agilicus/whoami.py,sha256=kqghtWMgZOd2rhKmfguDwCTm6A3gNS8Kj-S2IBxBtl0,206
-agilicus-1.247.1.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.247.1.dist-info/METADATA,sha256=68diBsAoc7v6LC-4VxwifooaQSO7tGomPTm6SX8FXHM,3822
-agilicus-1.247.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-agilicus-1.247.1.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.247.1.dist-info/RECORD,,
+agilicus-1.247.2.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.247.2.dist-info/METADATA,sha256=-ypcVKGg9ak_mYdYWGPLeOst_a30mNz0j6Khr8Rn22g,3822
+agilicus-1.247.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+agilicus-1.247.2.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.247.2.dist-info/RECORD,,