PyPI - proxygen-cli - Versions diffs - 4.0.0__tar.gz → 4.0.3__tar.gz - Mend

proxygen-cli 4.0.0tar.gz → 4.0.3tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

{proxygen_cli-4.0.0 → proxygen_cli-4.0.3}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxygen-cli
-Version: 4.0.0
+Version: 4.0.3
 Summary: CLI for interacting with NHSD APIM's proxygen service
 Author: Ben Strutt
 Author-email: ben.strutt1@nhs.net
@@ -9,11 +9,11 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: click (>=8.1.2,<9.0.0)
-Requires-Dist: cryptography (>=44.0.1,<47.0.0)
+Requires-Dist: cryptography (>=48.0.1,<49.0.0)
 Requires-Dist: lxml (>=6.0.1,<7.0.0)
 Requires-Dist: packaging (>=24.2,<25.0)
 Requires-Dist: pydantic (>=1.9.1,<2.0.0)
-Requires-Dist: pyjwt (>=2.9.0,<3.0.0)
+Requires-Dist: pyjwt (>=2.13.0,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.3,<7.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: tabulate (>=0.9,<0.11)
@@ -38,9 +38,10 @@ After installation, the `proxygen` executable is available. Typing `proxygen` di
 ### Settings
 To specify the API you are developing for, use:
 ```
-proxygen settings set api <API-NAME>
+proxygen settings set api <API-NAME> --env <ptl/prod>
 ```
 Your user must have the appropriate permissions for managing instances, secrets, and specifications related to the specified API. If permissions are insufficient, commands will fail. Reach out to the `platforms-api-producer-support` channel for assistance with permissions.
+Parameter --env is optional, if the environment is not provided then CLI will default to Prod.
 ### Credentials
@@ -54,9 +55,10 @@ If you are setting up user access for the first time you will first need to requ
 To setup the Proxygen CLI credentials for the first time with user access enter the following command:
 ```
-proxygen credentials set
+proxygen credentials set --env <ptl/prod>
 ```
 The CLI will ask you for your username, and password. These credentials will be securely stored on your local machine in the directory ~/.proxygen/credentials.yaml. The client_id and secret used for user access will be automatically added to this file after running the command.
+Parameter --env is optional, if the environment is not provided then CLI will default to Prod.
 Your user must have permissions to manipulate instances/secrets/specs for the API you set here. If you do not have sufficient permissions commands will fail. If you believe your permissions are incorrect, contact the API platform team via the [platforms-api-producer-support](https://nhsdigital-platforms.slack.com/archives/C016JRWN6AY) channel.
@@ -69,16 +71,17 @@ After having set up your API using the instructions at [Getting set up with prox
 Using this information enter the following command:
 ```
-proxygen credentials set private_key_path <PATH_TO_PRIVATE_KEY> key_id <KEY_ID_FOR_PRIVATE_KEY> client_id <MACHINE_USER_CLIENT_ID>
+proxygen credentials set private_key_path <PATH_TO_PRIVATE_KEY> key_id <KEY_ID_FOR_PRIVATE_KEY> client_id <MACHINE_USER_CLIENT_ID> --env <ptl/prod>
 ```
 The CLI will ask you for your username, and password. For machine authentication, the username and password must be left blank. The credentials will be securely stored in the directory ~/.proxygen/credentials.yaml.
+Parameter --env is optional, if the environment is not provided then CLI will default to Prod.
 > **_NOTE:_**  If you are switching between using user access and machine-user access bare in mind:
 > - proxygen-cli will favour user access if username and password credentials are set
 > - User access uses proxygen-cli-user-client as a client_id. If you switch between access modes remember to switch the client_id
 > - The value for client_secret should remain untouched as it is not used for machine-user access
 > - If you lose the client_secret for then proxygen-cli-user-client then reach out to the platforms-api-producer-support channel for it
+> - From version 4.0.0 CLI will prompt for client_id and client_secret instead of setting automatically.
 ## Commands
 Commands are documented inside the CLI itself.
@@ -100,7 +103,7 @@ Use the following command to publish an API specification:
 ```
 # Production
 proxygen spec publish <path_to_spec>
 # UAT
 proxygen spec publish <path_to_spec> --uat
 ```

{proxygen_cli-4.0.0 → proxygen_cli-4.0.3}/README.md RENAMED Viewed

@@ -15,9 +15,10 @@ After installation, the `proxygen` executable is available. Typing `proxygen` di
 ### Settings
 To specify the API you are developing for, use:
 ```
-proxygen settings set api <API-NAME>
+proxygen settings set api <API-NAME> --env <ptl/prod>
 ```
 Your user must have the appropriate permissions for managing instances, secrets, and specifications related to the specified API. If permissions are insufficient, commands will fail. Reach out to the `platforms-api-producer-support` channel for assistance with permissions.
+Parameter --env is optional, if the environment is not provided then CLI will default to Prod.
 ### Credentials
@@ -31,9 +32,10 @@ If you are setting up user access for the first time you will first need to requ
 To setup the Proxygen CLI credentials for the first time with user access enter the following command:
 ```
-proxygen credentials set
+proxygen credentials set --env <ptl/prod>
 ```
 The CLI will ask you for your username, and password. These credentials will be securely stored on your local machine in the directory ~/.proxygen/credentials.yaml. The client_id and secret used for user access will be automatically added to this file after running the command.
+Parameter --env is optional, if the environment is not provided then CLI will default to Prod.
 Your user must have permissions to manipulate instances/secrets/specs for the API you set here. If you do not have sufficient permissions commands will fail. If you believe your permissions are incorrect, contact the API platform team via the [platforms-api-producer-support](https://nhsdigital-platforms.slack.com/archives/C016JRWN6AY) channel.
@@ -46,16 +48,17 @@ After having set up your API using the instructions at [Getting set up with prox
 Using this information enter the following command:
 ```
-proxygen credentials set private_key_path <PATH_TO_PRIVATE_KEY> key_id <KEY_ID_FOR_PRIVATE_KEY> client_id <MACHINE_USER_CLIENT_ID>
+proxygen credentials set private_key_path <PATH_TO_PRIVATE_KEY> key_id <KEY_ID_FOR_PRIVATE_KEY> client_id <MACHINE_USER_CLIENT_ID> --env <ptl/prod>
 ```
 The CLI will ask you for your username, and password. For machine authentication, the username and password must be left blank. The credentials will be securely stored in the directory ~/.proxygen/credentials.yaml.
+Parameter --env is optional, if the environment is not provided then CLI will default to Prod.
 > **_NOTE:_**  If you are switching between using user access and machine-user access bare in mind:
 > - proxygen-cli will favour user access if username and password credentials are set
 > - User access uses proxygen-cli-user-client as a client_id. If you switch between access modes remember to switch the client_id
 > - The value for client_secret should remain untouched as it is not used for machine-user access
 > - If you lose the client_secret for then proxygen-cli-user-client then reach out to the platforms-api-producer-support channel for it
+> - From version 4.0.0 CLI will prompt for client_id and client_secret instead of setting automatically.
 ## Commands
 Commands are documented inside the CLI itself.
@@ -77,7 +80,7 @@ Use the following command to publish an API specification:
 ```
 # Production
 proxygen spec publish <path_to_spec>
 # UAT
 proxygen spec publish <path_to_spec> --uat
 ```

{proxygen_cli-4.0.0 → proxygen_cli-4.0.3}/proxygen_cli/test/command_credentials_test.py RENAMED Viewed

@@ -10,6 +10,7 @@ import proxygen_cli.cli.command_credentials as cmd_credentials
 from proxygen_cli.lib.credentials import Credentials
 CLIENT_ID = os.environ["PROXYGEN_CLIENT_ID"]
 CLIENT_SECRET = os.environ["PROXYGEN_CLIENT_SECRET"]
+# added below urls to resolve sonar cloud issues.
 KEYCLOAK_URL = "https://identity.prod.api.platform.nhs.uk/realms/api-producers"
 MOCK_KEYCLOAK_URL = "https://mock-keycloak-url.nhs.uk"
 BASE_URL_LABEL = "base_url: "

{proxygen_cli-4.0.0 → proxygen_cli-4.0.3}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "proxygen-cli"
-version = "4.0.0"
+version = "4.0.3"
 description = "CLI for interacting with NHSD APIM's proxygen service"
 authors = ["Ben Strutt <ben.strutt1@nhs.net>"]
 readme = "README.md"
@@ -14,17 +14,17 @@ proxygen = 'proxygen_cli.cli.command_main:main'
 python = "^3.13"
 pydantic = "^1.9.1"
 click="^8.1.2"
-pyjwt = "^2.9.0"
+pyjwt = "^2.13.0"
 requests = "^2.32.3"
 lxml = "^6.0.1"
-cryptography = ">= 44.0.1, < 47.0.0" # Not directly imported, but needed by pyjwt for the RS512 algorithm
+cryptography = "^48.0.1" # Not directly imported, but needed by pyjwt for the RS512 algorithm
 pyyaml = "^6.0.3"
 yaspin = "^3.2.0"
 tabulate = ">=0.9,<0.11"
 packaging = "^24.2"
 [tool.poetry.group.dev.dependencies]
-pytest = "^8.4.2"
+pytest = "^9.0.3"
 pytest-cov = "^4.0.0"
 pytest-icdiff = "^0.6"