Skip to content

Commit d9e1f60

Browse files
authored
Remove old linting code. Add Terraform to tool versions file. (#897)
* Remove old linting code. Add Terraform to tool versions file for asdf / mise users. * Update quality checks pipeline. * Update dist included files. * Remove unnecessary pipeline step and template. * Reinstate .terraform-version while we're still using APIM pipelines.
1 parent 88435d5 commit d9e1f60

File tree

11 files changed

+6
-1953
lines changed

11 files changed

+6
-1953
lines changed

.flake8

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/quality-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
cache: "npm"
2626

2727
- name: Install linting dependencies
28-
run: make install-node
28+
run: make install
2929

3030
- name: Lint
3131
run: make lint

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
poetry 2.1.4
22
nodejs 23.11.0
33
python 3.11.12
4+
terraform 1.12.2

Makefile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,12 @@ SHELL=/usr/bin/env bash -euo pipefail
33
PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = backend batch_processor_filter delta_backend filenameprocessor mesh_processor recordprocessor lambdas/ack_backend lambdas/redis_sync lambdas/id_sync lambdas/mns_subscription lambdas/shared
44
PYTHON_PROJECT_DIRS = e2e e2e_batch quality_checks $(PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS)
55

6-
.PHONY: install-python install-node install lint format format-check clean publish build-proxy release initialise-all-python-venvs update-all-python-dependencies run-all-python-unit-tests build-all-docker-images
7-
8-
#Installs dependencies using poetry.
9-
install-python:
10-
poetry lock --no-update
11-
poetry install
6+
.PHONY: install lint format format-check clean publish build-proxy release initialise-all-python-venvs update-all-python-dependencies run-all-python-unit-tests build-all-docker-images
127

138
#Installs dependencies using npm.
14-
install-node:
9+
install:
1510
npm install --legacy-peer-deps
1611

17-
#Condensed Target to run all targets above.
18-
install: install-node install-python
19-
2012
#Run the npm linting script (specified in package.json). Used to check the syntax and formatting of files.
2113
lint:
2214
npm run lint
@@ -45,7 +37,7 @@ build-proxy:
4537

4638
#Files to loop over in release
4739
# VED-811: remove everything except for proxy related files as we move to Github Actions for backend deployment
48-
_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. specification sandbox terraform scripts"
40+
_dist_include="poetry.toml Makefile build/. specification sandbox terraform scripts"
4941

5042
#Create /dist/ sub-directory and copy files into directory
5143
#Ensure full dir structure is preserved for Lambdas

azure/templates/post-deploy.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ steps:
2828
- ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INT_CLIENT_ID
2929
- ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INT_CLIENT_SECRET
3030

31-
- bash: |
32-
make install-python
33-
workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
34-
displayName: Setup pytests
35-
condition: always()
36-
3731
- template: ./aws-assume-role.yml
3832
parameters:
3933
role: "auto-ops"

azure/templates/run-tests.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)