agilicus 1.244.3__py3-none-any.whl → 1.246.0__py3-none-any.whl

agilicus/__init__.py

@@ -38,6 +38,7 @@ def create_or_update(
     create_method: Callable,
     update_method: Callable = None,
     to_dict=True,
+    guid_finder=find_guid,
 ) -> [dict, str]:
     """A helper method that handles duplicate (409)
     creation of objects. On 409, if the update_method is provided,
@@ -70,7 +71,7 @@ def create_or_update(
                 raise
             result = json.loads(body)
             if update_method:
-                guid = find_guid(result)
+                guid = guid_finder(result)
                 if to_dict:
                     return update_method(guid, obj).to_dict(), 200
                 else:

agilicus/agilicus_api/api/rules_api.py

@@ -2364,6 +2364,7 @@ class RulesApi(object):
                 org_id (str): Organisation Unique identifier. [optional]
                 label (str): Filters based on whether or not the items in the collection have the given label. . [optional]
                 get_rulesets (bool): When querying a bundle, return all rulesets associated with bundle . [optional]
+                standalone_ruleset_bundles_etag (str): The entity tag (etag) for a list of bundles. If the returned etag matches the requested etag, then no data is returned, along with status code 304. . [optional]
                 _return_http_data_only (bool): response data without head status
                     code and headers. Default is True.
                 _preload_content (bool): if False, the urllib3.HTTPResponse object
@@ -2430,6 +2431,7 @@ class RulesApi(object):
                         'org_id',
                         'label',
                         'get_rulesets',
+                        'standalone_ruleset_bundles_etag',
                     ],
                     'required': [],
                     'nullable': [
@@ -2463,6 +2465,8 @@ class RulesApi(object):
                             (str,),
                         'get_rulesets':
                             (bool,),
+                        'standalone_ruleset_bundles_etag':
+                            (str,),
                     },
                     'attribute_map': {
                         'limit': 'limit',
@@ -2471,6 +2475,7 @@ class RulesApi(object):
                         'org_id': 'org_id',
                         'label': 'label',
                         'get_rulesets': 'get_rulesets',
+                        'standalone_ruleset_bundles_etag': 'standalone_ruleset_bundles_etag',
                     },
                     'location_map': {
                         'limit': 'query',
@@ -2479,6 +2484,7 @@ class RulesApi(object):
                         'org_id': 'query',
                         'label': 'query',
                         'get_rulesets': 'query',
+                        'standalone_ruleset_bundles_etag': 'query',
                     },
                     'collection_format_map': {
                     }

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.244.3/python'
+        self.user_agent = 'OpenAPI-Generator/1.246.0/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.19\n"\
-               "SDK Package Version: 1.244.3".\
+               "SDK Package Version: 1.246.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

agilicus/agilicus_api/docs/ListStandaloneRulesetBundlesResponse.md

@@ -7,6 +7,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **standalone_ruleset_bundles** | [**[StandaloneRulesetBundle]**](StandaloneRulesetBundle.md) | List of StandaloneRulesetBundle | 
 **limit** | **int** | Limit on the number of rows in the response | 
+**page_at_id** | **str** | The id to request in the pagination query to get the next page. | [optional] 
+**standalone_ruleset_bundles_etag** | **str** | The entity tag (etag) associated with standalone_ruleset_bundles. | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

agilicus/agilicus_api/docs/RulesApi.md

@@ -2101,12 +2101,13 @@ with agilicus_api.ApiClient(configuration) as api_client:
     org_id = "1234" # str | Organisation Unique identifier (optional)
     label = "label-1" # str | Filters based on whether or not the items in the collection have the given label.  (optional)
     get_rulesets = True # bool | When querying a bundle, return all rulesets associated with bundle  (optional)
+    standalone_ruleset_bundles_etag = "asdflkjasf" # str | The entity tag (etag) for a list of bundles. If the returned etag matches the requested etag, then no data is returned, along with status code 304.  (optional)
 
     # example passing only required values which don't have defaults set
     # and optional values
     try:
         # List all standalone ruleset bundles
-        api_response = api_instance.list_standalone_ruleset_bundles(limit=limit, name=name, page_at_id=page_at_id, org_id=org_id, label=label, get_rulesets=get_rulesets)
+        api_response = api_instance.list_standalone_ruleset_bundles(limit=limit, name=name, page_at_id=page_at_id, org_id=org_id, label=label, get_rulesets=get_rulesets, standalone_ruleset_bundles_etag=standalone_ruleset_bundles_etag)
         pprint(api_response)
     except agilicus_api.ApiException as e:
         print("Exception when calling RulesApi->list_standalone_ruleset_bundles: %s\n" % e)
@@ -2123,6 +2124,7 @@ Name | Type | Description  | Notes
  **org_id** | **str**| Organisation Unique identifier | [optional]
  **label** | **str**| Filters based on whether or not the items in the collection have the given label.  | [optional]
  **get_rulesets** | **bool**| When querying a bundle, return all rulesets associated with bundle  | [optional]
+ **standalone_ruleset_bundles_etag** | **str**| The entity tag (etag) for a list of bundles. If the returned etag matches the requested etag, then no data is returned, along with status code 304.  | [optional]
 
 ### Return type
 
@@ -2142,6 +2144,7 @@ Name | Type | Description  | Notes
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
 **200** | Query succeeded |  -  |
+**304** | Response not modified |  -  |
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 

agilicus/agilicus_api/model/list_standalone_ruleset_bundles_response.py

@@ -81,6 +81,22 @@ class ListStandaloneRulesetBundlesResponse(ModelNormal):
     def limit(self, new_value):
        self.limit = new_value
 
+    @property
+    def page_at_id(self):
+       return self.get("page_at_id")
+
+    @page_at_id.setter
+    def page_at_id(self, new_value):
+       self.page_at_id = new_value
+
+    @property
+    def standalone_ruleset_bundles_etag(self):
+       return self.get("standalone_ruleset_bundles_etag")
+
+    @standalone_ruleset_bundles_etag.setter
+    def standalone_ruleset_bundles_etag(self, new_value):
+       self.standalone_ruleset_bundles_etag = new_value
+
     @cached_property
     def additional_properties_type():
         """
@@ -106,6 +122,8 @@ class ListStandaloneRulesetBundlesResponse(ModelNormal):
         return {
             'standalone_ruleset_bundles': ([StandaloneRulesetBundle],),  # noqa: E501
             'limit': (int,),  # noqa: E501
+            'page_at_id': (str,),  # noqa: E501
+            'standalone_ruleset_bundles_etag': (str,),  # noqa: E501
         }
 
     @cached_property
@@ -117,6 +135,8 @@ class ListStandaloneRulesetBundlesResponse(ModelNormal):
     attribute_map = {
         'standalone_ruleset_bundles': 'standalone_ruleset_bundles',  # noqa: E501
         'limit': 'limit',  # noqa: E501
+        'page_at_id': 'page_at_id',  # noqa: E501
+        'standalone_ruleset_bundles_etag': 'standalone_ruleset_bundles_etag',  # noqa: E501
     }
 
     read_only_vars = {
@@ -164,6 +184,8 @@ class ListStandaloneRulesetBundlesResponse(ModelNormal):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
+            page_at_id (str): The id to request in the pagination query to get the next page.. [optional]  # noqa: E501
+            standalone_ruleset_bundles_etag (str): The entity tag (etag) associated with standalone_ruleset_bundles.. [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -254,6 +276,8 @@ class ListStandaloneRulesetBundlesResponse(ModelNormal):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
+            page_at_id (str): The id to request in the pagination query to get the next page.. [optional]  # noqa: E501
+            standalone_ruleset_bundles_etag (str): The entity tag (etag) associated with standalone_ruleset_bundles.. [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)

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.19
-- Package version: 1.244.3
+- Package version: 1.246.0
 - 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

@@ -75,6 +75,7 @@ from .labels import labels_main
 from .rules import rules_main
 from .products import products_main
 from .features import features_main
+from .policy import policy_main
 from .features.features import format_features
 from .credentials_commands import credentials_main
 from .files_pkg import files_main
@@ -7939,6 +7940,7 @@ def main():
     hosts_main.add_commands(cli)
     labels_main.add_commands(cli)
     rules_main.add_commands(cli)
+    policy_main.add_commands(cli)
     products_main.add_commands(cli)
     credentials_main.add_commands(cli)
     features_main.add_commands(cli)

agilicus/policy/policies.py

@@ -0,0 +1,97 @@
+from ..input_helpers import (
+    get_org_from_input_or_ctx,
+)
+
+from .. import context
+from ..rules.rules import (
+    add_list_resources_sdk,
+    list_rules,
+    list_rule_trees,
+    list_rulesets,
+    RuleAddInfo,
+    RulesetAddInfo,
+    RuleTreeAddInfo,
+)
+
+from ..output.table import (
+    format_table,
+    column,
+)
+
+from .templates import MultifactorTemplate, MFA_LABEL
+
+
+class LabelAddInfo:
+    def __init__(self, apiclient):
+        super().__init__()
+        self.create_fn = lambda obj: apiclient.rules_api.create_ruleset_label(obj)
+        # Can't replace. Just return the object
+        self.replace_fn = lambda guid, obj: obj
+        self.name_getter = lambda obj: obj.spec.name
+        self.guid_finder = lambda obj_as_dict: obj_as_dict["spec"]["name"]
+
+
+def set_multifactor_policy(ctx, name, duration, label=None, **kwargs):
+    org_id = get_org_from_input_or_ctx(ctx, **kwargs)
+    tmpl = MultifactorTemplate(name, duration, org_id=org_id, labels=label)
+
+    token = context.get_token(ctx)
+    apiclient = context.get_apiclient(ctx, token)
+    add_list_resources_sdk(
+        ctx,
+        tmpl.get_rules(),
+        RuleAddInfo(apiclient),
+        handle_failure=False,
+    )
+    add_list_resources_sdk(
+        ctx, tmpl.get_trees(), RuleTreeAddInfo(apiclient), handle_failure=False
+    )
+    add_list_resources_sdk(
+        ctx, tmpl.get_labels(), LabelAddInfo(apiclient), handle_failure=False
+    )
+
+    add_list_resources_sdk(
+        ctx, tmpl.get_sets(), RulesetAddInfo(apiclient), handle_failure=False
+    )
+
+    return tmpl
+
+
+def ruleset_labelled(ruleset, label):
+    for ruleset_label in ruleset.spec.labels or []:
+        if str(ruleset_label) == label:
+            return True
+    return False
+
+
+def list_multifactor_policies(ctx, **kwargs):
+    org_id = get_org_from_input_or_ctx(ctx, **kwargs)
+    rules = list_rules(ctx, org_id=org_id)
+    trees = list_rule_trees(ctx, org_id=org_id)
+    sets = list_rulesets(ctx, org_id=org_id)
+
+    names = []
+    for ruleset in sets:
+        if ruleset_labelled(ruleset, MFA_LABEL):
+            names.append(str(ruleset.spec.name))
+
+    templates = []
+    for name in names:
+        tmpl = MultifactorTemplate.from_api(
+            name=name, rules=rules, trees=trees, sets=sets, org_id=org_id
+        )
+        if tmpl:
+            templates.append(tmpl)
+
+    return templates
+
+
+def format_multifactor_policies(ctx, templates):
+    columns = [
+        column("name"),
+        column("org_id"),
+        column("duration"),
+        column("labels"),
+    ]
+
+    return format_table(ctx, templates, columns)

agilicus/policy/policy_main.py

@@ -0,0 +1,31 @@
+import click
+
+from . import policies
+from ..output.table import output_entry
+
+
+@click.command(name="set-multifactor-policy")
+@click.option("--name", required=True)
+@click.option("--label", multiple=True, type=str)
+@click.option("--duration", required=True, type=int)
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_set_multifactor_policy(ctx, **kwargs):
+    output_entry(ctx, policies.set_multifactor_policy(ctx, **kwargs).to_dict())
+
+
+@click.command(name="list-multifactor-policies")
+@click.option("--org-id", default=None)
+@click.pass_context
+def cli_command_list_multifactor_policies(ctx, **kwargs):
+    results = policies.list_multifactor_policies(ctx, **kwargs)
+    print(policies.format_multifactor_policies(ctx, results))
+
+
+all_funcs = [func for func in dir() if "cli_command_" in func]
+
+
+def add_commands(cli):
+    glob = globals()
+    for func in all_funcs:
+        cli.add_command(glob[func])

agilicus/policy/templates.py

@@ -0,0 +1,194 @@
+import regex
+
+from abc import abstractmethod
+from typing import Optional
+
+from agilicus import (
+    RuleAction,
+    RuleCondition,
+    RuleConfig,
+    MaxMFAProofRuleCondition,
+    StandaloneObjectConditions,
+    StandaloneRule,
+    StandaloneRuleName,
+    StandaloneRuleScope,
+    StandaloneRuleSpec,
+    StandaloneRuleTree,
+    StandaloneRuleTreeSpec,
+    StandaloneRuleTreeRef,
+    StandaloneRuleTreeRuleRef,
+    StandaloneRuleTreeNode,
+    StandaloneRuleset,
+    StandaloneRulesetLabelName,
+    StandaloneRulesetLabelSpec,
+    StandaloneRulesetLabel,
+    StandaloneRulesetSpec,
+)
+
+
+class PolicyTemplate:
+    @abstractmethod
+    def get_rules(self) -> list[StandaloneRule]:
+        pass
+
+    @abstractmethod
+    def get_trees(self) -> list[StandaloneRuleTree]:
+        pass
+
+    @abstractmethod
+    def get_sets(self) -> list[StandaloneRuleset]:
+        pass
+
+    @abstractmethod
+    def get_labels(self) -> list[StandaloneRulesetLabel]:
+        pass
+
+
+def mfa_cond(max_seconds):
+    return MaxMFAProofRuleCondition(
+        condition_type="mfa_rule_condition", max_seconds=max_seconds
+    )
+
+
+MFA_LABEL = "global-multifactor"
+LABEL_REGEX = regex.compile(r"urn:agilicus:label:(?P<label>[a-zA-Z0-9\-\._:]+)")
+
+
+def parse_label(scope):
+    match = LABEL_REGEX.match(str(scope))
+    if not match:
+        return None
+    return match.group("label")
+
+
+def parse_labels(scopes):
+    result = []
+    for scope in scopes:
+        label = parse_label(scope)
+        if not label:
+            continue
+        result.append(label)
+    return result
+
+
+class MultifactorTemplate(PolicyTemplate):
+    name_regex = regex.compile(r"agilicus-mfa-tmpl-(?P<name>[a-zA-Z0-9\-\._]+)")
+
+    def __init__(self, name, duration, org_id, labels: Optional[list[str]] = None):
+        self.name = name
+        self.duration = duration
+        self.labels = labels or []
+        self.org_id = org_id
+
+    def to_dict(self):
+        return {
+            "name": self.name,
+            "duration": self.duration,
+            "labels": self.labels,
+            "org_id": self.org_id,
+        }
+
+    @classmethod
+    def build_name(cls, name):
+        return f"agilicus-mfa-tmpl-{name}"
+
+    def get_name(self):
+        return self.build_name(self.name)
+
+    @classmethod
+    def parse_name(cls, name):
+        match = cls.name_regex.match(name)
+        if not match:
+            return None
+        return match.group("name")
+
+    def get_rules(self) -> list[StandaloneRule]:
+        cond = mfa_cond(self.duration)
+        action = RuleAction(action="mfa")
+        extended_condition = RuleCondition(negated=True, condition=cond)
+        spec = StandaloneRuleSpec(
+            rule=RuleConfig(
+                name=self.get_name(),
+                extended_condition=extended_condition,
+                actions=[action],
+            ),
+            org_id=self.org_id,
+        )
+
+        rule = StandaloneRule(spec=spec)
+        return [rule]
+
+    def get_trees(self) -> list[StandaloneRuleTree]:
+        spec = StandaloneRuleTreeSpec(
+            tree=StandaloneRuleTreeNode(
+                rules=[
+                    StandaloneRuleTreeRuleRef(
+                        rule_name=StandaloneRuleName(self.get_name()),
+                    )
+                ],
+                children=[],
+            ),
+            name=StandaloneRuleName(self.get_name()),
+            org_id=self.org_id,
+            object_conditions=StandaloneObjectConditions(),
+            # object_conditions=StandaloneObjectConditions(
+            #     scopes=[StandaloneRuleScope("urn:agilicus:scope:any_resource_user")]
+            # )
+        )
+
+        return [StandaloneRuleTree(spec=spec)]
+
+    def get_sets(self) -> list[StandaloneRuleset]:
+        spec = StandaloneRulesetSpec(
+            rule_trees=[
+                StandaloneRuleTreeRef(
+                    rule_tree_name=StandaloneRuleName(self.get_name()),
+                    priority=0,
+                )
+            ],
+            labels=[StandaloneRulesetLabelName(MFA_LABEL)],
+            name=StandaloneRuleName(self.get_name()),
+            org_id=self.org_id,
+        )
+        scopes = [
+            StandaloneRuleScope(f"urn:agilicus:label:{label}") for label in self.labels
+        ]
+        if scopes:
+            object_conditions = StandaloneObjectConditions(scopes=scopes)
+            spec.object_conditions = object_conditions
+
+        return [StandaloneRuleset(spec=spec)]
+
+    def get_labels(self) -> list[StandaloneRulesetLabel]:
+        spec = StandaloneRulesetLabelSpec(
+            name=StandaloneRulesetLabelName(MFA_LABEL),
+            org_id=self.org_id,
+        )
+
+        return [
+            StandaloneRulesetLabel(spec=spec),
+        ]
+
+    @classmethod
+    def from_api(cls, name, rules, org_id, trees, sets):
+        found_sets = list(filter(lambda s: str(s.spec.name) == name, sets))
+        found_trees = list(filter(lambda s: str(s.spec.name) == name, trees))
+        found_rules = list(filter(lambda s: str(s.spec.rule.name) == name, rules))
+
+        if len(found_sets) == 0 or len(found_rules) == 0 or len(found_trees) == 0:
+            return None
+
+        # There should be only one, given that names are unique.
+        ruleset = found_sets[0]
+        labels = []
+        if ruleset.spec.object_conditions:
+            labels = parse_labels(ruleset.spec.object_conditions.scopes)
+        rule = found_rules[0]
+        try:
+            duration = rule.spec.rule.extended_condition.condition.max_seconds
+        except Exception:
+            return None
+
+        return MultifactorTemplate(
+            name=cls.parse_name(name), duration=duration, labels=labels, org_id=org_id
+        )

agilicus/rules/rules.py

@@ -18,7 +18,7 @@ from ..output.table import (
     column,
 )
 
-from agilicus import create_or_update
+from agilicus import create_or_update, find_guid
 
 ACTIONS = ["allow", "deny", "redirect", "log", "none", "revocation_check", "mfa"]
 
@@ -116,29 +116,80 @@ def _obj_from_dict(klass, obj_dict, org_id):
     return model_from_dict(klass, obj_dict)
 
 
+class AddInfo:
+    def __init__(self):
+        super().__init__()
+        self.name_getter = name_in_spec
+        self.guid_finder = find_guid
+
+
 def name_in_spec(obj):
     return obj.spec.name
 
 
-def add_list_of_resouces(
-    ctx, as_dicts, klass, create_fn, replace_fn, name_getter=name_in_spec, **kwargs
-):
+class RuleAddInfo(AddInfo):
+    def __init__(self, apiclient):
+        super().__init__()
+        self.create_fn = lambda obj: apiclient.rules_api.create_standalone_rule(obj)
+        self.replace_fn = lambda guid, obj: apiclient.rules_api.replace_standalone_rule(
+            guid, standalone_rule=obj
+        )
+        self.name_getter = lambda obj: obj.spec.rule.name
+
+
+class RuleTreeAddInfo(AddInfo):
+    def __init__(self, apiclient):
+        super().__init__()
+        self.create_fn = lambda obj: apiclient.rules_api.create_standalone_rule_tree(obj)
+        self.replace_fn = (
+            lambda guid, obj: apiclient.rules_api.replace_standalone_rule_tree(
+                guid, standalone_rule_tree=obj
+            )
+        )
+
+
+class RulesetAddInfo(AddInfo):
+    def __init__(self, apiclient):
+        super().__init__()
+        self.create_fn = lambda obj: apiclient.rules_api.create_standalone_ruleset(obj)
+        self.replace_fn = (
+            lambda guid, obj: apiclient.rules_api.replace_standalone_ruleset(
+                guid, standalone_ruleset=obj
+            )
+        )
+
+
+def add_list_of_resouces(ctx, as_dicts, klass, add_info, **kwargs):
     org_id = get_org_from_input_or_ctx(ctx, **kwargs)
     objs = [_obj_from_dict(klass, obj, org_id) for obj in as_dicts]
+
+    return add_list_resources_sdk(ctx, objs, add_info)
+
+
+def add_list_resources_sdk(ctx, objs, add_info, handle_failure=True):
     results = []
     for obj in objs:
         try:
-            result, _ = create_or_update(obj, create_fn, replace_fn, to_dict=False)
+            result, _ = create_or_update(
+                obj,
+                add_info.create_fn,
+                add_info.replace_fn,
+                to_dict=False,
+                guid_finder=add_info.guid_finder,
+            )
             results.append(
                 AddResult(
-                    result_name=name_getter(result),
-                    result_id=result.metadata.id,
+                    result_name=add_info.name_getter(result),
+                    result_id=add_info.guid_finder(result),
                 )
             )
         except Exception as exc:
+            if not handle_failure:
+                raise
+
             results.append(
                 AddResult(
-                    result_name=name_getter(obj),
+                    result_name=add_info.name_getter(obj),
                     exc=str(exc),
                 )
             )
@@ -155,11 +206,7 @@ def add_rules(ctx, rules, **kwargs):
         ctx,
         rules,
         agilicus.StandaloneRule,
-        lambda obj: apiclient.rules_api.create_standalone_rule(obj),
-        lambda guid, obj: apiclient.rules_api.replace_standalone_rule(
-            guid, standalone_rule=obj
-        ),
-        name_getter=lambda obj: obj.spec.rule.name,
+        RuleAddInfo(apiclient),
     )
 
 
@@ -296,10 +343,7 @@ def add_trees(ctx, trees, **kwargs):
         ctx,
         trees,
         agilicus.StandaloneRuleTree,
-        lambda obj: apiclient.rules_api.create_standalone_rule_tree(obj),
-        lambda guid, obj: apiclient.rules_api.replace_standalone_rule_tree(
-            guid, standalone_rule_tree=obj
-        ),
+        RuleTreeAddInfo(apiclient),
     )
 
 
@@ -426,10 +470,7 @@ def add_rulesets(ctx, rulesets, **kwargs):
         ctx,
         rulesets,
         agilicus.StandaloneRuleset,
-        lambda obj: apiclient.rules_api.create_standalone_ruleset(obj),
-        lambda guid, obj: apiclient.rules_api.replace_standalone_ruleset(
-            guid, standalone_ruleset=obj
-        ),
+        RulesetAddInfo(apiclient),
     )
 
 
@@ -630,7 +671,7 @@ def list_bundles(ctx, **kwargs):
     kwargs = strip_none(kwargs)
     return apiclient.rules_api.list_standalone_ruleset_bundles(
         **kwargs,
-    ).standalone_ruleset_bundles
+    )
 
 
 def get_bundle(ctx, bundle_id, **kwargs):

agilicus/rules/rules_main.py

@@ -1,6 +1,7 @@
 import click
 import click_extension
 
+from .. import context
 from . import rules
 from ..output.table import output_entry
 
@@ -268,10 +269,17 @@ def cli_command_delete_rulesets_bundle(ctx, bundle_id, **kwargs):
 
 @click.command(name="list-standalone-ruleset-bundles")
 @click.option("--org-id", default=None)
+@click.option("--page-at-id", default=None)
+@click.option("--get-rulesets", is_flag=True, default=None)
+@click.option("--standalone-ruleset-bundles-etag", default=None)
+@click.option("--limit", default=None, type=int)
 @click.pass_context
 def cli_command_list_rulesets_bundle(ctx, **kwargs):
     results = rules.list_bundles(ctx, **kwargs)
-    print(rules.format_bundles(ctx, results))
+    if context.output_console(ctx):
+        print(rules.format_bundles(ctx, results.standalone_ruleset_bundles))
+        return
+    output_entry(ctx, results.to_dict())
 
 
 @click.command(name="get-standalone-ruleset-bundle")

{agilicus-1.244.3.dist-info → agilicus-1.246.0.dist-info}/METADATA

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

{agilicus-1.244.3.dist-info → agilicus-1.246.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ agilicus/.gitignore,sha256=TyHq6BCuVrFiqgUb1QAayLxWcBseKwEOoKJTQb_-iW8,5
 agilicus/.openapi-generator/FILES,sha256=K8BDgVDJIh7xUpYphJsmb-ZM2ny3_oJKBn1oEEe70Qk,107380
 agilicus/.openapi-generator/VERSION,sha256=LXsIFraL1muXBEww1sZWaewc9ji87Ih3gIa04Z37RYM,14
 agilicus/.openapi-generator-ignore,sha256=pu2PTide7pJtJ-DFLzDy0cTYQJRlrB-8RRH3zGLeUds,1040
-agilicus/__init__.py,sha256=_H58rxzMyqBJq8B0TpwzyVIYDlPaLOqGTcwp-GDaDSM,4949
+agilicus/__init__.py,sha256=S2_3WLG9tTuRxTPcP_0eNzBALnu9MMiZnFUEbv-dAqE,4978
 agilicus/access.py,sha256=UEHHhE3cCaCjxXQDjhKxQAoUEMWandygN0d-yEIIf8A,5457
 agilicus/admin.py,sha256=Gd4HfM7vQktFOuYOoOV_5uAZXEKWOgL_79Ndnlvxhyw,9340
 agilicus/agilicus_api/__init__.py,sha256=jmFa7Pr4rMPhCT_QFsO408OQ2RrZZFgrrzWKyABULPI,60973
@@ -57,7 +57,7 @@ agilicus/agilicus_api/api/regions_api.py,sha256=4R1gOgDBn0V7hMJj5MygnZ-yRx7rm_gw
 agilicus/agilicus_api/api/regions_api_mock.py,sha256=cBnoAURuccE36TePbYeOVgJzfJmoFu7EWpxvr6alryg,1596
 agilicus/agilicus_api/api/resources_api.py,sha256=hfIe0qmk8pAIuU-in6U7MnHoQqEjRSppplGnU5KlWOA,44716
 agilicus/agilicus_api/api/resources_api_mock.py,sha256=06pIiRJdLjnDWKVQrTnIamp5pF1X-G4VPz_PzdUG5N0,2070
-agilicus/agilicus_api/api/rules_api.py,sha256=PkeY-wt6XHJGCsCG2wdkROXrjJPdrCPNDF3R0yl-ifY,130378
+agilicus/agilicus_api/api/rules_api.py,sha256=QZTsG-y2Y6dVnJ4aTO54wAuXWZ08CR3O16BcXJzXXtM,130910
 agilicus/agilicus_api/api/rules_api_mock.py,sha256=BJcQzQC4A6ZcWh4lq3KqcTGvNO9X6qerWEH0z2i0vMs,7475
 agilicus/agilicus_api/api/tokens_api.py,sha256=151rL7BLBz5mmdNIIAjiMCivDhpSLrN8Qp8oBhh0waw,173574
 agilicus/agilicus_api/api/tokens_api_mock.py,sha256=S7kDLZpQ8wCVM0OMlFn8OGk4GcQxrDHThaT3DkUfY-4,9714
@@ -67,9 +67,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=zLwPF_gsWfKZeSmDL3dnJOcp66DlQolvwq
 agilicus/agilicus_api/api/users_api_mock.py,sha256=wA_xiqL3Pz3KjljKlsmf5NveLZS1FpbaKJHBp7QvarY,15411
 agilicus/agilicus_api/api/whoami_api.py,sha256=Xnn2HjfIbO7FoNQZ_q3UbOTuC6YoPNw1IiSLqYDPu2g,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=7E-MzDg8kFezht9AQ_Np_rDXtgYI9vM4T7tB3lGu7K4,38845
+agilicus/agilicus_api/api_client.py,sha256=ZhXs4O8uzqMg8bANYTiZIPy1IV4BYzDNupEYGLoB4NQ,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=m_hg6OJsEsMp6mZ1mn9OlaTflLjrU3Jc-jvYD9gi_PA,2092
-agilicus/agilicus_api/configuration.py,sha256=m5aQybYAl17CVB9rIJMvrmb4xV-gaSHaoqVvqDju_Jg,18447
+agilicus/agilicus_api/configuration.py,sha256=kbAOkGmULb3zsdgXMW0JVeQo0VQOX9ZIR_EL7xwLrFk,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
@@ -487,7 +487,7 @@ agilicus/agilicus_api/docs/ListServiceForwardersResponse.md,sha256=uGIZRJcW1WZAo
 agilicus/agilicus_api/docs/ListSessionsResponse.md,sha256=lW7z2xBTrcWDg0se_DVGxEznjRaZZm76gL2GeQtJRDk,1433
 agilicus/agilicus_api/docs/ListStandaloneRuleTreesResponse.md,sha256=GipviHaK1UZWwHG47yK6sadh0ekpa2sPK0Z2gF-MeLg,839
 agilicus/agilicus_api/docs/ListStandaloneRulesResponse.md,sha256=aXZ1t1x8GfYbuBbo32fyyLvshtLt6rT7JBHzeX4Vfls,814
-agilicus/agilicus_api/docs/ListStandaloneRulesetBundlesResponse.md,sha256=3x-Cj_Rq2NPHDsr_1suhODYyWecdXeAMkamLapWjmNM,732
+agilicus/agilicus_api/docs/ListStandaloneRulesetBundlesResponse.md,sha256=3mUkELKJf7QRpOD7KUlISrVcBchF_XcL2KvRyZUZcmo,965
 agilicus/agilicus_api/docs/ListStandaloneRulesetLabelsResponse.md,sha256=lRg1-qPUUp4S27iPd6BYcDg2fElg6lWjAk2hIlkackM,726
 agilicus/agilicus_api/docs/ListStandaloneRulesetsResponse.md,sha256=1qC7omQdlz4v6wyrQvzS0ti-nm64_HEUaRBiT0haCZg,836
 agilicus/agilicus_api/docs/ListTOTPEnrollmentResponse.md,sha256=gCMl-Wti-OhTn5lLyzMt6xoRx0I5TVryKEZ8-iIbZek,681
@@ -694,7 +694,7 @@ agilicus/agilicus_api/docs/RuleSetComponent.md,sha256=xk2mA069dsggG4uRSKRAYpv45-
 agilicus/agilicus_api/docs/RuleSetNode.md,sha256=rEktF4HJeKwH52-TkKMwgkOAH1GsyLuRL-gcnfIrc3o,883
 agilicus/agilicus_api/docs/RuleSpec.md,sha256=cmKB_ksUIuW6okLMS5g3tdGiJwrMtM4-8sxfJXgoOLM,968
 agilicus/agilicus_api/docs/RuleV2.md,sha256=WKcttrVbzFUtZqqIrS0olNtVPMwytfk6ZxJkP-93cY8,943
-agilicus/agilicus_api/docs/RulesApi.md,sha256=OTngB76WjeB2D6mZD6SQ3Txx_tBtqwPvgyuwmQPDbzA,135577
+agilicus/agilicus_api/docs/RulesApi.md,sha256=75PZo5R9JHEarjVes_WzZmRgsJA4b1-EjKEYLDSUVM4,136111
 agilicus/agilicus_api/docs/RulesConfig.md,sha256=1InJwa3YSCzYVwLBObH-27ysP0I2J0qgeU86cPvv6W4,1952
 agilicus/agilicus_api/docs/RuntimeStatus.md,sha256=TEypz-SIg1oy2YZcuYyMjzTW10OJi87-BBTyBQMuxyw,3687
 agilicus/agilicus_api/docs/SSHResource.md,sha256=ZFTmdXWOfrXr71MEbS8_uoXql3vMr8qrEp6jS-OPXxI,990
@@ -1256,7 +1256,7 @@ agilicus/agilicus_api/model/list_sessions_response.py,sha256=5VAFqQYH9zmEWaMBpG7
 agilicus/agilicus_api/model/list_ssh_resources_response.py,sha256=Xtb3u-yXDUA57O7QsRiJ67K_lKt8BnXbJcqTEhsXtGg,14637
 agilicus/agilicus_api/model/list_standalone_rule_trees_response.py,sha256=xe6kiMhi6Z5SH8amrp9zsqwn7fmxBNOCDxVFR1-Lqxk,14912
 agilicus/agilicus_api/model/list_standalone_rules_response.py,sha256=S_SPj7Gec-HZeC8o8dK3eRf85vfaTWDGqhJ5Ss8aUw4,14783
-agilicus/agilicus_api/model/list_standalone_ruleset_bundles_response.py,sha256=1xjHONPhsvQKMNXEsk-DTla9uz6JyXRBfol2Ipusz3c,14500
+agilicus/agilicus_api/model/list_standalone_ruleset_bundles_response.py,sha256=0dCc1YMxPXRYKA0vw24JD2uY08-118vJvafOTE1jKIE,15738
 agilicus/agilicus_api/model/list_standalone_ruleset_labels_response.py,sha256=z--SLdBXFPvMXZJfe0rMP3ZVoLB7Ti4TudrQLbtM-wU,14472
 agilicus/agilicus_api/model/list_standalone_rulesets_response.py,sha256=IGcC4dpoEpCfpoSRf1L116VIguowbcAkfkvsBDiNSeo,14867
 agilicus/agilicus_api/model/list_tokens_response.py,sha256=Q80Srg2aA5Pab8W7PZPkE84W4DR5pQUcLzuuHKpufi4,13918
@@ -2398,7 +2398,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=AqH9tZ825V2RHtNc
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=8PCPuXVkHrLCXqnaOJm64WGuSnpqIL0zj1AVQSBgf9U,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=s8Ups8bxho__nuXR86gwXAtBlAjrmZqA1-YkJwmmCEg,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=kj4qWEH4k8kQWZ4Zb-S6mEvK1e18dN7kPowJ5uyqFE4,2746
-agilicus/agilicus_api_README.md,sha256=t8CeEepwUB1S0al4VJjjpY4DUTLa8b9R9ZVWmy2DK60,154557
+agilicus/agilicus_api_README.md,sha256=JLOX2uGzj0NMTZqeVI8iegBhWTZuoa7mtjUxv8MdED8,154557
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=8k_tGraPUVKJURksZwKR8eNGW-4CSPv54FYcApQ3Ly8,50857
@@ -2447,7 +2447,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=ZvTEn8D5Bl5pU-wybGWBnyZD51cD_VJdQRxIEkVH4RQ,263647
+agilicus/main.py,sha256=WbKlV5agX3-aJnOHgOVaRGKenCDtIteYk02HWJv7ddA,263713
 agilicus/messages.py,sha256=Ydm-VhAsK23UnYdstv_HsOybBODfui5ubKc7F8R_dsw,5187
 agilicus/metrics.py,sha256=v4rwpvqDzeNG5GKNoZ7t34X5qUgly5IW2s-kXlS2vQM,2315
 agilicus/orgs.py,sha256=rwTuumHWz0_QPqWNdDPPdAJRGTTNUxVw7bBkxU5a8n8,12874
@@ -2461,6 +2461,9 @@ agilicus/output/tests/column_builder_test.py,sha256=fKP4V5sqXtmEIr-Q0gWVSFdBqCUt
 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=-Sf7I4Qs2jGk6qxLuuKrR5a7hnTJ8I8kuTM4Z7guKZ0,2570
+agilicus/policy/policy_main.py,sha256=eY0mc445ct5Nv4Jinee4oWersIpj2TncS1TG-b5ZjRo,931
+agilicus/policy/templates.py,sha256=EUvAhOhSjDuLAe2UKIFEzBp5pNpOT5y1r7uyV_GG6uI,5638
 agilicus/products/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agilicus/products/products.py,sha256=he27jN3MUyXBdTdV2HRyvUYb0zD3W1TGsuC7NHLKngQ,5365
 agilicus/products/products_main.py,sha256=saa2-e5oeHW6D5AWPcld99KwgQ9nBY3hoW8Jz_5nfMQ,3421
@@ -2468,8 +2471,8 @@ agilicus/regions.py,sha256=21SzUJ9_hC8DiWLSLJ-vtSb1tWLhlcPXH9JhmXD_ypU,3343
 agilicus/resource_helpers.py,sha256=fyfqAxjfnIth1KlHNALlLtYYXIZzlWEJmSZNLdj2JV0,380
 agilicus/resources.py,sha256=nlH4cezzfaiq4M7BK7iwXFUYF3kG9_Su6sFEEXX6I2M,10163
 agilicus/response.py,sha256=tI2-dAJwhBuuDplSsouuMmCmKHSwR_Mx71af8tgsuYo,468
-agilicus/rules/rules.py,sha256=6axCkTlOa9_5e9rQNjo99VScKjUZwbrhbHQwbuhmMks,20019
-agilicus/rules/rules_main.py,sha256=bfad7Nm4L9YFG071ZwjHhGyXCULFBGNPtu0_islAGDc,10386
+agilicus/rules/rules.py,sha256=ALHJr_tX2iGDKGKUMTteAp0iUQExqNGAhz3hcypxaF0,21019
+agilicus/rules/rules_main.py,sha256=hHyeY0WzFT2l1AQlA1C1PJQLuaEAgRhSbIUALHIyaa8,10750
 agilicus/scopes.py,sha256=OgPUksJSOSaJ3XcHPP8WJQ3e_p8B9wVmRXr-oZDfZP0,1344
 agilicus/service_configuration.py,sha256=WlsvTKA_bkle1PthJK0S96lpPK7GNr-BWWp8a_-MgtM,490
 agilicus/service_token.py,sha256=YDVFeBe9Yv0qYvfUenwnpGHuj2x1J06YUe5A_C8L6L4,7162
@@ -2484,8 +2487,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.244.3.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.244.3.dist-info/METADATA,sha256=z55fzhbI-5AjMGQ2hV8d36FYbHqWsyQME6kr9j6nyUk,3822
-agilicus-1.244.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-agilicus-1.244.3.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.244.3.dist-info/RECORD,,
+agilicus-1.246.0.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.246.0.dist-info/METADATA,sha256=tTBFD6BkRJPQ23J8nAiRnf_bQAP2mVOBgtv9eYBS9PA,3822
+agilicus-1.246.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+agilicus-1.246.0.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.246.0.dist-info/RECORD,,