Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update tests #334

Merged
merged 4 commits into from
May 7, 2024
Merged

update tests #334

merged 4 commits into from
May 7, 2024

Conversation

nikpivkin
Copy link
Contributor

@nikpivkin nikpivkin commented Apr 12, 2024

Tests now uses a fixed version of db, java-db and a bundle of checks for data consistency.

@nikpivkin nikpivkin marked this pull request as ready for review May 2, 2024 06:39
@simar7
Copy link
Member

simar7 commented May 4, 2024

@nikpivkin looks like tests are red. Did you forget to push some changes?

@nikpivkin
Copy link
Contributor Author

@simar7 Tests are red, because there are not yet copies of the images of the dbs and the checks bundle created

username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Copy Trivy Checks
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- name: Copy Trivy Checks
- name: Copy Trivy DB

username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Copy Trivy Checks
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- name: Copy Trivy Checks
- name: Copy Trivy Java DB

Comment on lines +16 to +35
function remove_json_fields() {
local file="$1"
if [[ "$file" == *.json ]]; then
jq 'del(.CreatedAt)' "$file" > tmp && mv tmp "$file"
fi
}

function remove_sarif_fields() {
local file="$1"
if [[ "$file" == *.sarif ]]; then
jq 'del(.runs[].tool.driver.version) | del(.runs[].originalUriBaseIds)' "$file" > tmp && mv tmp "$file"
fi
}

function remove_github_fields() {
local file="$1"
if [[ "$file" == *.gsbom ]]; then
jq 'del(.detector.version) | del(.scanned) | del(.job) | del(.ref) | del(.sha)' "$file" > tmp && mv tmp "$file"
fi
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice this is a clever idea.

@simar7 simar7 merged commit 6f8c237 into aquasecurity:master May 7, 2024
1 of 2 checks passed
@nikpivkin nikpivkin deleted the tests-upd branch May 7, 2024 05:21
juanjjaramillo referenced this pull request in newrelic/helm-charts Jul 9, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action)
| action | minor | `0.19.0` -> `0.24.0` |

---

### Release Notes

<details>
<summary>aquasecurity/trivy-action (aquasecurity/trivy-action)</summary>

###
[`v0.24.0`](https://github.com/aquasecurity/trivy-action/releases/tag/0.24.0)

[Compare
Source](https://github.com/aquasecurity/trivy-action/compare/0.23.0...0.24.0)

#### What's Changed

- Upgrade trivy to v0.53.0 by
[@&#8203;Dr-DevOps](https://github.com/Dr-DevOps) in
[https://github.com/aquasecurity/trivy-action/pull/369](https://github.com/aquasecurity/trivy-action/pull/369)

**Full Changelog**:
aquasecurity/trivy-action@0.23.0...0.24.0

###
[`v0.23.0`](https://github.com/aquasecurity/trivy-action/releases/tag/0.23.0)

[Compare
Source](https://github.com/aquasecurity/trivy-action/compare/0.22.0...0.23.0)

#### What's Changed

- Upgrade trivy to v0.52.2 by
[@&#8203;Dr-DevOps](https://github.com/Dr-DevOps) in
[https://github.com/aquasecurity/trivy-action/pull/367](https://github.com/aquasecurity/trivy-action/pull/367)

**Full Changelog**:
aquasecurity/trivy-action@0.22.0...0.23.0

###
[`v0.22.0`](https://github.com/aquasecurity/trivy-action/releases/tag/0.22.0)

[Compare
Source](https://github.com/aquasecurity/trivy-action/compare/0.21.0...0.22.0)

#### What's Changed

- chore(docs): Reference the use of a pinned version by
[@&#8203;simar7](https://github.com/simar7) in
[https://github.com/aquasecurity/trivy-action/pull/356](https://github.com/aquasecurity/trivy-action/pull/356)
- Upgrade trivy to v0.52.0 by
[@&#8203;Keralin](https://github.com/Keralin) in
[https://github.com/aquasecurity/trivy-action/pull/364](https://github.com/aquasecurity/trivy-action/pull/364)

#### New Contributors

- [@&#8203;Keralin](https://github.com/Keralin) made their first
contribution in
[https://github.com/aquasecurity/trivy-action/pull/364](https://github.com/aquasecurity/trivy-action/pull/364)

**Full Changelog**:
aquasecurity/trivy-action@0.21.0...0.22.0

###
[`v0.21.0`](https://github.com/aquasecurity/trivy-action/releases/tag/0.21.0)

[Compare
Source](https://github.com/aquasecurity/trivy-action/compare/0.20.0...0.21.0)

#### What's Changed

- bump trivy version to v0.51.2 by
[@&#8203;Dr-DevOps](https://github.com/Dr-DevOps) in
[https://github.com/aquasecurity/trivy-action/pull/360](https://github.com/aquasecurity/trivy-action/pull/360)

#### New Contributors

- [@&#8203;Dr-DevOps](https://github.com/Dr-DevOps) made their first
contribution in
[https://github.com/aquasecurity/trivy-action/pull/360](https://github.com/aquasecurity/trivy-action/pull/360)

**Full Changelog**:
aquasecurity/trivy-action@0.20.0...0.21.0

###
[`v0.20.0`](https://github.com/aquasecurity/trivy-action/releases/tag/0.20.0)

[Compare
Source](https://github.com/aquasecurity/trivy-action/compare/0.19.0...0.20.0)

##### What's Changed

- Make 'hide-progress' input working again by
[@&#8203;uridium](https://github.com/uridium) in
[https://github.com/aquasecurity/trivy-action/pull/323](https://github.com/aquasecurity/trivy-action/pull/323)
- feat(image): add `--docker-host` option for GH Action users by
[@&#8203;calinmarina](https://github.com/calinmarina) in
[https://github.com/aquasecurity/trivy-action/pull/267](https://github.com/aquasecurity/trivy-action/pull/267)
- Browse Trivy reports without GitHub Advanced Security license by
[@&#8203;uridium](https://github.com/uridium) in
[https://github.com/aquasecurity/trivy-action/pull/328](https://github.com/aquasecurity/trivy-action/pull/328)
- Fix docker host bug by
[@&#8203;admiralAwkbar](https://github.com/admiralAwkbar) in
[https://github.com/aquasecurity/trivy-action/pull/329](https://github.com/aquasecurity/trivy-action/pull/329)
- Bump trivy version to v0.50.2 by
[@&#8203;pdefreitas](https://github.com/pdefreitas) in
[https://github.com/aquasecurity/trivy-action/pull/341](https://github.com/aquasecurity/trivy-action/pull/341)
- update tests by [@&#8203;nikpivkin](https://github.com/nikpivkin) in
[https://github.com/aquasecurity/trivy-action/pull/334](https://github.com/aquasecurity/trivy-action/pull/334)
- bump trivy version to v0.51.1 by
[@&#8203;simar7](https://github.com/simar7) in
[https://github.com/aquasecurity/trivy-action/pull/353](https://github.com/aquasecurity/trivy-action/pull/353)

##### New Contributors

- [@&#8203;uridium](https://github.com/uridium) made their first
contribution in
[https://github.com/aquasecurity/trivy-action/pull/323](https://github.com/aquasecurity/trivy-action/pull/323)
- [@&#8203;calinmarina](https://github.com/calinmarina) made their
first contribution in
[https://github.com/aquasecurity/trivy-action/pull/267](https://github.com/aquasecurity/trivy-action/pull/267)
- [@&#8203;admiralAwkbar](https://github.com/admiralAwkbar) made their
first contribution in
[https://github.com/aquasecurity/trivy-action/pull/329](https://github.com/aquasecurity/trivy-action/pull/329)
- [@&#8203;pdefreitas](https://github.com/pdefreitas) made their first
contribution in
[https://github.com/aquasecurity/trivy-action/pull/341](https://github.com/aquasecurity/trivy-action/pull/341)

**Full Changelog**:
aquasecurity/trivy-action@0.19.0...0.20.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/newrelic/helm-charts).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNDAuMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy40MjUuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants