From d41735eeb4e634bff44297e5202750790f77ae84 Mon Sep 17 00:00:00 2001 From: dlavender4 Date: Wed, 11 Jun 2025 09:09:30 +0100 Subject: [PATCH 1/7] getting sonar-cloud running --- .github/workflows/code-quality.yml | 17 +++++++---------- scripts/config/sonar-scanner.properties | 6 ++++++ 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 scripts/config/sonar-scanner.properties diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 797e5f3e0..998bf9043 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -25,22 +25,19 @@ jobs: - name: Check Python Unit Test Coverage run: | make coverage-report - - uses: sonarsource/sonarcloud-github-action@master - # SEE: https://github.com/SonarSource/sonarcloud-github-action + - name: Perform SonarCloud static analysis + uses: sonarsource/sonarqube-scan-action@v5.2.0 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: - projectBaseDir: . args: > - -Dsonar.sources=application,infrastructure,scripts,test,build/docker - -Dsonar.organization=nhsd-exeter - -Dsonar.projectKey=uec-dos-int - -Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py + -Dsonar.organization=${{ vars.SONAR_ORGANISATION_KEY }} + -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} + -Dsonar.branch.name=${{ github.ref_name }} -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.python.version=3.12 - -Dsonar.exclusions=application/**/tests/** - + -Dproject.settings=./scripts/config/sonar-scanner.properties + continue-on-error: true check-markdown-code-quality: runs-on: ubuntu-latest steps: diff --git a/scripts/config/sonar-scanner.properties b/scripts/config/sonar-scanner.properties new file mode 100644 index 000000000..9fd6dfe38 --- /dev/null +++ b/scripts/config/sonar-scanner.properties @@ -0,0 +1,6 @@ +sonar.host.url=https://sonarcloud.io +sonar.qualitygate.wait=true +sonar.sourceEncoding=UTF-8 +sonar.sources=application,infrastructure,scripts,test,build/docker +sonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py +sonar.exclusions=application/**/tests/** From 5754d22b20375b89d46c3f31011c1cbe0b4052e2 Mon Sep 17 00:00:00 2001 From: dlavender4 Date: Wed, 11 Jun 2025 09:13:12 +0100 Subject: [PATCH 2/7] temporarily triggering sonarcloud from this test branch --- .github/workflows/code-quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 998bf9043..25ff56d08 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -2,7 +2,7 @@ name: "Check code format and quality" on: push: - branches: [develop, main] + branches: [develop, main, sonar-cloud] pull_request: types: [opened, ready_for_review, synchronize, reopened] From 5301372c67e4d48792d945931be295014f754c5d Mon Sep 17 00:00:00 2001 From: dlavender4 Date: Wed, 11 Jun 2025 09:56:01 +0100 Subject: [PATCH 3/7] updated codeowners --- .github/CODEOWNERS | 10 +++++----- .github/workflows/code-quality.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5aa0e4e0c..82beba8f6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ -/.github @nhsd-exeter/maintainers -/build/automation/lib @nhsd-exeter/maintainers -/build/automation/init.mk @nhsd-exeter/maintainers -/.gitignore @nhsd-exeter/maintainers -/project.code-workspace @nhsd-exeter/maintainers +/.github @NHSDigital/data-sourcing-ftrs +/build/automation/lib @NHSDigital/data-sourcing-ftrs +/build/automation/init.mk @NHSDigital/data-sourcing-ftrs +/.gitignore @NHSDigital/data-sourcing-ftrs +/project.code-workspace @NHSDigital/data-sourcing-ftrs diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 25ff56d08..216c27354 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -37,7 +37,7 @@ jobs: -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.python.version=3.12 -Dproject.settings=./scripts/config/sonar-scanner.properties - continue-on-error: true + continue-on-error: false # quick toggle to disable sonar-cloud if down check-markdown-code-quality: runs-on: ubuntu-latest steps: From 2970223b1724e7d87e442f51fda61949b2fc4c42 Mon Sep 17 00:00:00 2001 From: dlavender4 Date: Wed, 11 Jun 2025 09:59:56 +0100 Subject: [PATCH 4/7] allowing fails because want to try this in develop --- .github/workflows/code-quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 216c27354..79816c9b7 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -37,7 +37,7 @@ jobs: -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.python.version=3.12 -Dproject.settings=./scripts/config/sonar-scanner.properties - continue-on-error: false # quick toggle to disable sonar-cloud if down + continue-on-error: true # quick toggle to disable sonar-cloud if down check-markdown-code-quality: runs-on: ubuntu-latest steps: From f7fb7d9043c0bbd96c71598e071e8517eccbf0a2 Mon Sep 17 00:00:00 2001 From: dlavender4 Date: Wed, 11 Jun 2025 10:05:29 +0100 Subject: [PATCH 5/7] updated codeowners --- .github/CODEOWNERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 82beba8f6..9d6ee79db 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ -/.github @NHSDigital/data-sourcing-ftrs -/build/automation/lib @NHSDigital/data-sourcing-ftrs -/build/automation/init.mk @NHSDigital/data-sourcing-ftrs -/.gitignore @NHSDigital/data-sourcing-ftrs -/project.code-workspace @NHSDigital/data-sourcing-ftrs +/.github @NHSDigital/data-sourcing-ftrs/maintainers +/build/automation/lib @NHSDigital/data-sourcing-ftrs/maintainers +/build/automation/init.mk @NHSDigital/data-sourcing-ftrs/maintainers +/.gitignore @NHSDigital/data-sourcing-ftrs/maintainers +/project.code-workspace @NHSDigital/data-sourcing-ftrs/maintainers From 89feb1cd4c0eacf5aa9901434bdbfeda72d8bf80 Mon Sep 17 00:00:00 2001 From: dlavender4 Date: Wed, 11 Jun 2025 10:06:55 +0100 Subject: [PATCH 6/7] fixes --- .github/workflows/code-quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 79816c9b7..610592d72 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -2,7 +2,7 @@ name: "Check code format and quality" on: push: - branches: [develop, main, sonar-cloud] + branches: [develop, main] pull_request: types: [opened, ready_for_review, synchronize, reopened] From 1e660708698fbe3c7e5fc8b79eae94935b525a1d Mon Sep 17 00:00:00 2001 From: dlavender4 Date: Wed, 11 Jun 2025 14:42:58 +0100 Subject: [PATCH 7/7] fixes --- Makefile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index be1b8d23a..a57b05359 100644 --- a/Makefile +++ b/Makefile @@ -272,7 +272,7 @@ tag-commit-to-destroy-environment: # Tag git commit to destroy deployment - mand fi get-environment-from-pr: - ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=nhsd-exeter/dos-integration | jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?.[0-9]*).*"; "ds-\(.x)") ') + ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=NHSDigital/dos-integration | jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?.[0-9]*).*"; "ds-\(.x)") ') echo $$ENVIRONMENT is-environment-deployed: diff --git a/README.md b/README.md index 2d3c0e795..2c1b6733c 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ The main components you will need for _basic_ development work, are your OS vers Clone the repository - git clone git@github.com:nhsd-exeter/dos-integration.git + git clone git@github.com:NHSDigital/dos-integration.git cd ./dos-integration ### AWS Authentication