agilicus 1.261.2__py3-none-any.whl → 1.261.3__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.261.2/python'
+        self.user_agent = 'OpenAPI-Generator/1.261.3/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.261.2".\
+               "SDK Package Version: 1.261.3".\
                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.261.2
+- Package version: 1.261.3
 - 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

@@ -6020,7 +6020,7 @@ def update_resource(ctx, id, resource_member, remove_resource_member, **kwargs):
 @click.pass_context
 def reconcile_default_policy(ctx, **kwargs):
     result = resources.reconcile_default_policy(ctx, **kwargs)
-    output_entry(ctx, result)
+    output_entry(ctx, result.to_dict())
 
 
 @cli.command(name="list-org-user-roles")

agilicus/policy/policies.py

@@ -253,23 +253,36 @@ def migrate_resource(ctx, resource, dump_dir=None):
     )
 
     # ensure the resource has been reconciled
-    reconcile_default_policy(ctx, resource.metadata.id, org_id=resource.spec.org_id)
+    resource = reconcile_default_policy(
+        ctx, resource.metadata.id, org_id=resource.spec.org_id
+    )
 
     token = context.get_token(ctx)
     apiclient = context.get_apiclient(ctx, token)
     templates_api = apiclient.policy_templates_api
 
+    def do_update(guid, obj):
+        return templates_api.replace_policy_template_instance(
+            guid, policy_template_instance=obj
+        )
+
+    updater = do_update
+    # If there are no rules, don't blow away any previously create config. This allows us
+    # to reapply the policy from scratch using a new config if needed, but at the same
+    # time, ensures we don't blow away config if we run the same migration twice (since
+    # the first migration will clear the rules, meaning the second will set an empty
+    # policy. )
+    if not rules:
+        updater = None
     resp, _ = create_or_update(
         tmpl,
         lambda obj: templates_api.create_policy_template_instance(obj),
-        lambda guid, obj: templates_api.replace_policy_template_instance(
-            guid, policy_template_instance=obj
-        ),
+        updater,
         to_dict=False,
     )
 
-    _clear_old_rules(apiclient, resource, dump_dir)
-
+    if rules:
+        _clear_old_rules(apiclient, resource, dump_dir)
     return resp
 
 

agilicus/policy/policy_main.py

@@ -43,6 +43,7 @@ def cli_command_list_multifactor_policies(ctx, **kwargs):
 @click.option("--org-id", default=None)
 @click.option("--template-type", default=None)
 @click.option("--include-invalid", type=bool, default=None)
+@click.option("--object-id", type=str, default=None)
 @click.option("--name", default=None)
 @click.pass_context
 def cli_command_list_policy_templates(ctx, **kwargs):

agilicus/resources.py

@@ -204,8 +204,8 @@ def reconcile_default_policy(ctx, resource_id, org_id=None):
         if exc.status != 409:
             # If there was already a default, nothing for us to do
             raise
-        return handle_api_409(exc)
-    return resource.to_dict()
+        return handle_api_409(exc, klass=agilicus.Resource)
+    return resource
 
 
 def update_resource(

agilicus/rules/rules.py

@@ -267,7 +267,7 @@ def replace_hostprefix_rule(
 def get_rule(ctx, rule_id, org_id, **kwargs):
     token = context.get_token(ctx)
     apiclient = context.get_apiclient(ctx, token)
-    org_id = get_org_from_input_or_ctx(ctx, **kwargs)
+    org_id = get_org_from_input_or_ctx(ctx, org_id=org_id)
     return apiclient.rules_api.get_standalone_rule(rule_id=rule_id, org_id=org_id)
 
 

{agilicus-1.261.2.dist-info → agilicus-1.261.3.dist-info}/METADATA

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

{agilicus-1.261.2.dist-info → agilicus-1.261.3.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=z1MwieEt3Koda-vktrLnSGZDBPHvYw335UkGGQKqBPA,38845
+agilicus/agilicus_api/api_client.py,sha256=UuFjACj66J2j5gfEcvD_yt-uweu47eb5q5c_LULWWo0,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=aJZD7x-umdSni6ZBr4XxzpH8pwtU9hA5LlCDxcqa1Q8,2224
-agilicus/agilicus_api/configuration.py,sha256=8s0RODgWPdGq7mb5oo6xjlgYElHWb5ePJ69EYOFKsgA,18447
+agilicus/agilicus_api/configuration.py,sha256=5gC0MFtWiWa1YtuiBDYEClqqN3nwiCw_Me24-gaMnkM,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=XInfUyrtvSQ_gF-GDXva4K-e3mj1MiiGtPl4Z6B_6Xo,161008
+agilicus/agilicus_api_README.md,sha256=GMj5bNAEYTLwHhLRD_CB1Ea8hlEW3-wYxT9viwbiRXM,161008
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=uYNUNy5rCYjx90KnR_X_aESof9xzSuLYT5w8myN_VVE,52091
@@ -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=SvAbc6FXAKb38YdfQaBe9Az7qZnUcv_iPSdpPAqzvaU,269933
+agilicus/main.py,sha256=WhIw44SlHC-bOxAv58jAJIxTWtcjsit7_S9EvB3XmcE,269943
 agilicus/messages.py,sha256=Ydm-VhAsK23UnYdstv_HsOybBODfui5ubKc7F8R_dsw,5187
 agilicus/metrics.py,sha256=v4rwpvqDzeNG5GKNoZ7t34X5qUgly5IW2s-kXlS2vQM,2315
 agilicus/orgs.py,sha256=THcm1Me58PJ7Lai4LHptBitaymH0TXVXapFd7WZ3Mpg,14399
@@ -2572,8 +2572,8 @@ 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=LrteEsXjou_RyW_PcqijBhtN2jaIomXFXQIfNArUP6I,9625
-agilicus/policy/policy_main.py,sha256=CSg7cFHlZo12eu9T-ugTM1U_sp7QWOXtQN14jbe7KyQ,3878
+agilicus/policy/policies.py,sha256=30lo6JwfXvxTYdBFLoQoOjFGvazx0kto5AgfVWpyP2g,10134
+agilicus/policy/policy_main.py,sha256=gbCFCDzCMa9M1tpkquY6fZWsjcdglRBRRLcaYKiAi4c,3931
 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
@@ -2582,9 +2582,9 @@ 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=U7kxKlXKYOfGakiQxCF3KSx-848HtA_gJC818SCEqgg,10440
+agilicus/resources.py,sha256=SkLkXsX3IOvuAcbQAEMPK0tV3BLfgl1MJEF2eoK498U,10455
 agilicus/response.py,sha256=tI2-dAJwhBuuDplSsouuMmCmKHSwR_Mx71af8tgsuYo,468
-agilicus/rules/rules.py,sha256=7BQRv-S15NpiOmebHpr1l9bCJJhsO82avVwXjzVkD_w,24986
+agilicus/rules/rules.py,sha256=ixfMro-l30Pt1r_wyypWL8vhSWccdCoRv8mPJynhR2o,24991
 agilicus/rules/rules_main.py,sha256=kQ0g86Xjp5PXERb7AlHWZha4wZGV7pEYGWEIXggH9Kg,13639
 agilicus/scopes.py,sha256=OgPUksJSOSaJ3XcHPP8WJQ3e_p8B9wVmRXr-oZDfZP0,1344
 agilicus/service_configuration.py,sha256=WlsvTKA_bkle1PthJK0S96lpPK7GNr-BWWp8a_-MgtM,490
@@ -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.261.2.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.261.2.dist-info/METADATA,sha256=MbjA8D7PGpkDYIwfXPqNT7xXa9iJq6pmMO4DoM9Ybw0,3822
-agilicus-1.261.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-agilicus-1.261.2.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.261.2.dist-info/RECORD,,
+agilicus-1.261.3.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.261.3.dist-info/METADATA,sha256=icXtw9kbr9TuPogTBJvR2KoVltPPLIFM8zpWKF_Pc8w,3822
+agilicus-1.261.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+agilicus-1.261.3.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.261.3.dist-info/RECORD,,