diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 1fa00b6de..fd01365c4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -153,7 +153,7 @@ body: ``` - type: textarea attributes: - label: Additioinal Notes + label: Additional Notes description: | Add any other context about the problem diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9a1ee191b..3ac68832c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,10 +4,20 @@ on: workflow_dispatch: pull_request: paths-ignore: - .github/** + - .github/** + - assets/** + - docs/** + - .whitesource + - .yamlfmt + - .yamllint push: - paths-ignore: - .github/** + paths-ignore: + - .github/** + - assets/** + - docs/** + - .whitesource + - .yamlfmt + - .yamllint jobs: ansible-lint: name: ansible-lint diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml new file mode 100644 index 000000000..a1b321f1c --- /dev/null +++ b/.github/workflows/trivy.yml @@ -0,0 +1,28 @@ +--- +name: build +on: + push: + branches: + - main + pull_request: +jobs: + build: + name: Trivy vulnerability scan + runs-on: ubuntu-20.04 + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Run Trivy vulnerability scanner in repo mode + uses: aquasecurity/trivy-action@0.18.0 + with: + scan-type: "fs" + ignore-unfixed: true + format: "sarif" + output: "trivy-results.sarif" + severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" + + - name: Upload Trivy scan results to GitHub Security tab + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: "trivy-results.sarif" diff --git a/.whitesource b/.whitesource new file mode 100644 index 000000000..bb071b4a2 --- /dev/null +++ b/.whitesource @@ -0,0 +1,45 @@ +{ + "scanSettings": { + "configMode": "AUTO", + "configExternalURL": "", + "projectToken": "", + "baseBranches": [] + }, + "scanSettingsSAST": { + "enableScan": false, + "scanPullRequests": false, + "incrementalScan": true, + "baseBranches": [], + "snippetSize": 10 + }, + "checkRunSettings": { + "vulnerableCheckRunConclusionLevel": "failure", + "displayMode": "diff", + "useMendCheckNames": true + }, + "checkRunSettingsSAST": { + "checkRunConclusionLevel": "failure", + "severityThreshold": "high" + }, + "issueSettings": { + "minSeverityLevel": "LOW", + "issueType": "DEPENDENCY" + }, + "issueSettingsSAST": { + "minSeverityLevel": "high", + "issueType": "repo" + }, + "remediateSettings": { + "workflowRules": { + "enabled": true + } + }, + "imageSettings":{ + "imageTracing":{ + "enableImageTracingPR": false, + "addRepositoryCoordinate": false, + "addDockerfilePath": false, + "addMendIdentifier": false + } + } +} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 2037686d6..1cc7dbaa3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,10 @@ antsibull +aiohttp==3.9.2 ansible-pygments sphinx-notfound-page sphinx_rtd_theme antsibull-docs sphinx sphinx-ansible-theme -galaxy-importer \ No newline at end of file +galaxy-importer==0.5.0 +ansible-core==2.15.9