Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cron/data/blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"io"
"time"

"cloud.google.com/go/storage"
"gocloud.dev/blob"
_ "gocloud.dev/blob/fileblob" // Needed to read file:/// buckets. Intended primarily for testing, though needed here for tests outside the package.
_ "gocloud.dev/blob/gcsblob" // Needed to link in GCP drivers.
Expand Down Expand Up @@ -99,8 +98,7 @@ func BlobExists(ctx context.Context, bucketURL, key string) (bool, error) {
defer bucket.Close()

ret, err := bucket.Exists(ctx, key)
// TODO(https://github.com/ossf/scorecard/issues/4636)
if err != nil && !errors.Is(err, storage.ErrObjectNotExist) {
if err != nil {
return ret, fmt.Errorf("error during bucket.Exists: %w", err)
}
return ret, nil
Expand Down
61 changes: 61 additions & 0 deletions cron/data/blob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package data

import (
"errors"
"path/filepath"
"reflect"
"testing"
"time"
Expand Down Expand Up @@ -169,3 +170,63 @@ func TestBlobKeysPrefix(t *testing.T) {
})
}
}

func TestBlobExists(t *testing.T) {
t.Parallel()
testcases := []struct {
name string
bucketURL string
key string
want bool
wantErr bool
}{
{
name: "exists",
bucketURL: func() string {
// convert local to absolute path, which is needed for the fileblob bucket
testdataPath, err := filepath.Abs("testdata/blob_test")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
return "file:///" + testdataPath
}(),
key: "key1.txt",
want: true,
wantErr: false,
},
{
name: "not exists",
bucketURL: func() string {
// convert local to absolute path, which is needed for the fileblob bucket
testdataPath, err := filepath.Abs("testdata/blob_test")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
return "file:///" + testdataPath
}(),
key: "notfound.txt",
want: false,
wantErr: false,
},
{
name: "open bucket error",
bucketURL: "invalid",
want: false,
wantErr: true,
},
}

for i := range testcases {
tt := &testcases[i]
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
exists, err := BlobExists(t.Context(), tt.bucketURL, tt.key)
if (err != nil) != tt.wantErr {
t.Fatalf("BlobExists() error = %v, wantErr %v", err, tt.wantErr)
}
if exists != tt.want {
t.Errorf("expected blob to exist: got %v, want %v", exists, tt.want)
}
})
}
}