chore: bump to scim2-client 0.1.6

Author: azmeuk

poetry.lock

@@ -27,7 +27,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.10"
 click = "^8.1.7"
-scim2-client = "^0.1.4"
+scim2-client = "^0.1.6"
 sphinx-click-rst-to-ansi-formatter = "^0.1.0"
 
 [tool.poetry.group.doc]

pyproject.toml

@@ -3,7 +3,6 @@
 import click
 from httpx import Client
 from scim2_client import SCIMClient
-from scim2_models import EnterpriseUser
 from scim2_models import Group
 from scim2_models import User
 from sphinx_click.rst_to_ansi_formatter import make_rst_to_ansi_formatter
@@ -25,9 +24,7 @@ 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, User[EnterpriseUser], Group)
-    )
+    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

scim2_cli/__init__.py

@@ -1,7 +1,7 @@
+import sys
+
 import click
-import httpx
 from click import ClickException
-from pydantic import ValidationError
 from scim2_client import SCIMClientError
 from sphinx_click.rst_to_ansi_formatter import make_rst_to_ansi_formatter
 
@@ -40,13 +40,14 @@ def create_cli(ctx, indent, headers):
     try:
         response = ctx.obj["client"].create(payload, headers=split_headers(headers))
 
-    except (httpx.HTTPError, SCIMClientError) as exc:
-        raise ClickException(exc) from exc
-
-    except ValidationError as exc:
-        payload = formatted_payload(exc.response_payload, indent)
-        message = f"The server response is invalid:\n{payload}\n{exc}"
-        raise ClickException(message) from exc
+    except SCIMClientError as scim_exc:
+        message = str(scim_exc)
+        if sys.version_info >= (3, 11) and hasattr(
+            scim_exc, "__notes__"
+        ):  # pragma: no branch
+            for note in scim_exc.__notes__:
+                message = f"{message}\n{note}"
+        raise ClickException(message) from scim_exc
 
     payload = formatted_payload(response.model_dump(), indent)
     click.echo(payload)

scim2_cli/create.py

@@ -1,5 +1,6 @@
+import sys
+
 import click
-import httpx
 from click import ClickException
 from scim2_client import SCIMClientError
 from scim2_models import Message
@@ -45,8 +46,14 @@ def delete_cli(ctx, resource_type, id, headers, indent):
             resource_type, id, headers=split_headers(headers)
         )
 
-    except (httpx.HTTPError, SCIMClientError) as exc:
-        raise ClickException(exc) from exc
+    except SCIMClientError as scim_exc:
+        message = str(scim_exc)
+        if sys.version_info >= (3, 11) and hasattr(
+            scim_exc, "__notes__"
+        ):  # pragma: no branch
+            for note in scim_exc.__notes__:
+                message = f"{message}\n{note}"
+        raise ClickException(message) from scim_exc
 
     if response:
         payload = (

scim2_cli/delete.py

@@ -1,10 +1,9 @@
+import sys
 from typing import List
 from typing import Optional
 
 import click
-import httpx
 from click import ClickException
-from pydantic import ValidationError
 from scim2_client import SCIMClientError
 from scim2_models import SearchRequest
 from sphinx_click.rst_to_ansi_formatter import make_rst_to_ansi_formatter
@@ -112,29 +111,22 @@ def query_cli(
         )
 
     try:
-        if resource_type:
-            response = ctx.obj["client"].query(
-                resource_type,
-                id,
-                search_request=payload,
-                check_request_payload=check_request_payload,
-                headers=split_headers(headers),
-            )
-
-        else:
-            response = ctx.obj["client"].query_all(
-                search_request=payload,
-                check_request_payload=check_request_payload,
-                headers=split_headers(headers),
-            )
-
-    except (httpx.HTTPError, SCIMClientError) as exc:
-        raise ClickException(exc) from exc
+        response = ctx.obj["client"].query(
+            resource_type,
+            id,
+            search_request=payload,
+            check_request_payload=check_request_payload,
+            headers=split_headers(headers),
+        )
 
-    except ValidationError as exc:
-        payload = formatted_payload(exc.response_payload, indent)
-        message = f"The server response is invalid:\n{payload}\n{exc}"
-        raise ClickException(message) from exc
+    except SCIMClientError as scim_exc:
+        message = str(scim_exc)
+        if sys.version_info >= (3, 11) and hasattr(
+            scim_exc, "__notes__"
+        ):  # pragma: no branch
+            for note in scim_exc.__notes__:
+                message = f"{message}\n{note}"
+        raise ClickException(message) from scim_exc
 
     payload = formatted_payload(response.model_dump(), indent)
     click.echo(payload)

scim2_cli/query.py

@@ -1,7 +1,7 @@
+import sys
+
 import click
-import httpx
 from click import ClickException
-from pydantic import ValidationError
 from scim2_client import SCIMClientError
 from sphinx_click.rst_to_ansi_formatter import make_rst_to_ansi_formatter
 
@@ -40,13 +40,14 @@ def replace_cli(ctx, headers, indent):
     try:
         response = ctx.obj["client"].replace(payload, headers=split_headers(headers))
 
-    except (httpx.HTTPError, SCIMClientError) as exc:
-        raise ClickException(exc) from exc
-
-    except ValidationError as exc:
-        payload = formatted_payload(exc.response_payload, indent)
-        message = f"The server response is invalid:\n{payload}\n{exc}"
-        raise ClickException(message) from exc
+    except SCIMClientError as scim_exc:
+        message = str(scim_exc)
+        if sys.version_info >= (3, 11) and hasattr(
+            scim_exc, "__notes__"
+        ):  # pragma: no branch
+            for note in scim_exc.__notes__:
+                message = f"{message}\n{note}"
+        raise ClickException(message) from scim_exc
 
     payload = formatted_payload(response.model_dump(), indent)
     click.echo(payload)

scim2_cli/replace.py

@@ -1,9 +1,8 @@
+import sys
 from typing import List
 
 import click
-import httpx
 from click import ClickException
-from pydantic import ValidationError
 from scim2_client import SCIMClientError
 from scim2_models import SearchRequest
 from sphinx_click.rst_to_ansi_formatter import make_rst_to_ansi_formatter
@@ -100,13 +99,14 @@ def search_cli(
             headers=split_headers(headers),
         )
 
-    except (httpx.HTTPError, SCIMClientError) as exc:
-        raise ClickException(exc) from exc
-
-    except ValidationError as exc:
-        payload = formatted_payload(exc.response_payload, indent)
-        message = f"The server response is invalid:\n{payload}\n{exc}"
-        raise ClickException(message) from exc
+    except SCIMClientError as scim_exc:
+        message = str(scim_exc)
+        if sys.version_info >= (3, 11) and hasattr(
+            scim_exc, "__notes__"
+        ):  # pragma: no branch
+            for note in scim_exc.__notes__:
+                message = f"{message}\n{note}"
+        raise ClickException(message) from scim_exc
 
     payload = formatted_payload(response.model_dump(), indent)
     click.echo(payload)

scim2_cli/search.py

@@ -6,11 +6,9 @@
 def test_stdin(runner, httpserver, simple_user_payload):
     """Test that JSON stdin is passed in the POST request."""
 
-    httpserver.expect_request(
-        "/Users",
-        method="POST",
-    ).respond_with_json(
-        simple_user_payload("new-user"),
+    response_payload = simple_user_payload("new-user")
+    httpserver.expect_request("/Users", method="POST").respond_with_json(
+        response_payload,
         status=201,
         content_type="application/scim+json",
     )
@@ -31,22 +29,7 @@ def test_stdin(runner, httpserver, simple_user_payload):
     assert result.exit_code == 0, result.stdout
     json_output = json.loads(result.output)
 
-    # TODO: actually, there should not be the enterpriseuser schema unless some attributes of the extension are filled
-    assert json_output == {
-        "schemas": [
-            "urn:ietf:params:scim:schemas:core:2.0:User",
-            "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User",
-        ],
-        "meta": {
-            "created": "2010-01-23T04:56:22Z",
-            "lastModified": "2011-05-13T04:42:34Z",
-            "location": f"http://localhost:{httpserver.port}/Users/new-user",
-            "resourceType": "User",
-            "version": 'W\\/"3694e05e9dff590"',
-        },
-        "id": "new-user",
-        "userName": "new-user@example.com",
-    }
+    assert json_output == response_payload
 
 
 def test_no_stdin(runner, httpserver, simple_user_payload):
@@ -61,29 +44,6 @@ def test_no_stdin(runner, httpserver, simple_user_payload):
     assert "Input data is missing" in result.stdout
 
 
-def test_network_error(runner):
-    """Test httpx errors handling."""
-
-    payload = {
-        "schemas": [
-            "urn:ietf:params:scim:schemas:core:2.0:User",
-        ],
-        "userName": "new-user@example.com",
-    }
-
-    result = runner.invoke(
-        cli,
-        [
-            "http://invalid.test",
-            "create",
-        ],
-        catch_exceptions=False,
-        input=json.dumps(payload),
-    )
-    assert result.exit_code == 1, result.stdout
-    assert "Name or service not known" in result.stdout
-
-
 def test_scimclient_error(runner, httpserver, simple_user_payload):
     """Test scim2_client errors handling."""
 
@@ -145,4 +105,4 @@ def test_validation_error(runner, httpserver, simple_user_payload):
         input=json.dumps(payload),
     )
     assert result.exit_code == 1, result.stdout
-    assert "The server response is invalid" in result.stdout
+    assert "Expected type User but got undefined object with no schema" in result.stdout

tests/test_create.py

@@ -28,23 +28,6 @@ def test_nominal_case(runner, httpserver):
     assert result.exit_code == 0, result.stdout
 
 
-def test_network_error(runner):
-    """Test httpx errors handling."""
-
-    result = runner.invoke(
-        cli,
-        [
-            "http://invalid.test",
-            "delete",
-            "user",
-            "dummy-id",
-        ],
-        catch_exceptions=False,
-    )
-    assert result.exit_code == 1, result.stdout
-    assert "Name or service not known" in result.stdout
-
-
 def test_scimclient_error(runner, httpserver):
     """Test scim2_client errors handling."""