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

agilicus/connectors.py

@@ -49,17 +49,44 @@ def _filter_version(connector, not_version=None):
     return filter_out
 
 
-def do_filter(ctx, no_down, connectors, not_version=None, sort_by=None, **kwargs):
+def _filter_os_version(connector, os_version_regex):
+    if not os_version_regex:
+        return False
+
+    filter_out = True
+    for instance in connector["status"].get("instances", []):
+        try:
+            if os_version_regex.match(_get_os_version(instance, "")):
+                filter_out = False
+        except Exception:
+            pass
+    return filter_out
+
+
+def do_filter(
+    ctx,
+    no_down,
+    connectors,
+    not_version=None,
+    sort_by=None,
+    filter_os_version=None,
+    **kwargs,
+):
     if sort_by:
         connectors = sorted(connectors, key=lambda k: (operator.attrgetter(*sort_by)(k)))
 
-    if no_down is False:
-        return connectors
+    os_version_regex = None
+    if filter_os_version:
+        os_version_regex = re.compile(filter_os_version)
     filtered_connectors = []
     for connector in connectors:
         if _filter_version(connector, not_version):
             continue
-        if connector["status"]["operational_status"]["status"] != "down":
+        if _filter_os_version(connector, os_version_regex):
+            continue
+        if not no_down:
+            filtered_connectors.append(connector)
+        elif connector["status"]["operational_status"]["status"] != "down":
             filtered_connectors.append(connector)
     return filtered_connectors
 
@@ -71,6 +98,7 @@ def query(
     sort_by=None,
     page_at_id=None,
     page_size=500,
+    filter_os_version=None,
     **kwargs,
 ):
     token = context.get_token(ctx)
@@ -96,6 +124,7 @@ def query(
         query_results,
         not_version=not_version,
         sort_by=sort_by,
+        filter_os_version=filter_os_version,
         **kwargs,
     )
 
@@ -170,6 +199,7 @@ def _instances_table():
         status_column("instance_number"),
         column("status", newname="status", getter=_get_oper_status, optional=True),
         column("hostname", getter=_get_hostname, optional=True),
+        column("os_version", getter=_get_os_version, optional=True),
         column("version", getter=_get_version, optional=True),
         column(
             "stats",

agilicus/main.py

@@ -5189,6 +5189,7 @@ def show_api_key_introspection(ctx, email, api_key, include_suborgs=False, **kwa
 @click.option("--no-down", is_flag=True, type=bool, default=False)
 @click.option("--page-at-id", default=None)
 @click.option("--page-size", default=500, type=int)
+@click.option("--filter-os-version", default=None)
 @click.option(
     "--sort-by",
     type=click.Choice(["metadata.created", "status.operational_status.status"]),

agilicus/output/table.py

@@ -221,12 +221,41 @@ def _dump_json(ctx, to_dump):
     return convert_to_json(ctx, to_dump_as_dict)
 
 
+def get_table_style(ctx):
+    table_style_str = context.get_value(ctx, "output_format")
+    table_style = None
+    if table_style_str and table_style_str != "console":
+        from prettytable import (
+            DEFAULT,
+            MARKDOWN,
+            PLAIN_COLUMNS,
+            MSWORD_FRIENDLY,
+        )
+
+        if table_style_str == "default":
+            table_style = DEFAULT
+        elif table_style_str == "markdown":
+            table_style = MARKDOWN
+        elif table_style_str == "plain":
+            table_style = PLAIN_COLUMNS
+        elif table_style_str == "msword":
+            table_style = MSWORD_FRIENDLY
+        else:
+            raise Exception(f"invalid table style {table_style_str}")
+    return table_style
+
+
 def format_table(
     ctx, records, columns, getter=short_circuit_attrgetter, row_filter=None
 ):
     if context.output_json(ctx):
         return _dump_json(ctx, records)
     table = PrettyTable([column.out_name for column in columns])
+
+    table_style = get_table_style(ctx)
+    if table_style:
+        table.set_style(table_style)
+
     if not records:
         return table
 

agilicus/policy/policies.py

@@ -1,4 +1,7 @@
 import copy
+import datetime
+import json
+import os
 from ..input_helpers import (
     get_org_from_input_or_ctx,
     model_from_dict,
@@ -18,6 +21,9 @@ from agilicus import (
     SimpleResourcePolicyTemplateStructure,
     SimpleResourcePolicyTemplate,
     StandaloneRuleName,
+    RuleAction,
+    ResourceConfig,
+    RulesConfig,
     RuleCondition,
     HttpRuleCondition,
     EmptiableObjectType,
@@ -197,7 +203,7 @@ def set_source_info_policy(
     return resp
 
 
-def migrate_policy_rules(ctx, org_id=None, **kwargs):
+def migrate_policy_rules(ctx, org_id=None, dump_dir=None, **kwargs):
     org_id = get_org_from_input_or_ctx(ctx, org_id=org_id)
     kwargs = strip_none(kwargs)
     if not kwargs.get("resource_id"):
@@ -205,20 +211,19 @@ def migrate_policy_rules(ctx, org_id=None, **kwargs):
     for res in query_resources(
         ctx, resource_type="application", org_id=org_id, **kwargs
     ):
-        migrate_resource(ctx, res)
+        migrate_resource(ctx, res, dump_dir=dump_dir)
 
 
-def migrate_resource(ctx, resource):
+def migrate_resource(ctx, resource, dump_dir=None):
     print(f"  migrating resource: {resource.spec.name}")
-    if (
-        not resource.spec.config
-        or not resource.spec.config.rules_config
-        or not resource.spec.config.rules_config.rules
-    ):
-        print("  no rules found")
-        return
+    resource.spec.config = resource.spec.config or ResourceConfig()
+    resource.spec.config.rules_config = (
+        resource.spec.config.rules_config or RulesConfig()
+    )
+
+    rules = resource.spec.config.rules_config.rules or []
     policy_structures = []
-    for rule in resource.spec.config.rules_config.rules:
+    for rule in rules:
         node = SimpleResourcePolicyTemplateStructureNode(
             priority=rule.priority or 0,
             rule_name=StandaloneRuleName(rule.name),
@@ -231,9 +236,7 @@ def migrate_resource(ctx, resource):
             )
         )
     template = SimpleResourcePolicyTemplate(
-        rules=[
-            _migrate_http_rule(rule) for rule in resource.spec.config.rules_config.rules
-        ],
+        rules=[_migrate_http_rule(rule) for rule in rules],
         policy_structure=policy_structures,
         template_type="simple_resource",
     )
@@ -264,14 +267,34 @@ def migrate_resource(ctx, resource):
         ),
         to_dict=False,
     )
+
+    _clear_old_rules(apiclient, resource, dump_dir)
+
     return resp
 
 
+def _dump_resource_rules(resource, dump_dir):
+    now = datetime.datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+    file_name = f"{resource.spec.org_id}-{resource.spec.name}-{now}.json"
+    with open(os.path.join(dump_dir, file_name), "w") as f:
+        json.dump(resource.spec.config.rules_config.to_dict(), f)
+
+
+def _clear_old_rules(apiclient, resource, dump_dir):
+    if dump_dir:
+        _dump_resource_rules(resource, dump_dir)
+
+    resource.spec.config.rules_config = RulesConfig(rules=[])
+
+    apiclient.resources_api.replace_resource(resource.metadata.id, resource=resource)
+
+
 def _migrate_http_rule(input_rule):
     if input_rule.extended_condition is not None:
         return input_rule
 
     new_rule = copy.deepcopy(input_rule)
+    new_rule.actions = new_rule.actions or [RuleAction(action="allow")]
     input_cond = new_rule.condition.to_dict()
     input_cond["condition_type"] = "http_rule_condition"
     cond = model_from_dict(HttpRuleCondition, input_cond)

agilicus/policy/policy_main.py

@@ -42,6 +42,7 @@ def cli_command_list_multifactor_policies(ctx, **kwargs):
 @click.command(name="list-policy-templates", help="shows all policy templates")
 @click.option("--org-id", default=None)
 @click.option("--template-type", default=None)
+@click.option("--include-invalid", type=bool, default=None)
 @click.option("--name", default=None)
 @click.pass_context
 def cli_command_list_policy_templates(ctx, **kwargs):
@@ -93,6 +94,7 @@ def cli_command_delete_policy_template(ctx, **kwargs):
 @click.command(name="migrate-policy-rules")
 @click.option("--org-id", default=None)
 @click.option("--resource-id", default=None)
+@click.option("--dump-dir", default=None, help="A directory to cache migrated rules")
 @click.pass_context
 def cli_command_migrate_policy_rules(ctx, **kwargs):
     policies.migrate_policy_rules(ctx, **kwargs)

{agilicus-1.260.2.dist-info → agilicus-1.261.1.dist-info}/METADATA

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

{agilicus-1.260.2.dist-info → agilicus-1.261.1.dist-info}/RECORD

@@ -71,9 +71,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=xhcIheRgjfMpQ3RbekgnOp3ODUUm6deY1H
 agilicus/agilicus_api/api/users_api_mock.py,sha256=wA_xiqL3Pz3KjljKlsmf5NveLZS1FpbaKJHBp7QvarY,15411
 agilicus/agilicus_api/api/whoami_api.py,sha256=c95A5Rfll7idVIb09yTzUjqAVDpyVlRugUjprI5JBbo,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=chV8b80JpCetefdOOpmj5piE2pdA--TVITpd4am7AfQ,38845
+agilicus/agilicus_api/api_client.py,sha256=RVJTXA-4mbwXbSvCumsLf7m8OQCsNp884Z3xv-k4QD4,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=aJZD7x-umdSni6ZBr4XxzpH8pwtU9hA5LlCDxcqa1Q8,2224
-agilicus/agilicus_api/configuration.py,sha256=-5dZ76yPkNjBOJ5M1RSHad_frTox3jzGuGkjmlZQxQ0,18447
+agilicus/agilicus_api/configuration.py,sha256=TWEJOapz7-160xzekTqWMwneET6iP1oLavW1WtHG4ko,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
@@ -2508,7 +2508,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=H82JE5XkABLdxrdI
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=Avjjv9atO5hYlSmAJU1CzS7M0l-0bPs6q4N5iXSoMcs,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=6Iw5aUxT4lNJnOHK0ehotwh-niT9tuSCJIjRe1DKlRg,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=Stf0gqkOTrsfpeYF22QDlz85_Nny56SSwv5dpFZoNQU,2746
-agilicus/agilicus_api_README.md,sha256=Lf7tXwdvZG009k6yIY0c8MeXrI-H-YVMj8UXng0vkVU,161008
+agilicus/agilicus_api_README.md,sha256=QzlQVNUXHUOjBUddcrdX0VRLieBD_oKbI_mOTioE3ms,161008
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=uYNUNy5rCYjx90KnR_X_aESof9xzSuLYT5w8myN_VVE,52091
@@ -2520,7 +2520,7 @@ agilicus/certificate.py,sha256=iXC4iT3EGISyEezrvMgfic_lSCx2_JMSWevTLyGekR8,2739
 agilicus/challenges.py,sha256=Ig9888pHGMigBxI_e8m2T_HZiqbU6TxsBXT2EKZoIUY,6968
 agilicus/click_extension.py,sha256=uE57TjMqJxO9VFPBJO5-bTo9UrQiHPjIdI_iwKSaw6Q,224
 agilicus/client_secrets.json,sha256=eyPFVzziH48RuwWl66cfi0JE4jpmoec0Vo_F2TzYOeI,414
-agilicus/connectors.py,sha256=RhnLMxQNNEgmkh9lCSQazL0uovt7lFuJJ1Eo1Wv9qqE,41229
+agilicus/connectors.py,sha256=4RLQEJ5s4QpKYZo6ZkVi2lWtRxToCBEtEh5wdbQ41nc,42016
 agilicus/context.py,sha256=tlmtUK5B1G-gBqfmljaPKPhLKur92jgAi5xC9SA7AVs,8128
 agilicus/create.py,sha256=ndMbOxQasyyUY7aW4U2TU8EKGcUla72xCjAwAwfTBVA,3270
 agilicus/credentials.py,sha256=F3yPAwoMcziP1OLmzeJ8jIz1W-91-HXu4zcymyMp1E4,4730
@@ -2558,7 +2558,7 @@ agilicus/labels/labels_main.py,sha256=ptJ34mf-iVaf8ezf3RWLcpeP2O0ntezS4tqJ0ks0el
 agilicus/launchers.py,sha256=r4nctnVtfP-Ho_HXEfAiMaMqJI0u7pbieHSS3Vd0QBE,11361
 agilicus/logs.py,sha256=tS8c_sdre1Dncrl59GVGQ0L3d2jtwlVjvIMl3SHJraY,766
 agilicus/lookups.py,sha256=MNmNsKpP7Fq_poLAnL9xo_iptFilKM9ziGLyIe8VKaw,669
-agilicus/main.py,sha256=SCcayJjWCxeII63Alk-bWacHyr1VYORPfMpMQjvV8dE,269882
+agilicus/main.py,sha256=SvAbc6FXAKb38YdfQaBe9Az7qZnUcv_iPSdpPAqzvaU,269933
 agilicus/messages.py,sha256=Ydm-VhAsK23UnYdstv_HsOybBODfui5ubKc7F8R_dsw,5187
 agilicus/metrics.py,sha256=v4rwpvqDzeNG5GKNoZ7t34X5qUgly5IW2s-kXlS2vQM,2315
 agilicus/orgs.py,sha256=THcm1Me58PJ7Lai4LHptBitaymH0TXVXapFd7WZ3Mpg,14399
@@ -2566,14 +2566,14 @@ agilicus/output/__init__.py,sha256=UKZbHS4t15vazJuN46FN-3HHqkxMXU0p3df2VcsSLcY,1
 agilicus/output/column_builder.py,sha256=TWo4t8ygaTUv7qjD_moDroD1bKzzyTIao0FmLy5gs4o,4284
 agilicus/output/console.py,sha256=xBURxlA7H1kmQ7zIKuifs_aQJq1cvmCJ5CtQVSo3_Ns,400
 agilicus/output/json.py,sha256=-5bX7ud1hIxux4l3P-K2gJXrE2gdZ0Ua1hfUOCX9MUM,899
-agilicus/output/table.py,sha256=slOLs30rybyZYFGNd_5bh4gVVz7tNafg3sey_20H1w8,7906
+agilicus/output/table.py,sha256=o5kYgAtIAhei4ex7YZrTK9tDVarJQHzF2Yj42TXt21g,8744
 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=hC7eLHxXKe4Iv7LdOZK3Dh8R_fKQIr9PPiWKJVyP4Nk,1672
 agilicus/patches.py,sha256=qTqLOgCAcFZPcPOkgfqMnK9bnqTXMvj_0ERsjRFcZug,1384
 agilicus/permissions.py,sha256=uB65yuDFICp1N10m0cdUjgizx9MQzAbLbAsBSTw1Rcc,2117
-agilicus/policy/policies.py,sha256=iAqb4rOWJn5USqAVB9f-YMLrNRJtu6X2Ckmw7Jw0JN0,8834
-agilicus/policy/policy_main.py,sha256=0fASWbzeWpaQEjwX5VOg90ZI-HZvOLCPJdrV3ahd4Hk,3732
+agilicus/policy/policies.py,sha256=LrteEsXjou_RyW_PcqijBhtN2jaIomXFXQIfNArUP6I,9625
+agilicus/policy/policy_main.py,sha256=CSg7cFHlZo12eu9T-ugTM1U_sp7QWOXtQN14jbe7KyQ,3878
 agilicus/policy/templates.py,sha256=EUvAhOhSjDuLAe2UKIFEzBp5pNpOT5y1r7uyV_GG6uI,5638
 agilicus/policy_config/policy_config.py,sha256=s1GwbBI5wuLINcViTKE8NdfcntLEegwpUEi7pqmdKkY,627
 agilicus/policy_config/policy_config_main.py,sha256=ReiOziCvPShjunCt3ohrEMGq0IaP0eNyIXEvEg_WD1M,788
@@ -2599,8 +2599,8 @@ agilicus/trusted_certs/trusted_certs_main.py,sha256=6dHHWXvNIcUa_nA9ptigL4Vibe4n
 agilicus/users.py,sha256=JT7TIiUOtSFXPOdxmIVFm7ygZTH1FjsIkD9j-vjLuMM,38474
 agilicus/version.py,sha256=G9OFdL1v_4dLDfk6I6taDNypM5bbO-JHAwilsu9LYgg,23
 agilicus/whoami.py,sha256=kqghtWMgZOd2rhKmfguDwCTm6A3gNS8Kj-S2IBxBtl0,206
-agilicus-1.260.2.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.260.2.dist-info/METADATA,sha256=gfWpPR8VoSk7Kwh1Q79KrfG-90J-kW1G5Bzs9dADAJg,3822
-agilicus-1.260.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-agilicus-1.260.2.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.260.2.dist-info/RECORD,,
+agilicus-1.261.1.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.261.1.dist-info/METADATA,sha256=5embCylX3QnDGxRgMGo8sfYEEGEB88y0EjoX6mCHyHk,3822
+agilicus-1.261.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+agilicus-1.261.1.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.261.1.dist-info/RECORD,,