agilicus 1.267.0__py3-none-any.whl → 1.268.0__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.267.0/python'
+        self.user_agent = 'OpenAPI-Generator/1.268.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.09.24\n"\
-               "SDK Package Version: 1.267.0".\
+               "SDK Package Version: 1.268.0".\
                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.09.24
-- Package version: 1.267.0
+- Package version: 1.268.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

@@ -6029,6 +6029,11 @@ def list_resource_groups(ctx, **kwargs):
     help="A json file that contains the resource's rule configuration.",
     type=click_extension.JSONFile("r"),
 )
+@click.option(
+    "--roles-config-file",
+    help="A json file that contains the resource's role configuration.",
+    type=click_extension.JSONFile("r"),
+)
 @click.option("--published", type=click.Choice(["no", "public"]), default=None)
 @click.pass_context
 def update_resource(ctx, id, resource_member, remove_resource_member, **kwargs):
@@ -8135,6 +8140,32 @@ def update_session_challenge(ctx, token, **kwargs):
     output_entry(ctx, result.to_dict())
 
 
+@cli.command(name="list-org-pops")
+@click.option("--org-id", default=None)
+@click.pass_context
+def list_org_pops(ctx, **kwargs):
+    result = orgs.list_org_pops(ctx, **kwargs)
+    output_entry(ctx, result)
+
+
+@cli.command(name="add-org-pop")
+@click.argument("pop")
+@click.option("--org-id", default=None)
+@click.pass_context
+def add_org_pop(ctx, **kwargs):
+    result = orgs.add_org_pop(ctx, **kwargs)
+    output_entry(ctx, result)
+
+
+@cli.command(name="remove-org-pop")
+@click.argument("pop")
+@click.option("--org-id", default=None)
+@click.pass_context
+def remove_org_pop(ctx, **kwargs):
+    result = orgs.remove_org_pop(ctx, **kwargs)
+    output_entry(ctx, result)
+
+
 def switch_org(org):
     ctx = click.get_current_context()
     ctx.obj["ORG_ID"] = org.get("id")

agilicus/orgs.py

@@ -21,6 +21,7 @@ from .output.table import (
 )
 from . import get_many_entries
 from .input_helpers import strip_none
+from . import pop_utils
 
 
 def get_org_by_dictionary(ctx, org_id):
@@ -533,3 +534,43 @@ def format_reconcile_org_policy_results(ctx, results):
         column("failure"),
     ]
     return format_table(ctx, results.modified, columns)
+
+
+POP_TAGS_FEATURE_NAME = "pop_tags"
+
+
+def list_org_pops(ctx, **kwargs):
+    org_id = get_org_from_input_or_ctx(ctx, **kwargs)
+    org = get_raw(ctx, org_id)
+    features = org.feature_flags or []
+    feature_obj = find_feature(features, POP_TAGS_FEATURE_NAME)
+
+    if not feature_obj:
+        feature_obj = FeatureFlag(feature=POP_TAGS_FEATURE_NAME, enabled=False)
+    return pop_utils.make_feature_pop_result(feature_obj)
+
+
+def _update_pop_setting(ctx, pop, setting_updater: callable, **kwargs):
+    apiclient = context.get_apiclient(ctx)
+    org_id = get_org_from_input_or_ctx(ctx, **kwargs)
+    org = get_raw(ctx, org_id)
+    features = org.feature_flags or []
+    feature_obj = find_feature(features, POP_TAGS_FEATURE_NAME)
+
+    if not feature_obj:
+        feature_obj = FeatureFlag(feature=POP_TAGS_FEATURE_NAME, enabled=False)
+        features.append(feature_obj)
+
+    feature_obj.setting = setting_updater(feature_obj.setting, pop)
+    feature_obj.enabled = True
+    org.feature_flags = features
+    apiclient.org_api.replace_org(org_id=org.id, organisation=org)
+    return pop_utils.make_feature_pop_result(feature_obj)
+
+
+def add_org_pop(ctx, pop, **kwargs):
+    return _update_pop_setting(ctx, pop, pop_utils.add_pop_to_str, **kwargs)
+
+
+def remove_org_pop(ctx, pop, **kwargs):
+    return _update_pop_setting(ctx, pop, pop_utils.remove_pop_from_str, **kwargs)

agilicus/pop_utils.py

@@ -0,0 +1,40 @@
+from agilicus.agilicus_api import FeatureFlag
+
+
+def _make_set(pop_str: str) -> set:
+    if pop_str is None:
+        pop_str = ""
+    return set(sorted([pop.strip() for pop in pop_str.split(",") if pop]))
+
+
+def _make_str(pop_set: set) -> str:
+    return ",".join(sorted(list(pop_set)))
+
+
+def add_pop_to_str(pop_str: str, pop: str) -> str:
+    if pop_str is None:
+        pop_str = ""
+    if not pop:
+        return pop_str
+    pop_set = _make_set(pop_str)
+    pop_set.add(pop)
+    return _make_str(pop_set)
+
+
+def remove_pop_from_str(pop_str: str, pop: str) -> str:
+    if pop_str is None:
+        pop_str = ""
+    pop_set = set([pop.strip() for pop in pop_str.split(",")])
+    if pop in pop_set:
+        pop_set.remove(pop)
+    return _make_str(pop_set)
+
+
+def make_feature_pop_result(feature_obj: FeatureFlag) -> dict:
+    result = {}
+    result["enabled"] = False
+    result["pops"] = []
+    if feature_obj:
+        result["enabled"] = feature_obj.enabled
+        result["pops"] = list(_make_set(feature_obj.setting))
+    return result

agilicus/resources.py

@@ -216,6 +216,7 @@ def update_resource(
     name=None,
     org_id=None,
     rules_config_file=None,
+    roles_config_file=None,
     published=None,
     **kwargs,
 ):
@@ -240,6 +241,8 @@ def update_resource(
         resource.spec.name = name
     if rules_config_file is not None:
         resource.spec.config.rules_config = rules_config_file
+    if roles_config_file is not None:
+        resource.spec.config.roles_config = roles_config_file
     if published is not None:
         resource.spec.config.published = published
 

agilicus/tests/test_pop_utils.py

@@ -0,0 +1,23 @@
+from .. import pop_utils
+
+
+def test_pop_utils_remove():
+    assert pop_utils.remove_pop_from_str(None, "") == ""
+    assert pop_utils.remove_pop_from_str("", "") == ""
+    assert pop_utils.remove_pop_from_str(" ", "") == ""
+    assert pop_utils.remove_pop_from_str("foobar", "") == "foobar"
+    assert pop_utils.remove_pop_from_str("foobar", "foobar") == ""
+    assert pop_utils.remove_pop_from_str("foobar,1,3", "foobar") == "1,3"
+    assert pop_utils.remove_pop_from_str("foobar,1,3", "foobar") == "1,3"
+    assert pop_utils.remove_pop_from_str("foobar,1,3", "3") == "1,foobar"
+    assert pop_utils.remove_pop_from_str("3,2,1", "") == "1,2,3"
+    assert pop_utils.remove_pop_from_str("3,2,1", "3") == "1,2"
+
+
+def test_pop_utils_add():
+    assert pop_utils.add_pop_to_str(None, "") == ""
+    assert pop_utils.add_pop_to_str("", "") == ""
+    assert pop_utils.add_pop_to_str("1,2,3", "") == "1,2,3"
+    assert pop_utils.add_pop_to_str("1,2,3", "") == "1,2,3"
+    assert pop_utils.add_pop_to_str("1,3", "2") == "1,2,3"
+    assert pop_utils.add_pop_to_str("4,3,2,1", "2") == "1,2,3,4"

{agilicus-1.267.0.dist-info → agilicus-1.268.0.dist-info}/METADATA

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

{agilicus-1.267.0.dist-info → agilicus-1.268.0.dist-info}/RECORD

@@ -71,9 +71,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=sRY1Ge_aUimbaPHoulwCVT8pSB_hpjYAdw
 agilicus/agilicus_api/api/users_api_mock.py,sha256=wA_xiqL3Pz3KjljKlsmf5NveLZS1FpbaKJHBp7QvarY,15411
 agilicus/agilicus_api/api/whoami_api.py,sha256=EuL_UM7R5vey36rjwOPsF8TqNyJKyIH5RN6k05E0jAQ,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=59DhzMCDeCg2E-byEwsz2-t4SWLQPpzI5hcdo8VDd4k,38845
+agilicus/agilicus_api/api_client.py,sha256=uJRDw4wnhG9_TkfgLzu1O1JktqfitS6QcUlyEGAgi_k,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=aJZD7x-umdSni6ZBr4XxzpH8pwtU9hA5LlCDxcqa1Q8,2224
-agilicus/agilicus_api/configuration.py,sha256=x16ed9kAZiPQyfuviZYvWMG0wZNvLJuf3EsGfodeA20,18447
+agilicus/agilicus_api/configuration.py,sha256=RF3WoCUxli9ELBwkm-yFplBw5LN9rgU7pOytVAEN3jM,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
@@ -2529,7 +2529,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=KigehF3015P8wuGb
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=MwqrYGLWl-hTmuLtE-GZ2_LvFtoHP3Jf0Y2n8O3Q-J8,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=93ATew310qaTCB9f6FjFlW3tvjaH2hi98KypBYC5gP4,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=F0VcWfvT8hXcMEWowolRCxnd7Q87mHvXOc-GeS-GpWk,2746
-agilicus/agilicus_api_README.md,sha256=OfRVnfkGWWMWqStgnaPMqz4K-K3Nk71ckQ2VyzP_v_U,162124
+agilicus/agilicus_api_README.md,sha256=mIhjyfxJG5mfTJQ3CcMLKdl52k4FUpB9iXtd2Ptk5NA,162124
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=ZRPqOq9ecFTqaBce5JQW7e1zekoJbhgYKDDsxyWo5BA,53212
@@ -2579,10 +2579,10 @@ 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=r5PTGSGSoqsyrD7A_xNp9j08xX6Haj43FIG5raweA6Q,271531
+agilicus/main.py,sha256=Q1SyYJfgR7G5Vrm2686FIP1y79ghutO8gu0IsuDqnTY,272355
 agilicus/messages.py,sha256=Ydm-VhAsK23UnYdstv_HsOybBODfui5ubKc7F8R_dsw,5187
 agilicus/metrics.py,sha256=v4rwpvqDzeNG5GKNoZ7t34X5qUgly5IW2s-kXlS2vQM,2315
-agilicus/orgs.py,sha256=ac_Y4qzMtUmQ3tx_SxhwQ6AsbsSkeU6MGdqRhssfZw8,14509
+agilicus/orgs.py,sha256=S9v1Hnv_qGcJ90uNC3V692srcXTPv6GIHiTF_z5YC90,15902
 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
@@ -2598,12 +2598,13 @@ agilicus/policy/policy_main.py,sha256=W91CxqQP1ye9UjsiMqgZNeULMvrzMB5TiPJZW3hogP
 agilicus/policy/templates.py,sha256=EUvAhOhSjDuLAe2UKIFEzBp5pNpOT5y1r7uyV_GG6uI,5638
 agilicus/policy_config/policy_config.py,sha256=E7ApGqVKwzzf9n2dEz8LdedWhNVJvDmupCmgz66FX88,919
 agilicus/policy_config/policy_config_main.py,sha256=wABOGTFOLyDwZhZpNqo29zjI96FIirOQBLYQc7qowsE,1283
+agilicus/pop_utils.py,sha256=e_vsdb2eZWvCyZHd6sJNYsyXgntNSJFc78c-wGoWeGE,1036
 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
 agilicus/regions.py,sha256=21SzUJ9_hC8DiWLSLJ-vtSb1tWLhlcPXH9JhmXD_ypU,3343
 agilicus/resource_helpers.py,sha256=fyfqAxjfnIth1KlHNALlLtYYXIZzlWEJmSZNLdj2JV0,380
-agilicus/resources.py,sha256=mtgCjZrEd-oHxgYA-TjbeHX3I8kT1R8DFzNBNAv9EG0,10918
+agilicus/resources.py,sha256=v5-XtzEv7SaM2snnYV89JONSyUr1Vb5QoZFWYFRFi5U,11046
 agilicus/response.py,sha256=tI2-dAJwhBuuDplSsouuMmCmKHSwR_Mx71af8tgsuYo,468
 agilicus/rules/rules.py,sha256=ixfMro-l30Pt1r_wyypWL8vhSWccdCoRv8mPJynhR2o,24991
 agilicus/rules/rules_main.py,sha256=kQ0g86Xjp5PXERb7AlHWZha4wZGV7pEYGWEIXggH9Kg,13639
@@ -2613,6 +2614,7 @@ agilicus/service_token.py,sha256=YDVFeBe9Yv0qYvfUenwnpGHuj2x1J06YUe5A_C8L6L4,716
 agilicus/ssh.py,sha256=mVqMlDM2zAcUphehyz9djXjrRPSIxR1qJr2Ehvl3Rvw,2925
 agilicus/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agilicus/tests/keyring_test.py,sha256=Uwp2VS2_NffYBgHAS9bXuXnIxRoK0_VOWaaYCZKv0lg,1452
+agilicus/tests/test_pop_utils.py,sha256=gdSMOmE0pNSDA0UgUWdbLKpFzUGwfBwkFSrk1p1JdSo,1083
 agilicus/tokens.py,sha256=mwQyxWjynR3SelPJH6ZwMbqdZy7ZiqA4xVD_crlYt_E,18592
 agilicus/transfers.py,sha256=PYr_fW7dyXNUXzi5Wp5mUjZOvU7MbRzoN-D8Omo-YSQ,1523
 agilicus/trusted_certs/trusted_certs.py,sha256=HCAvYxOA3ooaee2_KbYJd6Yt_dxDEn8hjhy1upVJUYE,7951
@@ -2620,8 +2622,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.267.0.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.267.0.dist-info/METADATA,sha256=BHrKVpnHuyPvFFJy68VmIbCYOTyrIlqjlu7B4-z4wQM,3873
-agilicus-1.267.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-agilicus-1.267.0.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.267.0.dist-info/RECORD,,
+agilicus-1.268.0.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.268.0.dist-info/METADATA,sha256=G_urxoVwXsMqV_eHy51yHKjNC9Pbi8EwHXZydO-hfLw,3873
+agilicus-1.268.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+agilicus-1.268.0.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.268.0.dist-info/RECORD,,