APM-6193-FixingsftIssue

Author: NautiyalVikas1

azure/templates/run-integration-tests.yml

@@ -9,17 +9,17 @@ steps:
    workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
    displayName: Setup integration tests
 
-#  - bash: |
-#     export SOURCE_COMMIT_ID=$(Build.SourceVersion)
-#     export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
-#     export PROXY_NAME="$(FULLY_QUALIFIED_SERVICE_NAME)"
-#     export API_NAME="shared-flow-testing"
-#     export OAUTH_BASE_URI="https://$(APIGEE_ENVIRONMENT).api.service.nhs.uk/oauth2-mock"
-#     export ACCESS_TOKEN_HASH_SECRET="$(ACCESS_TOKEN_SECRET)"
+ - bash: |
+    export SOURCE_COMMIT_ID=$(Build.SourceVersion)
+    export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
+    export PROXY_NAME="$(FULLY_QUALIFIED_SERVICE_NAME)"
+    export API_NAME="shared-flow-testing"
+    export OAUTH_BASE_URI="https://$(APIGEE_ENVIRONMENT).api.service.nhs.uk/oauth2-mock"
+    export ACCESS_TOKEN_HASH_SECRET="$(ACCESS_TOKEN_SECRET)"
 
-#     poetry run pytest --reruns 2 --reruns-delay 1 -v --junitxml=test-report.xml
-#    workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
-#    displayName: Run integration tests
+    poetry run pytest --reruns 2 --reruns-delay 1 -v --junitxml=test-report.xml
+   workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
+   displayName: Run integration tests
 
  - task: PublishTestResults@2
    displayName: 'Publish smoketest results'

package.json

@@ -3,17 +3,23 @@
   "version": "0.0.1",
   "description": "OAS (Swagger v3) API Definition for Template API",
   "scripts": {
-    "lint": "node_modules/.bin/openapi-generator-cli validate -i specification/shared-flow-testing.yaml",
-    "publish": "./node_modules/.bin/openapi-generator-cli generate -i specification/shared-flow-testing.yaml --generator-key v3.0  -g openapi -o build && rm openapitools.json && mv build/openapi.json build/shared-flow-testing.json",
+    "lint": "node_modules/.bin/speccy lint -s openapi-tags -s operation-tags specification/shared-flow-testing.yaml --skip default-and-example-are-redundant",
+    "publish": "mkdir -p build && node_modules/.bin/speccy resolve specification/shared-flow-testing.yaml -i | poetry run python scripts/yaml2json.py | poetry run python scripts/set_version.py > build/shared-flow-testing.json",
+    "serve": "node_modules/.bin/speccy serve build/shared-flow-testing.json",
     "check-licenses": "node_modules/.bin/license-checker --failOn GPL --failOn LGPL"
   },
   "author": "NHS Digital",
   "license": "MIT",
   "homepage": "https://github.com/NHSDigital/shared-flow-testing",
+  "dependencies": {
+    "newman-reporter-htmlextra": "^1.20.1",
+    "speccy": "^0.11.0"
+  },
   "devDependencies": {
-    "apigeetool": "^0.16.5",
+    "apigeetool": "^0.14.2",
     "license-checker": "^25.0.1",
-    "minimist": "^1.2.6",
-    "@openapitools/openapi-generator-cli": "^2.5.1"
+    "minimist": "^1.2.2",
+    "newman": "^4.5.7",
+    "newman-reporter-html": "^1.0.5"
   }
-}
+}

pyproject.toml

@@ -29,14 +29,14 @@ pytest-nhsd-apim = "^3.3.2"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^3.7.9"
-black = "^23.0.0"
+black = "^20.8b1"
 pip-licenses = "^2.0.1"
 jinja2 = "^2.11.1"
 pyyaml = "^5.2"
 docopt = "^0.6.2"
 jsonpath-rw = "^1.4.0"
 semver = "^2.9.0"
-gitpython = "^3.1.34"
+gitpython = "^3.0.5"
 pytest = "^6.1.2"
 coverage = "^5.5"
 aiohttp = "^3.7.3"