Use Anchore fork of packageurl lib without replace directive (#512)

Signed-off-by: Dan Luhring <dan.luhring@anchore.com>
This commit is contained in:
Dan Luhring
2021-09-22 15:04:09 -04:00
committed by GitHub
parent 3e8afc5274
commit 316d4341c8
11 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"github.com/anchore/syft/syft/file"
"github.com/package-url/packageurl-go"
"github.com/anchore/packageurl-go"
"github.com/scylladb/go-set/strset"
)
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"strings"
"testing"
"github.com/anchore/packageurl-go"
"github.com/go-test/deep"
"github.com/package-url/packageurl-go"
"github.com/sergi/go-diff/diffmatchpatch"
)
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"regexp"
"strings"
"github.com/anchore/packageurl-go"
"github.com/anchore/syft/syft/distro"
"github.com/anchore/syft/syft/pkg"
"github.com/package-url/packageurl-go"
)
// generatePackageURL returns a package-URL representation of the given package (see https://github.com/package-url/purl-spec)
+2 -1
View File
@@ -5,8 +5,8 @@ import (
"github.com/anchore/syft/syft/file"
"github.com/anchore/packageurl-go"
"github.com/anchore/syft/syft/distro"
"github.com/package-url/packageurl-go"
"github.com/scylladb/go-set/strset"
)
@@ -41,6 +41,7 @@ func (m DpkgMetadata) PackageURL(d *distro.Distro) string {
}
pURL := packageurl.NewPackageURL(
// TODO: replace with `packageurl.TypeDebian` upon merge of https://github.com/package-url/packageurl-go/pull/21
// TODO: or, since we're now using an Anchore fork of this module, we could do this sooner.
"deb",
d.Type.String(),
m.Package,
+1 -1
View File
@@ -3,8 +3,8 @@ package pkg
import (
"strings"
"github.com/anchore/packageurl-go"
"github.com/anchore/syft/internal"
"github.com/package-url/packageurl-go"
)
var JenkinsPluginPomPropertiesGroupIDs = []string{
+1 -1
View File
@@ -9,8 +9,8 @@ import (
"github.com/scylladb/go-set/strset"
"github.com/anchore/packageurl-go"
"github.com/anchore/syft/syft/distro"
"github.com/package-url/packageurl-go"
)
const RpmDbGlob = "**/var/lib/rpm/Packages"
+1 -1
View File
@@ -1,6 +1,6 @@
package pkg
import "github.com/package-url/packageurl-go"
import "github.com/anchore/packageurl-go"
// Type represents a Package Type for or within a language ecosystem (there may be multiple package types within a language ecosystem)
type Type string