gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-23 07:29:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
knqyf263
2019-04-08 00:16:26 +09:00
parent c7208b3efa
commit 0954e0f44b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extractor/docker_test.go
View File

@@ -7,7 +7,7 @@ import (
"testing" "testing"
) )
func TestExtract(t *testing.T) { func TestExtractFromFile(t *testing.T) {
vectors := []struct { vectors := []struct {
file string // Test input file file string // Test input file
filenames []string // Target files filenames []string // Target files
@@ -52,7 +52,7 @@ func TestExtract(t *testing.T) {
defer f.Close() defer f.Close()
d := DockerExtractor{} d := DockerExtractor{}
fm, err := d.Extract(f, v.filenames) fm, err := d.ExtractFromFile(nil, f, v.filenames)
if v.err != err { if v.err != err {
t.Errorf("err: got %v, want %v", v.err, err) t.Errorf("err: got %v, want %v", v.err, err)
} }

6
token/token.go
View File

@@ -5,10 +5,10 @@ import (
"encoding/base64" "encoding/base64"
"strings" "strings"
"github.com/prometheus/common/log"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"log"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ecr" "github.com/aws/aws-sdk-go/service/ecr"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
@@ -34,7 +34,7 @@ func GetToken(ctx context.Context, auth types.AuthConfig) types.AuthConfig {
username, password, err = GetGCRAuthorizationToken(ctx) username, password, err = GetGCRAuthorizationToken(ctx)
} }
if err != nil { if err != nil {
log.Debugf("failed to get token: %w", err) log.Printf("failed to get token: %s", err)
} }
auth.Username = username auth.Username = username
auth.Password = password auth.Password = password