-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
chore(deps): bump github.com/aquasecurity/trivy from 0.30.4 to 0.31.3 #1526
Merged
MaineK00n
merged 1 commit into
master
from
dependabot/go_modules/master/github.com/aquasecurity/trivy-0.31.3
Sep 7, 2022
Merged
chore(deps): bump github.com/aquasecurity/trivy from 0.30.4 to 0.31.3 #1526
MaineK00n
merged 1 commit into
master
from
dependabot/go_modules/master/github.com/aquasecurity/trivy-0.31.3
Sep 7, 2022
Conversation
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
Bumps [github.com/aquasecurity/trivy](https://github.com/aquasecurity/trivy) from 0.30.4 to 0.31.3. - [Release notes](https://github.com/aquasecurity/trivy/releases) - [Changelog](https://github.com/aquasecurity/trivy/blob/main/goreleaser.yml) - [Commits](aquasecurity/trivy@v0.30.4...v0.31.3) --- updated-dependencies: - dependency-name: github.com/aquasecurity/trivy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
:100644 100644 1e6f94b 0000000 M GNUmakefile
diff --git a/GNUmakefile b/GNUmakefile
index 1e6f94b..b5059b7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -88,7 +88,7 @@ NOW=$(shell date --iso-8601=seconds)
NOW_JSON_DIR := '${BASE_DIR}/$(NOW)'
ONE_SEC_AFTER=$(shell date -d '+1 second' --iso-8601=seconds)
ONE_SEC_AFTER_JSON_DIR := '${BASE_DIR}/$(ONE_SEC_AFTER)'
-LIBS := 'bundler' 'pip' 'pipenv' 'poetry' 'composer' 'npm' 'yarn' 'pnpm' 'cargo' 'gomod' 'gosum' 'gobinary' 'jar' 'pom' 'nuget-lock' 'nuget-config' 'dotnet-deps' 'nvd_exact' 'nvd_rough' 'nvd_vendor_product' 'nvd_match_no_jvn' 'jvn_vendor_product' 'jvn_vendor_product_nover'
+LIBS := 'bundler' 'pip' 'pipenv' 'poetry' 'composer' 'npm' 'yarn' 'pnpm' 'cargo' 'gomod' 'gosum' 'gobinary' 'jar' 'pom' 'nuget-lock' 'nuget-config' 'dotnet-deps'
diff:
# git clone git@github.com:vulsio/vulsctl.git
@@ -107,14 +107,14 @@ endif
sleep 1
./vuls.old scan -config=./integration/int-config.toml --results-dir=${BASE_DIR} ${LIBS}
cp ${BASE_DIR}/current/*.json ${NOW_JSON_DIR}
- - cp integration/data/results/*.json ${NOW_JSON_DIR}
+ # - cp integration/data/results/*.json ${NOW_JSON_DIR}
./vuls.old report --format-json --refresh-cve --results-dir=${BASE_DIR} -config=./integration/int-config.toml ${NOW}
mkdir -p ${ONE_SEC_AFTER_JSON_DIR}
sleep 1
./vuls.new scan -config=./integration/int-config.toml --results-dir=${BASE_DIR} ${LIBS}
cp ${BASE_DIR}/current/*.json ${ONE_SEC_AFTER_JSON_DIR}
- - cp integration/data/results/*.json ${ONE_SEC_AFTER_JSON_DIR}
+ # - cp integration/data/results/*.json ${ONE_SEC_AFTER_JSON_DIR}
./vuls.new report --format-json --refresh-cve --results-dir=${BASE_DIR} -config=./integration/int-config.toml ${ONE_SEC_AFTER}
$(call sed-d)
$ patch -p1 < test.patch
$ make diff
...
echo "old: ''/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results'/2022-09-07T11:55:54+09:00' , new: ''/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results'/2022-09-07T11:55:55+09:00'"
old: ''/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results'/2022-09-07T11:55:54+09:00' , new: ''/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results'/2022-09-07T11:55:55+09:00'
for jsonfile in ''/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results'/2022-09-07T11:55:54+09:00'/*.json ; do echo $jsonfile; cat $jsonfile | jq ".scannedCves | length" ; done
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/bundler.json
73
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/cargo.json
20
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/composer.json
18
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/dotnet-deps.json
1
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/gobinary.json
3
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/gomod.json
13
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/gosum.json
65
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/jar.json
4
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/npm.json
35
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/nuget-config.json
7
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/nuget-lock.json
7
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/pip.json
2
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/pipenv.json
14
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/pnpm.json
1
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/poetry.json
7
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/pom.json
4
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:54+09:00/yarn.json
62
for jsonfile in ''/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results'/2022-09-07T11:55:55+09:00'/*.json ; do echo $jsonfile; cat $jsonfile | jq ".scannedCves | length" ; done
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/bundler.json
73
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/cargo.json
20
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/composer.json
18
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/dotnet-deps.json
1
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/gobinary.json
3
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/gomod.json
13
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/gosum.json
65
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/jar.json
4
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/npm.json
35
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/nuget-config.json
7
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/nuget-lock.json
7
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/pip.json
2
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/pipenv.json
14
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/pnpm.json
1
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/poetry.json
7
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/pom.json
4
/home/mainek00n/github/github.com/MaineK00n/vuls/integration/results/2022-09-07T11:55:55+09:00/yarn.json
62 |
MaineK00n
approved these changes
Sep 7, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps github.com/aquasecurity/trivy from 0.30.4 to 0.31.3.
Release notes
Sourced from github.com/aquasecurity/trivy's releases.
... (truncated)
Commits
db67f16
fix: handle empty OS family (#2768)77616be
fix: fix k8s summary report (#2777)fcccfce
fix: don't skip packages that don't contain vulns, when using --list-all-pkgs...8bc215c
chore: bump trivy-kubernetes (#2770)d8d8e62
fix(secret): Consider secrets in rpc calls (#2753)b0e89d4
fix(java): check depManagement from upper pom's (#2747)da6f1b6
fix(php): skipcomposer.lock
insidevendor
folder (#2718)2f2952c
fix: fix k8s rbac filter (#2765)8bc56bf
feat(misconf): skipping misconfigurations by AVD ID (#2743)9c1ce5a
chore(deps): Upgrade Alpine to 3.16.2 to fix zlib issue (#2741)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)