forked from guacsec/guac
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump github.com/google/osv-scanner from 1.4.1 to 1.4.2 (guacsec#1444)
* Bump github.com/google/osv-scanner from 1.4.1 to 1.4.2 Bumps [github.com/google/osv-scanner](https://github.com/google/osv-scanner) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/google/osv-scanner/releases) - [Changelog](https://github.com/google/osv-scanner/blob/main/CHANGELOG.md) - [Commits](google/osv-scanner@v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: github.com/google/osv-scanner dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * update test results based on update to packageurl-go library Signed-off-by: pxp928 <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: pxp928 <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: pxp928 <[email protected]>
- Loading branch information
1 parent
0689514
commit 00d978b
Showing
7 changed files
with
63 additions
and
84 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
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 |
|---|---|---|
|
|
@@ -910,13 +910,7 @@ func TestPkgInputSpecToPurl(t *testing.T) { | |
| }), | ||
| }, { | ||
| // The following are for docker PURLs | ||
| // TODO (Issue #635): docker PURLs are really weird and potentially not well specified | ||
| // due to the namespace indicating it may contain registry but the use of | ||
| // repository_url in the examples. In addition, the versions use in the examples | ||
| // use tags and potentially indicate truncated hashes. | ||
|
|
||
| //expectedPurlUri: "pkg:docker/customer/dockerimage@sha256%3A244fd47e07d10?repository_url=gcr.io", | ||
| expectedPurlUri: "pkg:docker/dockerimage@sha256:244fd47e07d10?repository_url=gcr.io%2Fcustomer", | ||
| expectedPurlUri: "pkg:docker/dockerimage@sha256%3A244fd47e07d10?repository_url=gcr.io%2Fcustomer", | ||
| input: pkg("docker", "gcr.io/customer", "dockerimage", "sha256:244fd47e07d10", "", map[string]string{}), | ||
| }, { | ||
| expectedPurlUri: "pkg:docker/debian@dc437cc87d10?repository_url=smartentry", | ||
|
|
@@ -929,13 +923,13 @@ func TestPkgInputSpecToPurl(t *testing.T) { | |
| input: pkg("gem", "", "ruby-advisory-db-check", "0.12.4", "", map[string]string{}), | ||
| }, { | ||
| // TODO (Issue #635): url path escapes here? Will this be an issue when searching via purl in osv or deps.dev? | ||
| expectedPurlUri: "pkg:generic/[email protected]?checksum=sha256:de4d501267da&download_url=https:%2F%2Fopenssl.org%2Fsource%2Fopenssl-1.1.0g.tar.gz", | ||
| expectedPurlUri: "pkg:generic/[email protected]?checksum=sha256%3Ade4d501267da&download_url=https%3A%2F%2Fopenssl.org%2Fsource%2Fopenssl-1.1.0g.tar.gz", | ||
| input: pkg("generic", "", "openssl", "1.1.10g", "", map[string]string{ | ||
| "download_url": "https://openssl.org/source/openssl-1.1.0g.tar.gz", | ||
| "checksum": "sha256:de4d501267da", | ||
| }), | ||
| }, { | ||
| expectedPurlUri: "pkg:generic/bitwarderl?vcs_url=git+https:%2F%2Fgit.fsfe.org%2Fdxtr%2Fbitwarderl@cc55108da32", | ||
| expectedPurlUri: "pkg:generic/bitwarderl?vcs_url=git%2Bhttps%3A%2F%2Fgit.fsfe.org%2Fdxtr%2Fbitwarderl%40cc55108da32", | ||
| input: pkg("generic", "", "bitwarderl", "", "", map[string]string{ | ||
| "vcs_url": "git+https://git.fsfe.org/dxtr/bitwarderl@cc55108da32", | ||
| }), | ||
|
|
@@ -949,7 +943,7 @@ func TestPkgInputSpecToPurl(t *testing.T) { | |
| expectedPurlUri: "pkg:hackage/[email protected]", | ||
| input: pkg("hackage", "", "3d-graphics-examples", "0.0.0.2", "", map[string]string{}), | ||
| }, { | ||
| expectedPurlUri: "pkg:hex/[email protected]?repository_url=https:%2F%2Fmyrepo.example.com", | ||
| expectedPurlUri: "pkg:hex/[email protected]?repository_url=https%3A%2F%2Fmyrepo.example.com", | ||
| input: pkg("hex", "", "bar", "1.2.3", "", map[string]string{ | ||
| "repository_url": "https://myrepo.example.com", | ||
| }), | ||
|
|
@@ -966,7 +960,7 @@ func TestPkgInputSpecToPurl(t *testing.T) { | |
| "classifier": "dist", | ||
| }), | ||
| }, { | ||
| expectedPurlUri: "pkg:mlflow/trafficsigns@10?model_uuid=36233173b22f4c89b451f1228d700d49&repository_url=https:%2F%2Fadb-5245952564735461.0.azuredatabricks.net%2Fapi%2F2.0%2Fmlflow&run_id=410a3121-2709-4f88-98dd-dba0ef056b0a", | ||
| expectedPurlUri: "pkg:mlflow/trafficsigns@10?model_uuid=36233173b22f4c89b451f1228d700d49&repository_url=https%3A%2F%2Fadb-5245952564735461.0.azuredatabricks.net%2Fapi%2F2.0%2Fmlflow&run_id=410a3121-2709-4f88-98dd-dba0ef056b0a", | ||
| input: pkg("mlflow", "", "trafficsigns", "10", "", map[string]string{ | ||
| "model_uuid": "36233173b22f4c89b451f1228d700d49", | ||
| "run_id": "410a3121-2709-4f88-98dd-dba0ef056b0a", | ||
|
|
@@ -986,21 +980,18 @@ func TestPkgInputSpecToPurl(t *testing.T) { | |
| input: pkg("qpkg", "blackberry", "com.qnx.sdp", "7.0.0.SGA201702151847", "", map[string]string{}), | ||
| }, { | ||
| // Special OCI case | ||
| //TODO (Issue #635): similar issue to above. | ||
|
|
||
| //expectedPurlUri: "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=docker.io/library/debian&arch=amd64&tag=latest", | ||
| expectedPurlUri: "pkg:oci/debian@sha256:244fd47e07d10?arch=amd64&tag=latest&repository_url=docker.io%2Flibrary", | ||
| expectedPurlUri: "pkg:oci/debian@sha256%3A244fd47e07d10?arch=amd64&repository_url=docker.io%2Flibrary&tag=latest", | ||
| input: pkg("oci", "docker.io/library", "debian", "sha256:244fd47e07d10", "", map[string]string{ | ||
| "arch": "amd64", | ||
| "tag": "latest", | ||
| }), | ||
| }, { | ||
| expectedPurlUri: "pkg:oci/debian@sha256:244fd47e07d10?tag=bullseye&repository_url=ghcr.io", | ||
| expectedPurlUri: "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=ghcr.io&tag=bullseye", | ||
| input: pkg("oci", "ghcr.io", "debian", "sha256:244fd47e07d10", "", map[string]string{ | ||
| "tag": "bullseye", | ||
| }), | ||
| }, { | ||
| expectedPurlUri: "pkg:oci/hello-wasm@sha256:244fd47e07d10?tag=v1", | ||
| expectedPurlUri: "pkg:oci/hello-wasm@sha256%3A244fd47e07d10?tag=v1", | ||
| input: pkg("oci", "", "hello-wasm", "sha256:244fd47e07d10", "", map[string]string{ | ||
| "tag": "v1", | ||
| }), | ||
|
|
||
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
Oops, something went wrong.