chore: compatibility with scim2-client 0.3.0

Author: azmeuk

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 ---
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.6.4'
+    rev: 'v0.8.1'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: fix-byte-order-marker
       - id: trailing-whitespace
@@ -16,7 +16,7 @@ repos:
         exclude: "\\.svg$|\\.map$|\\.min\\.css$|\\.min\\.js$|\\.po$|\\.pot$"
       - id: check-toml
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.2
+    rev: v1.13.0
     hooks:
       - id: mypy
   - repo: https://github.com/codespell-project/codespell

pyproject.toml

@@ -28,7 +28,7 @@ requires-python = ">= 3.10"
 dependencies = [
     "click>=8.1.7",
     "scim2-client>=0.2.0",
-    "scim2-tester>=0.1.3",
+    "scim2-tester[httpx]>=0.1.3",
     "sphinx-click-rst-to-ansi-formatter>=0.1.0",
     "pydanclick>=0.3.0",
     "pygments>=2.18.0",

scim2_cli/__init__.py

@@ -2,7 +2,7 @@
 
 import click
 from httpx import Client
-from scim2_client import SCIMClient
+from scim2_client.engines.httpx import SyncSCIMClient
 from scim2_models import Group
 from scim2_models import User
 from sphinx_click.rst_to_ansi_formatter import make_rst_to_ansi_formatter
@@ -24,10 +24,10 @@ def cli(ctx, url):
     ctx.ensure_object(dict)
     ctx.obj["URL"] = url
     client = Client(base_url=ctx.obj["URL"])
-    ctx.obj["client"] = SCIMClient(client, resource_types=(User, Group))
-    ctx.obj["resource_types"] = {
-        resource_type.__name__.lower(): resource_type
-        for resource_type in ctx.obj["client"].resource_types
+    ctx.obj["client"] = SyncSCIMClient(client, resource_models=(User, Group))
+    ctx.obj["resource_models"] = {
+        resource_model.__name__.lower(): resource_model
+        for resource_model in ctx.obj["client"].resource_models
     }
 
     if not click.get_text_stream("stdin").isatty():  # pragma: no cover

scim2_cli/delete.py

@@ -33,16 +33,16 @@ def delete_cli(ctx, resource_type, id, headers, indent):
         scim https://scim.example delete user 1234
     """
     try:
-        resource_type = ctx.obj["resource_types"][resource_type]
+        resource_model = ctx.obj["resource_models"][resource_type]
     except KeyError as exc:
-        ok_values = ", ".join(ctx.obj["resource_types"])
+        ok_values = ", ".join(ctx.obj["resource_models"])
         raise ClickException(
             f"Unknown resource type '{resource_type}'. Available values are: {ok_values}'"
         ) from exc
 
     try:
         response = ctx.obj["client"].delete(
-            resource_type, id, headers=split_headers(headers), raise_scim_errors=False
+            resource_model, id, headers=split_headers(headers), raise_scim_errors=False
         )
 
     except SCIMClientError as scim_exc:

scim2_cli/query.py

@@ -84,9 +84,9 @@ def query_cli(
     """
     if resource_type:
         try:
-            resource_type = ctx.obj["resource_types"][resource_type]
+            resource_type = ctx.obj["resource_models"][resource_type]
         except KeyError as exc:
-            ok_values = ", ".join(ctx.obj["resource_types"])
+            ok_values = ", ".join(ctx.obj["resource_models"])
             raise ClickException(
                 f"Unknown resource type '{resource_type}. Available values are: {ok_values}'"
             ) from exc

scim2_cli/utils.py

@@ -56,11 +56,11 @@ def __init__(self, *args, factory, **kwargs):
     def list_commands(self, ctx):
         ctx.ensure_object(dict)
         base = super().list_commands(ctx)
-        lazy = sorted(ctx.obj.get("resource_types", {}).keys())
+        lazy = sorted(ctx.obj.get("resource_models", {}).keys())
         return base + lazy
 
     def get_command(self, ctx, cmd_name):
-        model = ctx.obj["resource_types"].get(cmd_name)
+        model = ctx.obj["resource_models"].get(cmd_name)
         return self.factory(model)
 
 

tests/test_query.py

@@ -58,7 +58,7 @@ def httpserver(httpserver, simple_user_payload):
 
     httpserver.expect_request(
         "/Users/full-qs",
-        query_string="attributes=userName&attributes=displayName&filter=userName%20Eq%20%22john%22&sortBy=userName&sortOrder=ascending&startIndex=1&count=10",
+        query_string="attributes=userName&attributes=displayName&filter=userName+Eq+%22john%22&sortBy=userName&sortOrder=ascending&startIndex=1&count=10",
         method="GET",
     ).respond_with_json(
         simple_user_payload("full-qs"),