Merge branch 'guacsec:main' into guacdiff

guacsec · Apr 4, 2024 · 383ff7d · 383ff7d
2 parents 9970e7b + 3d6f3c0
commit 383ff7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/internal/testing/testdata/testdata.go b/internal/testing/testdata/testdata.go
@@ -1378,7 +1378,12 @@ var (
 			"scanner": {
 				"uri": "osv.dev",
 				"version": "0.0.14",
-				"db": {}
+				"db": {},
+				"result": [
+					{
+						"vulnerability_id": "GHSA-9ph3-v2vh-3qx7"
+					}
+				]
 			},
 			"metadata": {
 				"scannedOn": "2023-02-15T11:10:08.986506-08:00"

diff --git a/pkg/handler/collector/oci/oci.go b/pkg/handler/collector/oci/oci.go
@@ -29,7 +29,7 @@ import (
 	"github.com/guacsec/guac/pkg/version"
 	"github.com/pkg/errors"
 	"github.com/regclient/regclient"
-	"github.com/regclient/regclient/types"
+	"github.com/regclient/regclient/types/descriptor"
 	"github.com/regclient/regclient/types/manifest"
 	"github.com/regclient/regclient/types/platform"
 	"github.com/regclient/regclient/types/ref"
@@ -355,7 +355,7 @@ func (o *ociCollector) fetchReferrerArtifacts(ctx context.Context, repo string,
 	for _, referrerDesc := range referrerList.Descriptors {
 		// Increment the WaitGroup counter
 		wg.Add(1)
-		go func(referrerDesc types.Descriptor) {
+		go func(referrerDesc descriptor.Descriptor) {
 			defer wg.Done() // Decrement the WaitGroup counter when done
 			if _, ok := wellKnownOCIArtifactTypes[referrerDesc.ArtifactType]; ok {
 				referrerDescDigest := referrerDesc.Digest.String()