proxygen-cli 2.1.5__tar.gz → 2.1.7__tar.gz

{proxygen_cli-2.1.5 → proxygen_cli-2.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proxygen-cli
-Version: 2.1.5
+Version: 2.1.7
 Summary: CLI for interacting with NHSD APIM's proxygen service
 Home-page: https://github.com/NHSDigital/proxygen-cli
 Author: Ben Strutt
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: click (>=8.1.3,<9.0.0)
-Requires-Dist: cryptography (>=36.0.1,<37.0.0)
+Requires-Dist: cryptography (>=42.0,<43.0)
 Requires-Dist: lxml (>=4.7.1,<5.0.0)
 Requires-Dist: pydantic (>=1.9.1,<2.0.0)
 Requires-Dist: pyjwt (>=2.3.0,<3.0.0)
@@ -102,3 +102,11 @@ Use the following command to obtain a docker token:
 ```
 $(proxygen docker get-login)
 ```
+### Retrieving a token to use with the pytest-nhsd-apim python testing package
+When testing using the pytest-nhsd-apim python testing package, an apigee management api token is needed. This endpoint provides this token for use in automated tests.
+
+Use the following command to obtain the pytest-nhsd-apim token:
+```
+$(proxygen pytest_nhsd_apim get_token)
+```
+

{proxygen_cli-2.1.5 → proxygen_cli-2.1.7}/README.md

@@ -76,4 +76,11 @@ To enable the push and pull of images from the API Management ECR repository, yo
 Use the following command to obtain a docker token:
 ```
 $(proxygen docker get-login)
-```
+```
+### Retrieving a token to use with the pytest-nhsd-apim python testing package
+When testing using the pytest-nhsd-apim python testing package, an apigee management api token is needed. This endpoint provides this token for use in automated tests.
+
+Use the following command to obtain the pytest-nhsd-apim token:
+```
+$(proxygen pytest_nhsd_apim get_token)
+```

proxygen_cli-2.1.7/proxygen_cli/cli/command_pytest_nhsd_apim_token.py

@@ -0,0 +1,33 @@
+import click
+
+from proxygen_cli.lib.settings import SETTINGS
+from proxygen_cli.lib import proxygen_api, version, output
+
+
+@click.group()
+@click.option(
+    "--api", default=SETTINGS.api, help="Override the default API", show_default=True
+)
+@click.pass_context
+def pytest_nhsd_apim(ctx, api):
+    """
+    Intract with your API's pytest_nhsd_apim assets
+    """
+    version.validate_cli_version()
+    ctx.ensure_object(dict)
+    if api is None:
+        raise click.UsageError(
+            "You must set the API before using this command: see `proxygen settings`"
+        )
+    ctx.obj["api"] = api
+
+
+@pytest_nhsd_apim.command()
+@click.pass_context
+def get_token(ctx):
+    """
+    Get a token for use with pytest-nhsd-apim python testing package.
+    """
+    api = ctx.obj["api"]
+    resp = proxygen_api.get_pytest_nhsd_apim_token(api)
+    output.print_json(resp)

{proxygen_cli-2.1.5 → proxygen_cli-2.1.7}/proxygen_cli/lib/proxygen_api.py

@@ -84,6 +84,11 @@ def get_docker_login(api: str):
     return _resp_json(resp)
 
 
+def get_pytest_nhsd_apim_token(api: str):
+    resp = _session().get(f"/apis/{api}/pytest-nhsd-apim-token")
+    return _resp_json(resp)
+
+
 def get_resources(
     api: str,
     _type: Optional[Literal["instance", "secret"]] = None,

proxygen_cli-2.1.7/proxygen_cli/test/command_pytest_nhsd_apim_token_test.py

@@ -0,0 +1,23 @@
+"""
+Tests around the pytest_nhsd_apim_token CLI command.
+"""
+
+import json
+
+from click.testing import CliRunner
+
+import proxygen_cli.cli.command_pytest_nhsd_apim_token as cmd_pytest_nhsd_apim
+
+
+def test_get_pytest_nhsd_apim_token(patch_request, patch_access_token):
+    """
+    Ensure the get command supports UAT specs.
+    """
+    expected_resp = {"pytest_nhsd_apim_token": "token123", "expires_in": "3600"}
+
+    runner = CliRunner()
+    with patch_access_token(), patch_request(200, expected_resp):
+        result = runner.invoke(cmd_pytest_nhsd_apim.get_token, obj={"api": "mock-api"})
+
+    result_to_dict = json.loads(result.output.strip())
+    assert result_to_dict == expected_resp

{proxygen_cli-2.1.5 → proxygen_cli-2.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "proxygen-cli"
-version = "2.1.5"
+version = "2.1.7"
 description = "CLI for interacting with NHSD APIM's proxygen service"
 authors = ["Ben Strutt <ben.strutt1@nhs.net>"]
 readme = "README.md"
@@ -17,7 +17,7 @@ click = "^8.1.3"
 pyjwt = "^2.3.0"
 requests = "^2.27.1"
 lxml = "^4.7.1"
-cryptography = "^36.0.1"
+cryptography = "^42.0"
 pyyaml = "^6.0"
 yaspin = "^2.2.0"
 tabulate = "^0.9.0"