[CDAPI-85]: Minor review comment fixes

Author: nhsd-jack-wainwright

.github/workflows/preview-env.yaml

@@ -126,6 +126,8 @@ jobs:
           APIM_APIKEY: ${{ secrets.APIM_APIKEY }}
           API_MTLS_CERT: ${{ secrets.API_MTLS_CERT }}
           API_MTLS_KEY: ${{ secrets.API_MTLS_KEY }}
+          APIM_KEY_ID: ${{ secrets.APIM_KEY_ID }}
+          CLIENT_REQUEST_TIMEOUT: ${{ secrets.CLIENT_REQUEST_TIMEOUT }}
         run: |
           cd pathology-api/target/
           FN="${{ steps.names.outputs.function_name }}"
@@ -135,6 +137,8 @@ jobs:
           API_KEY="${APIM_APIKEY:-/cds/pathology/dev/apim/api-key}"
           MTLS_CERT="${API_MTLS_CERT:-/cds/pathology/dev/mtls/client1-key-public}"
           MTLS_KEY="${API_MTLS_KEY:-/cds/pathology/dev/mtls/client1-key-secret}"
+          KEY_ID="${APIM_KEY_ID:-DEV-1}"
+          CLIENT_TIMEOUT="${CLIENT_REQUEST_TIMEOUT:-10s}"
           echo "Deploying preview function: $FN"
           wait_for_lambda_ready() {
             while true; do
@@ -163,11 +167,11 @@ jobs:
                                         APIM_API_KEY_NAME=$API_KEY, \
                                         APIM_MTLS_CERT_NAME=$MTLS_CERT, \
                                         APIM_MTLS_KEY_NAME=$MTLS_KEY, \
-                                        APIM_KEY_ID=DEV-1, \
+                                        APIM_KEY_ID=$KEY_ID, \
                                         APIM_TOKEN_URL=$MOCK_URL/apim/oauth2/token, \
                                         PDM_BUNDLE_URL=$MOCK_URL/apim/check_auth, \
                                         MNS_EVENT_URL=$MOCK_URL/mns, \
-                                        CLIENT_TIMEOUT=1m, \
+                                        CLIENT_TIMEOUT=$CLIENT_TIMEOUT, \
                                         JWKS_SECRET_NAME=$JWKS_SECRET}" || true
             wait_for_lambda_ready
             aws lambda update-function-code --function-name "$FN" \
@@ -184,13 +188,13 @@ jobs:
               --environment "Variables={APIM_TOKEN_EXPIRY_THRESHOLD=$EXPIRY_THRESHOLD, \
                                         APIM_PRIVATE_KEY_NAME=$PRIVATE_KEY, \
                                         APIM_API_KEY_NAME=$API_KEY, \
-                                        APIM_KEY_ID=DEV-1, \
+                                        APIM_KEY_ID=$KEY_ID, \
                                         APIM_MTLS_CERT_NAME=$MTLS_CERT, \
                                         APIM_MTLS_KEY_NAME=$MTLS_KEY, \
                                         APIM_TOKEN_URL=$MOCK_URL/apim/oauth2/token, \
                                         PDM_BUNDLE_URL=$MOCK_URL/apim/check_auth, \
                                         MNS_EVENT_URL=$MOCK_URL/mns, \
-                                        CLIENT_TIMEOUT=1m, \
+                                        CLIENT_TIMEOUT=$CLIENT_TIMEOUT, \
                                         JWKS_SECRET_NAME=$JWKS_SECRET}" \
               --publish
             wait_for_lambda_ready

.github/workflows/stage-2-test.yaml

@@ -50,7 +50,7 @@ jobs:
           retention-days: 30
       - name: "Upload unit test results for mocks"
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: mock-unit-test-results
           path: mocks/test-artefacts/

pathology-api/src/pathology_api/apim.py

@@ -89,20 +89,16 @@ def _create_client_assertion(self) -> str:
             claims["aud"],
         )
 
-        try:
-            client_assertion = jwt.encode(
-                claims,
-                self._private_key,
-                algorithm="RS512",
-                headers={"kid": self._key_id},
-            )
+        client_assertion = jwt.encode(
+            claims,
+            self._private_key,
+            algorithm="RS512",
+            headers={"kid": self._key_id},
+        )
 
-            _logger.debug("Created client assertion. kid: %s", self._key_id)
+        _logger.debug("Created client assertion. kid: %s", self._key_id)
 
-            return client_assertion
-        except BaseException:
-            _logger.exception("Failed to create client assertion JWT")
-            raise
+        return client_assertion
 
     def _authenticate(self) -> __AccessToken:
         @self._session_manager.with_session

pathology-api/src/pathology_api/config.py

@@ -30,7 +30,7 @@ def timedelta(self) -> timedelta:
                 return timedelta(minutes=self.value)
 
 
-_SUPPORTED_PRIMATIVES: dict[type[Any], Callable[[str], Any]] = {
+_SUPPORTED_PRIMITIVES: dict[type[Any], Callable[[str], Any]] = {
     str: str,
     int: int,
 }
@@ -59,11 +59,11 @@ def get_optional_environment_variable[T](name: str, _type: type[T]) -> T | None:
                 ),
             )
 
-        case _ if _type in _SUPPORTED_PRIMATIVES:
+        case _ if _type in _SUPPORTED_PRIMITIVES:
             if value is None:
                 return None
 
-            return cast("T", _SUPPORTED_PRIMATIVES[_type](value))
+            return cast("T", _SUPPORTED_PRIMITIVES[_type](value))
 
         case _:
             raise ValueError(

pathology-api/src/pathology_api/http.py

@@ -68,14 +68,14 @@ def wrapper(*args: Any, **kwargs: Any) -> Any:
                 if self._client_certificate is not None:
                     _logger.debug("Configuring session with client certificate...")
 
-                    # File added to Exit stack to will be automatically cleaned up with
+                    # File added to Exit stack and will be automatically cleaned up with
                     # the stack.
                     cert_file = tempfile.NamedTemporaryFile(  # noqa: SIM115
                         delete=True
                     )
                     stack.enter_context(cert_file)
 
-                    # File added to Exit stack to will be automatically cleaned up with
+                    # File added to Exit stack and will be automatically cleaned up with
                     # the stack.
                     key_file = tempfile.NamedTemporaryFile(  # noqa: SIM115
                         delete=True

pathology-api/src/pathology_api/test_apim.py

@@ -144,7 +144,7 @@ def test_auth_existing_invalid_token(
         )
 
         apim_authenticator._access_token = {  # noqa SLF001 - Private access to support testing
-            "value": "old_acess_token",
+            "value": "old_access_token",
             "expiry": datetime.now(tz=timezone.utc) - timedelta(seconds=1),
         }