VED-000 Resolve new Sonar issues (#1078)

Author: dlzhry2nhs

.github/workflows/create-release-tag.yml

@@ -29,9 +29,7 @@ jobs:
         run: pip install semver
 
       - name: Set SPEC_VERSION env var
-        run: echo ::set-env name=SPEC_VERSION::$(python utilities/scripts/calculate_version.py)
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+        run: echo "SPEC_VERSION::$(python utilities/scripts/calculate_version.py)" >> $GITHUB_ENV
 
       - name: Create release (master only)
         id: create-release

.github/workflows/deploy-backend.yml

@@ -48,14 +48,13 @@ env: # Sonarcloud - do not allow direct usage of untrusted data
   ENVIRONMENT: ${{ inputs.environment }}
   SUB_ENVIRONMENT: ${{ inputs.sub_environment }}
 
-permissions:
-  id-token: write
-  contents: read
-
 run-name: Deploy Backend - ${{ inputs.environment }} ${{ inputs.sub_environment }}
 
 jobs:
   terraform-plan:
+    permissions:
+      id-token: write
+      contents: read
     runs-on: ubuntu-latest
     environment:
       name: ${{ inputs.environment }}
@@ -89,6 +88,9 @@ jobs:
           path: infrastructure/instance/tfplan
 
   terraform-apply:
+    permissions:
+      id-token: write
+      contents: read
     needs: terraform-plan
     runs-on: ubuntu-latest
     environment:

.github/workflows/run-e2e-tests.yml

@@ -54,12 +54,10 @@ env:
   STATUS_API_KEY: ${{ secrets.STATUS_API_KEY }}
   SOURCE_COMMIT_ID: ${{ github.sha }}
 
-permissions:
-  id-token: write
-  contents: read
-
 jobs:
   wait-for-deployment:
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     environment: ${{ inputs.apigee_environment }}
     outputs:
@@ -109,6 +107,9 @@ jobs:
           fi
 
   e2e-tests:
+    permissions:
+      id-token: write
+      contents: read
     runs-on: ubuntu-latest
     needs: [wait-for-deployment]
     environment: ${{ inputs.apigee_environment }}
@@ -202,6 +203,9 @@ jobs:
         run: poetry run python -m unittest
 
   batch-e2e-tests:
+    permissions:
+      id-token: write
+      contents: read
     needs: [wait-for-deployment, e2e-tests]
     # Only actually depend on wait-for-deployment, but run after e2e-tests
     if: ${{ !cancelled() && needs.wait-for-deployment.result == 'success' && needs.wait-for-deployment.outputs.RUN_BATCH_E2E_TESTS == 'true' }}

lambdas/backend/src/controller/parameter_parser.py

@@ -166,7 +166,7 @@ def parse_search_params(search_params_in_req: dict[str, list[str]]) -> dict[str,
     """Ensures the search params provided in the event do not contain duplicated keys. Will split the parameters
     provided by comma separators. Raises a ParameterExceptionError for duplicated keys. Existing business logic stipulated
     that the API only accepts comma separated values rather than multi-value."""
-    if any([len(values) > 1 for _, values in search_params_in_req.items()]):
+    if any(len(values) > 1 for _, values in search_params_in_req.items()):
         raise ParameterExceptionError(DUPLICATED_PARAMETERS_ERROR_MESSAGE)
 
     parsed_params = {}

lambdas/shared/src/common/models/errors.py

@@ -67,7 +67,7 @@ def to_operation_outcome(self) -> dict:
 
 class ApiValidationError(RuntimeError):
     def to_operation_outcome(self) -> dict:
-        pass
+        raise NotImplementedError("Improper usage: base class")
 
 
 @dataclass

lambdas/shared/tests/test_common/test_errors.py

@@ -129,11 +129,14 @@ def test_errors_unhandled_response_error(self):
         self.assertEqual(issue.get("diagnostics"), f"{test_message}\n{test_response}")
 
     def test_errors_api_validation_error(self):
-        """Test correct operation of ApiValidationError"""
-        with self.assertRaises(errors.ApiValidationError) as context:
+        """Test base ApiValidationError class cannot be used"""
+        with self.assertRaises(errors.ApiValidationError) as initial_error:
             raise errors.ApiValidationError()
-        outcome = context.exception.to_operation_outcome()
-        self.assertIsNone(outcome)
+
+        with self.assertRaises(NotImplementedError) as not_implemented_error:
+            initial_error.exception.to_operation_outcome()
+
+        self.assertEqual(str(not_implemented_error.exception), "Improper usage: base class")
 
     def test_errors_custom_validation_error(self):
         """Test correct operation of CustomValidationError"""