From 731ede0ab473f8639bf18b742b11c7fdfcbab5a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:51:59 +0000 Subject: [PATCH 1/6] Upgrade: [dependabot] - bump NHSDigital/eps-workflow-quality-checks Bumps [NHSDigital/eps-workflow-quality-checks](https://github.com/nhsdigital/eps-workflow-quality-checks) from 4.0.0 to 4.0.4. - [Release notes](https://github.com/nhsdigital/eps-workflow-quality-checks/releases) - [Changelog](https://github.com/NHSDigital/eps-workflow-quality-checks/blob/main/release.config.js) - [Commits](https://github.com/nhsdigital/eps-workflow-quality-checks/compare/v4.0.0...v4.0.4) --- updated-dependencies: - dependency-name: NHSDigital/eps-workflow-quality-checks dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5264adcf..2bdf4ac0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ env: jobs: quality_checks: - uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.0 + uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.4 secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d10a0a39..f1610bc9 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -9,7 +9,7 @@ env: jobs: quality_checks: - uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.0 + uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.4 secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 58292724..8ce17f9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ env: jobs: quality_checks: - uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.0 + uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.4 secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: From bfe42786df7a94561970c1d8715b5d2fbe61bc2a Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:47:01 +0000 Subject: [PATCH 2/6] correct project key --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 57dadcb5..fe56a7cc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ 2.18.2 nhsdigital https://sonarcloud.io + NHSDigital_eps-FHIR-validator-lambda 1.9.22.1 From 656dd4c5ff9d594822befc4bae38dfff0286b9c9 Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:48:29 +0000 Subject: [PATCH 3/6] really fix project key --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe56a7cc..a0ebf589 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 2.18.2 nhsdigital https://sonarcloud.io - NHSDigital_eps-FHIR-validator-lambda + eps-FHIR-validator-lambda 1.9.22.1 From eab2d7af0aaaee5702508061d1cb2ceb825ee5d9 Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:04:11 +0000 Subject: [PATCH 4/6] update sonar key --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0ebf589..fe56a7cc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 2.18.2 nhsdigital https://sonarcloud.io - eps-FHIR-validator-lambda + NHSDigital_eps-FHIR-validator-lambda 1.9.22.1 From b9f425cb86a998280c2ad08cc732b47b359e0c35 Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:18:03 +0000 Subject: [PATCH 5/6] add secret pre-commit --- .devcontainer/devcontainer.json | 1 + .pre-commit-config.yaml | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5e8b5342..771b5b93 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -61,6 +61,7 @@ } } }, + "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" }, "postCreateCommand": "rm -f ~/.docker/config.json; git config --global --add safe.directory /workspaces/eps-FHIR-validator-lambda; make install" // "features": {}, // Use 'forwardPorts' to make a list of ports inside the container available locally. diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index caedd14f..dd206411 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,6 +21,15 @@ repos: hooks: - id: flake8 - + - repo: local + hooks: + - id: git-secrets + name: Git Secrets + description: git-secrets scans commits, commit messages, and --no-ff merges to prevent adding secrets into your git repositories. + entry: bash + args: + - -c + - 'docker run -v "$LOCAL_WORKSPACE_FOLDER:/src" git-secrets --pre_commit_hook' + language: system fail_fast: true default_stages: [commit] From ffdcb4bd335adadb35e7feeb185bd4bd00c2adf9 Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:18:25 +0000 Subject: [PATCH 6/6] bump qc version --- .github/workflows/ci.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bdf4ac0..d6437da9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ env: jobs: quality_checks: - uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.4 + uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.5 secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index f1610bc9..40927731 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -9,7 +9,7 @@ env: jobs: quality_checks: - uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.4 + uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.5 secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ce17f9c..c4fb9ba9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ env: jobs: quality_checks: - uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.4 + uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.5 secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: