-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1374 from ScilifelabDataCentre/dev-fix
New release PR because of required master- and dev fix
- Loading branch information
Showing
33 changed files
with
1,871 additions
and
1,226 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,126 @@ | ||
| > **Before submitting the PR, please go through the sections below and fill in what you can. If there are any items that are irrelevant for the current PR, remove the row. If a relevant option is missing, please add it as an item and add a PR comment informing that the new option should be included into this template.** | ||
| <!-- | ||
| > **Before _submitting_ PR:** | ||
| > | ||
| > - Fill in and tick fields | ||
| > - _Remove all rows_ that are not relevant for the current PR | ||
| > - Revelant option missing? Add it as an item and add a PR comment informing that the new option should be included into this template. | ||
| > | ||
| > **Before _merging_ PR:** | ||
| > | ||
| > _Tick all relevant items._ | ||
| --> | ||
|
|
||
| > **All _relevant_ items should be ticked before the PR is merged** | ||
| ## **1. This PR contains the following changes...** | ||
|
|
||
| # Description | ||
| _Add a summary of the changes and the related issue._ | ||
|
|
||
| - [ ] Summary of the changes and the related issue: | ||
| - [ ] Motivation and context regarding why the change is needed: | ||
| - [ ] List / description of any dependencies or other changes required for this change: | ||
| - Fixes an issue in GitHub / Jira: | ||
| - [ ] Yes: _[link to GitHub issue / Jira task ID]_ | ||
| - [ ] No | ||
| ## **2. The following additional changes are required for this to work** | ||
|
|
||
| ## Type of change | ||
| _Add information on additional changes required for the PR changes to work, both locally and in the deployments._ | ||
|
|
||
| > E.g. Does the deployment setup need anything for this to work? | ||
| ## **3. The PR fixes the following GitHub issue / Jira task** | ||
|
|
||
| <!-- Comment out the item which does not apply here.--> | ||
|
|
||
| - [ ] GitHub issue (link): | ||
| - [ ] Jira task (ID, `DDS-xxxx`): | ||
| - [ ] The PR does not fix a specific GitHub issue or Jira task | ||
|
|
||
| ## **4. What _type of change(s)_ does the PR contain?** | ||
|
|
||
| <!-- | ||
| - "Breaking": The change will cause existing functionality to not work as expected. | ||
| - Workflow: E.g. a new github action or changes to this PR template. Anything that alters our or the codes workflow. | ||
| --> | ||
|
|
||
| - [ ] Bug fix | ||
| - [ ] Breaking: _Describe_ | ||
| - [ ] Non-breaking | ||
| - [ ] Documentation | ||
| - [ ] New feature | ||
| - [ ] Breaking: _Describe_ | ||
| - [ ] Breaking: _Please describe the reason for the break and how we can fix it._ | ||
| - [ ] Non-breaking | ||
| - [ ] Database change | ||
| - [ ] Migration _included in PR_ | ||
| - [ ] Migration _not needed_ | ||
| - [ ] Bug fix | ||
| - [ ] Breaking: _Please describe the reason for the break and how we can fix it._ | ||
| - [ ] Non-breaking | ||
| - [ ] Security Alert fix | ||
| - [ ] Documentation | ||
| - [ ] Tests **(only)** | ||
| - [ ] Workflow | ||
|
|
||
| _"Breaking": The change will cause existing functionality to not work as expected._ | ||
|
|
||
| # Checklist: | ||
|
|
||
| ## General | ||
|
|
||
| - [ ] [Changelog](../CHANGELOG.md): New row added. Not needed when PR includes _only_ tests. | ||
| - [ ] Database schema has changed | ||
| - [ ] A new migration is included in the PR | ||
| - [ ] The change does not require a migration | ||
| - [ ] Code change | ||
| - [ ] Self-review of code done | ||
| - [ ] Comments added, particularly in hard-to-understand areas | ||
| - Documentation update | ||
| - [ ] Done | ||
| - [ ] Not needed | ||
|
|
||
| ## Repository / Releases | ||
|
|
||
| - [ ] Blocking PRs have been merged | ||
| - [ ] Rebase / update of branch done | ||
| - [ ] PR to `master` branch (Product Owner / Scrum Master) | ||
| - [ ] The [version](../dds_web/version.py) is updated | ||
| - [ ] I am bumping the major version (e.g. 1.x.x to 2.x.x) | ||
| - [ ] I have made the corresponding changes to the CLI version | ||
| - Backward compatible | ||
| - [ ] Yes: The code works together with `dds_cli/master` branch | ||
| - [ ] No: The code **does not** entirely / at all work together with the `dds_cli/master` branch. _Please add detailed and clear information about the broken features_ | ||
|
|
||
| ## Checks | ||
|
|
||
| - [ ] CodeQL passes | ||
| - [ ] Formatting: Black & Prettier checks pass | ||
| - Tests | ||
| - [ ] I have added tests for the new code | ||
| - [ ] The tests pass | ||
| - Trivy / Snyk: | ||
| - [ ] There are no new security alerts | ||
| - [ ] This PR fixes new security alerts | ||
| - [ ] Security alerts have been dismissed | ||
| - [ ] PR will be merged with new security alerts; This is why: _Please add a short description here_ | ||
| ## **5. Checklist** | ||
|
|
||
| <!-- Comment out the items which do not apply here.--> | ||
|
|
||
| ### **Always** | ||
|
|
||
| <!-- Always go through the following items. --> | ||
|
|
||
| - [Changelog](../CHANGELOG.md) | ||
| - [ ] Added | ||
| - [ ] Not needed (E.g. PR contains _only_ tests) | ||
| - Rebase / Update / Merge _from_ base branch (the branch from which the current is forked) | ||
| - [ ] Done | ||
| - [ ] Not needed | ||
| - Blocking PRs | ||
| - [ ] Merged | ||
| - [ ] No blocking PRs | ||
| - PR to `master` branch | ||
| - [ ] Yes: Go to the section [PR to master](#pr-to-master) | ||
| - [ ] No | ||
|
|
||
| ### If PR consists of **code change(s)** | ||
|
|
||
| <!-- If the PR contains code changes, the following need to be checked.--> | ||
|
|
||
| - Self review | ||
| - [ ] Done | ||
| - Comments, docstrings, etc | ||
| - [ ] Added / Updated | ||
| - Documentation | ||
| - [ ] Updated | ||
| - [ ] Update not needed | ||
|
|
||
| ### If PR is to **master** | ||
|
|
||
| <!-- Is your PR to the master branch? The following items need to be checked off. --> | ||
|
|
||
| - [ ] I have followed steps 1-5 in [the release instructions](../doc/procedures/new_release.md) | ||
| - [ ] I am bumping the major version (e.g. 1.x.x to 2.x.x) | ||
| - [ ] I have made the corresponding changes to the CLI version | ||
|
|
||
| **Is this version _backward compatible?_** | ||
|
|
||
| - [ ] Yes: The code works together with `dds_cli/master` branch | ||
| - [ ] No: The code **does not** entirely / at all work together with the `dds_cli/master` branch. _Please add detailed and clear information about the broken features_ | ||
|
|
||
| ## **6. Actions / Scans** | ||
|
|
||
| <!-- Go through all checkboxes. All actions must pass before merging is allowed.--> | ||
|
|
||
| - **Black**: Python code formatter. Does not execute. Only tests. | ||
| Run `black .` locally to execute formatting. | ||
| - [ ] Passed | ||
| - **Prettier**: General code formatter. Our use case: MD and yaml mainly. | ||
| Run `npx prettier --write .` locally to execute formatting. | ||
| - [ ] Passed | ||
| - **Tests**: Pytest to verify that functionality works as expected. | ||
| - [ ] New tests added | ||
| - [ ] No new tests | ||
| - [ ] Passed | ||
| - **CodeQL**: Scan for security vulnerabilities, bugs, errors | ||
| - [ ] New alerts: _Go through them and either fix, dismiss och ignore. Add reasoning in items below._ | ||
| - [ ] Alerts fixed: _What?_ | ||
| - [ ] Alerts ignored / dismissed: _Why?_ | ||
| - [ ] Passed | ||
| - **Trivy**: Security scanner | ||
| - [ ] New alerts: _Go through them and either fix, dismiss och ignore. Add reasoning in items below._ | ||
| - [ ] Alerts fixed: _What?_ | ||
| - [ ] Alerts ignored / dismissed: _Why?_ | ||
| - [ ] Passed | ||
| - **Snyk**: Security scanner | ||
| - [ ] New alerts: _Go through them and either fix, dismiss och ignore. Add reasoning in items below._ | ||
| - [ ] Alerts fixed: _What?_ | ||
| - [ ] Alerts ignored / dismissed: _Why?_ | ||
| - [ ] Passed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # Snyk IaC: | ||
| # A sample workflow which checks out your Infrastructure as Code Configuration files, | ||
| # such as Kubernetes, Helm & Terraform and scans them for any security issues. | ||
| # The results are then uploaded to GitHub Security Code Scanning | ||
| # | ||
| # For more examples, including how to limit scans to only high-severity issues | ||
| # and fail PR checks, see https://github.com/snyk/actions/ | ||
| # ----------------------------------------------------------- | ||
| # This workflow uses actions that are not certified by GitHub. | ||
| # They are provided by a third-party and are governed by | ||
| # separate terms of service, privacy policy, and support | ||
| # documentation. | ||
| # ------------------------------------------------------------ | ||
| name: Snyk IaC | ||
|
|
||
| on: | ||
| push: | ||
| branches: ["dev", master] | ||
| pull_request: | ||
| # The branches below must be a subset of the branches above | ||
| branches: ["dev"] | ||
| schedule: | ||
| - cron: "0 7,13 * * *" | ||
|
|
||
| jobs: | ||
| snyk: | ||
| permissions: | ||
| contents: read | ||
| security-events: write | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@master | ||
| - name: Run Snyk to check for vulnerabilities | ||
| uses: snyk/actions/python@master | ||
| continue-on-error: true # To make sure that SARIF upload gets called | ||
| env: | ||
| SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} | ||
| with: | ||
| command: code test | ||
| args: --sarif-file-output=snyk.sarif | ||
| - name: Upload result to GitHub Code Scanning | ||
| uses: github/codeql-action/upload-sarif@v2 | ||
| with: | ||
| sarif_file: snyk.sarif | ||
| category: snyk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM node:16 | ||
| FROM node:18 | ||
| RUN mkdir /build | ||
| WORKDIR /build | ||
| RUN npm install -g npm@latest --quiet | ||
|
|
||
Oops, something went wrong.