diff --git a/go.mod b/go.mod index a92fe33..30cffb9 100644 --- a/go.mod +++ b/go.mod @@ -287,7 +287,7 @@ require ( ) require ( - github.com/ckotzbauer/libk8soci v0.0.0-20221223154257-bd3f36fa6c82 + github.com/ckotzbauer/libk8soci v0.0.0-20221223155540-dbb0c68c1680 github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/go-git/go-git/v5 v5.5.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect diff --git a/go.sum b/go.sum index 471b005..e6e33dc 100644 --- a/go.sum +++ b/go.sum @@ -704,8 +704,8 @@ github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJ github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/ckotzbauer/libk8soci v0.0.0-20221223154257-bd3f36fa6c82 h1:nuBMfAHObfmu+AnVxd8LOqU42pGWCp0lXrGXAnNiLkU= -github.com/ckotzbauer/libk8soci v0.0.0-20221223154257-bd3f36fa6c82/go.mod h1:CDB4JaydrC/0HiiFA1t8uwyTy0rdXxpB+LZqZf8+i1w= +github.com/ckotzbauer/libk8soci v0.0.0-20221223155540-dbb0c68c1680 h1:SL58mGTnJbkTHZQ9XpzGJxTqRvxUMJ3YmmIyLm+mXz4= +github.com/ckotzbauer/libk8soci v0.0.0-20221223155540-dbb0c68c1680/go.mod h1:CDB4JaydrC/0HiiFA1t8uwyTy0rdXxpB+LZqZf8+i1w= github.com/ckotzbauer/libstandard v0.0.0-20221211123229-8434bdf8eece h1:iYcSspfI75B4QVf/j6dMmqx1vOk+YxbCUVML3RE7p4A= github.com/ckotzbauer/libstandard v0.0.0-20221211123229-8434bdf8eece/go.mod h1:9W+F8tlDH+PqLUQmV+NA2awzzawEoaVfNg3nqwsluQI= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= @@ -3348,8 +3348,6 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/wg-policy-prototypes v0.0.0-20220816130117-045372e558b8 h1:yJ4k3hhLkw5P1M2e2a94ri0MOmFPUChsDvRmVRCAz5E= -sigs.k8s.io/wg-policy-prototypes v0.0.0-20220816130117-045372e558b8/go.mod h1:ylESIk14ctG6ldP4RkPYFiFUbVyqK7zmGJtyqtFccjc= sigs.k8s.io/wg-policy-prototypes v0.0.0-20221218182743-ae72cd20007b h1:BML7TVBKHEe04bl0AH29uE8G8awGD8+jPGq9oMOWZLU= sigs.k8s.io/wg-policy-prototypes v0.0.0-20221218182743-ae72cd20007b/go.mod h1:ylESIk14ctG6ldP4RkPYFiFUbVyqK7zmGJtyqtFccjc= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/internal/vuln/grype/grype.go b/internal/vuln/grype/grype.go index f9a7937..343b9ea 100644 --- a/internal/vuln/grype/grype.go +++ b/internal/vuln/grype/grype.go @@ -98,7 +98,7 @@ func (s *Grype) ScanItem(item source.ScanItem) ([]Vulnerability, error) { registryOptions := &image.RegistryOptions{} if img, ok := item.(source.Image); ok { - registryOptions.Credentials = oci.ConvertSecrets(img.RegistryImage) + registryOptions.Credentials = oci.ConvertSecrets(img.RegistryImage, map[string]string{}) } packages, context, err := pkg.Provide(item.ScanInput(), pkg.ProviderConfig{ diff --git a/internal/vuln/source/git/git_source.go b/internal/vuln/source/git/git_source.go index 3339292..dd25416 100644 --- a/internal/vuln/source/git/git_source.go +++ b/internal/vuln/source/git/git_source.go @@ -22,7 +22,7 @@ type GitSource struct { } func NewGitSource(workingTree, workPath, repository, branch, token, userName, password, githubAppID, githubInstallationID, githubPrivateKey string) *GitSource { - gitAccount := git.New("", "", token, userName, password, githubAppID, githubInstallationID, githubPrivateKey, false) + gitAccount := git.New("", "", token, userName, password, githubAppID, githubInstallationID, githubPrivateKey) return &GitSource{ workingTree: workingTree, workPath: workPath,