Skip to content

Commit

Permalink
Removed git_protect GH action (#8953)
Browse files Browse the repository at this point in the history
* Update versions in application files

* Removed git_protect GH action

* Add empty Dryrun Security file

* Bump boto3 from 1.28.77 to 1.28.79 (#8951)

Bumps [boto3](https://github.com/boto/boto3) from 1.28.77 to 1.28.79.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.28.77...1.28.79)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update actions/setup-python action from v2 to v4 (.github/workflows/check-protected-files.yml) (#8946)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update actions/checkout action from v2 to v4 (.github/workflows/check-protected-files.yml) (#8945)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Try to fix odd merge conflict

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: DefectDojo release bot <[email protected]>
Co-authored-by: Cody Maffucci <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
5 people authored Nov 8, 2023
1 parent f3d3485 commit 9b450d4
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 207 deletions.
Empty file added .dryrunsecurity.yaml
Empty file.
103 changes: 0 additions & 103 deletions .github/scripts/git_protect.py

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/check-protected-files.yml
Original file line number Diff line number Diff line change
@@ -1,45 +0,0 @@
name: Check For Modifications to Protected Files

on:
pull_request_target:

jobs:
check-if-protected-files-are-modified:
permissions: write-all
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Check for file changes using git-protect
run: |
python .github/scripts/git_protect.py ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} --comment-only &> output.txt
- name: Post a comment back to the PR if protected files have changed
if: ${{ always() }}
uses: actions/github-script@v6
with:
script: |
const fs = require('fs');
fs.readFile('output.txt', 'utf8', (err, data) => {
if (err) {
console.error('Error reading the file:', err);
return;
}
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: data
})
});
54 changes: 0 additions & 54 deletions .gitprotect

This file was deleted.

2 changes: 1 addition & 1 deletion components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "defectdojo",
"version": "2.28.0",
"version": "2.29.0-dev",
"license" : "BSD-3-Clause",
"private": true,
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion dojo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# Django starts so that shared_task will use this app.
from .celery import app as celery_app # noqa

__version__ = '2.28.0'
__version__ = '2.29.0-dev'
__url__ = 'https://github.com/DefectDojo/django-DefectDojo'
__docs__ = 'https://documentation.defectdojo.com'
4 changes: 2 additions & 2 deletions helm/defectdojo/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: "2.28.0"
appVersion: "2.29.0-dev"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
version: 1.6.94
version: 1.6.95-dev
icon: https://www.defectdojo.org/img/favicon.ico
maintainers:
- name: madchap
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ django-ratelimit==4.1.0
argon2-cffi==23.1.0
blackduck==1.1.0
pycurl==7.45.2 # Required for Celery Broker AWS (SQS) support
boto3==1.28.77 # Required for Celery Broker AWS (SQS) support
boto3==1.28.79 # Required for Celery Broker AWS (SQS) support
netaddr==0.8.0
vulners==2.1.1
fontawesomefree==6.4.2

0 comments on commit 9b450d4

Please sign in to comment.