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

agilicus/output/json.py

@@ -8,6 +8,14 @@ def jsonify(ctx, entry):
 
 
 def json_output_default(o):
+    try:
+        # The classes in our API do not serialise.
+        # attempt a to_dict. If that passes, use it,
+        # else continue to check for date
+        o = o.to_dict()
+        return o
+    except AttributeError:
+        pass
     if isinstance(o, (datetime.date, datetime.datetime)):
         return o.isoformat()
     return None

agilicus/policy/policies.py

@@ -1,5 +1,7 @@
+import copy
 from ..input_helpers import (
     get_org_from_input_or_ctx,
+    model_from_dict,
     strip_none,
 )
 
@@ -16,6 +18,8 @@ from agilicus import (
     SimpleResourcePolicyTemplateStructure,
     SimpleResourcePolicyTemplate,
     StandaloneRuleName,
+    RuleCondition,
+    HttpRuleCondition,
     EmptiableObjectType,
 )
 
@@ -227,7 +231,9 @@ def migrate_resource(ctx, resource):
             )
         )
     template = SimpleResourcePolicyTemplate(
-        rules=resource.spec.config.rules_config.rules,
+        rules=[
+            _migrate_http_rule(rule) for rule in resource.spec.config.rules_config.rules
+        ],
         policy_structure=policy_structures,
         template_type="simple_resource",
     )
@@ -259,3 +265,37 @@ def migrate_resource(ctx, resource):
         to_dict=False,
     )
     return resp
+
+
+def _migrate_http_rule(input_rule):
+    if input_rule.extended_condition is not None:
+        return input_rule
+
+    new_rule = copy.deepcopy(input_rule)
+    input_cond = new_rule.condition.to_dict()
+    input_cond["condition_type"] = "http_rule_condition"
+    cond = model_from_dict(HttpRuleCondition, input_cond)
+    new_rule.extended_condition = RuleCondition(
+        condition=cond,
+        negated=False,
+    )
+    del new_rule["condition"]
+    return new_rule
+
+
+def create_policy_template(ctx, template_dict, **kwargs):
+    template_as_instance = model_from_dict(PolicyTemplateInstance, template_dict)
+    token = context.get_token(ctx)
+    apiclient = context.get_apiclient(ctx, token)
+    return apiclient.policy_templates_api.create_policy_template_instance(
+        template_as_instance
+    )
+
+
+def replace_policy_template(ctx, instance_id, template_dict, **kwargs):
+    template_as_instance = model_from_dict(PolicyTemplateInstance, template_dict)
+    token = context.get_token(ctx)
+    apiclient = context.get_apiclient(ctx, token)
+    return apiclient.policy_templates_api.replace_policy_template_instance(
+        instance_id, policy_template_instance=template_as_instance
+    )

agilicus/policy/policy_main.py

@@ -1,4 +1,5 @@
 import click
+import click_extension
 
 from . import policies
 from ..output.table import output_entry
@@ -56,6 +57,31 @@ def cli_command_get_policy_template(ctx, **kwargs):
     output_entry(ctx, policies.get_policy_template(ctx, **kwargs).to_dict())
 
 
+@click.command(name="create-policy-template")
+@click.option("--template-json-file", required=True, type=click_extension.JSONFile("r"))
+@click.pass_context
+def cli_command_create_policy_template(ctx, template_json_file, **kwargs):
+    output_entry(
+        ctx,
+        policies.create_policy_template(
+            ctx, template_dict=template_json_file, **kwargs
+        ).to_dict(),
+    )
+
+
+@click.command(name="replace-policy-template")
+@click.option("--instance-id", required=True, type=str)
+@click.option("--template-json-file", required=True, type=click_extension.JSONFile("r"))
+@click.pass_context
+def cli_command_replace_policy_template(ctx, template_json_file, **kwargs):
+    output_entry(
+        ctx,
+        policies.replace_policy_template(
+            ctx, template_dict=template_json_file, **kwargs
+        ).to_dict(),
+    )
+
+
 @click.command(name="delete-policy-template")
 @click.option("--instance-id", default=None, required=True)
 @click.option("--org-id", default=None)

{agilicus-1.258.12.dist-info → agilicus-1.259.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agilicus
-Version: 1.258.12
+Version: 1.259.2
 Summary: Agilicus SDK
 Home-page: https://www.agilicus.com/
 License: MIT
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Provides-Extra: billing
-Requires-Dist: PyJWT (>=2.6.0,<3.0.0)
+Requires-Dist: PyJWT (>=2.8.0,<3.0.0)
 Requires-Dist: appdirs (>=1.4.4,<2.0.0)
 Requires-Dist: babel (>=2.13.1,<3.0.0)
 Requires-Dist: certifi (>=14.05.14)

{agilicus-1.258.12.dist-info → agilicus-1.259.2.dist-info}/RECORD

@@ -71,9 +71,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=vB0sKWct34S8spWM5V_cIXNnJYymsxi6Hj
 agilicus/agilicus_api/api/users_api_mock.py,sha256=wA_xiqL3Pz3KjljKlsmf5NveLZS1FpbaKJHBp7QvarY,15411
 agilicus/agilicus_api/api/whoami_api.py,sha256=n8pLGSBrUCi188FvTqP_xnVOfZIeabOK8v-UYTvWlKg,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=RdZCapwpP4ITy6PhlTqLeg3RQ7D0iXAXJWLPUrTLa3Q,38846
+agilicus/agilicus_api/api_client.py,sha256=gi4KvwypTeyFhsso7xLlI4mE4ZtdwA0WQhc0klkvYPE,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=aJZD7x-umdSni6ZBr4XxzpH8pwtU9hA5LlCDxcqa1Q8,2224
-agilicus/agilicus_api/configuration.py,sha256=1lFpt00bkNvMnIdrJKRkm9RgTMFcOqatpOxO34jGEns,18448
+agilicus/agilicus_api/configuration.py,sha256=Us2ORRFgkTNGaOBAKBZeJb2tpewKj4PvsWNilHTfCVQ,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=bg6sEfQxbFJV4g4E
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=4DXwyUGi6wJhmjp2gUm9jBqA_j_rPjwOwEACfpZ1L_k,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=5I8JM71Z_dR9ujggxPAgfv2ggO4P55y1FRViLXZiQTo,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=jm4mFfUvM6c1vQToM-97bhMoJIkCxaXTni-l-jLAtQg,2746
-agilicus/agilicus_api_README.md,sha256=gK2wHsWaqGj2nM-7G4SG8psZFTCfwmyvRInKcS8UAAg,160943
+agilicus/agilicus_api_README.md,sha256=Fr03sFJHYq4hOvOstV8dRXBbBQ8-aLgYZLazuqHUr_0,160942
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=QMiV9ThED6lqS2l7Jr5Mei7fNBo8FEvPEtCae1NK3Pk,51814
@@ -2565,15 +2565,15 @@ agilicus/orgs.py,sha256=cj8UW2nG5D7mR_OUrwHB1P6BOHg-XGGiWX06PDhu7kI,14179
 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/json.py,sha256=-5bX7ud1hIxux4l3P-K2gJXrE2gdZ0Ua1hfUOCX9MUM,899
 agilicus/output/table.py,sha256=slOLs30rybyZYFGNd_5bh4gVVz7tNafg3sey_20H1w8,7906
 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=dyIuBVpGDygI3HwtRZKfHgidjNsEdXOevWRB5jS0Zd0,7485
-agilicus/policy/policy_main.py,sha256=0h8RAVuuNqNSg_ese82czdH4YUIKLRQJ9ZLsr87IJvc,2868
+agilicus/policy/policies.py,sha256=H4MKMJJuuQ7LsXRKH7d7TrcGLvzIkcuC5FmyO5OD1AE,8817
+agilicus/policy/policy_main.py,sha256=0fASWbzeWpaQEjwX5VOg90ZI-HZvOLCPJdrV3ahd4Hk,3732
 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.258.12.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.258.12.dist-info/METADATA,sha256=FXJKwRZSA8JnvQ7dD2UzrAdMIZByZ1cZd7Vrt-UrZFA,3823
-agilicus-1.258.12.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-agilicus-1.258.12.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.258.12.dist-info/RECORD,,
+agilicus-1.259.2.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.259.2.dist-info/METADATA,sha256=51RomgkReSYsdywA6igL3PHxLL4h5aYiR_4UqfZy25U,3822
+agilicus-1.259.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+agilicus-1.259.2.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.259.2.dist-info/RECORD,,