Skip to content
Merged
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
9 changes: 8 additions & 1 deletion pkg/scorecard/scorecard.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,14 @@ func runScorecard(ctx context.Context,

func findConfigFile(rc clients.RepoClient) (io.ReadCloser, string) {
// Look for a config file. Return first one regardless of validity
locs := []string{"scorecard.yml", ".scorecard.yml", ".github/scorecard.yml"}
locs := []string{
"scorecard.yml",
"scorecard.yaml",
".scorecard.yml",
".scorecard.yaml",
".github/scorecard.yml",
".github/scorecard.yaml",
}

for i := range locs {
cfr, err := rc.GetFileReader(locs[i])
Expand Down
32 changes: 22 additions & 10 deletions pkg/scorecard/scorecard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ import (
"context"
"fmt"
"io"
"os"
"path/filepath"
"slices"
"strings"
"testing"

"github.com/golang/mock/gomock"
Expand Down Expand Up @@ -365,26 +364,44 @@ func Test_findConfigFile(t *testing.T) {
found: "scorecard.yml",
wantFound: true,
},
{
desc: "scorecard.yaml exists",
locs: []string{"scorecard.yaml"},
found: "scorecard.yaml",
wantFound: true,
},
{
desc: ".scorecard.yml exists",
locs: []string{".scorecard.yml"},
found: ".scorecard.yml",
wantFound: true,
},
{
desc: ".scorecard.yaml exists",
locs: []string{".scorecard.yaml"},
found: ".scorecard.yaml",
wantFound: true,
},
{
desc: ".github/scorecard.yml exists",
locs: []string{".github/scorecard.yml"},
found: ".github/scorecard.yml",
wantFound: true,
},
{
desc: ".github/scorecard.yaml exists",
locs: []string{".github/scorecard.yaml"},
found: ".github/scorecard.yaml",
wantFound: true,
},
{
desc: "multiple configs exist",
locs: []string{"scorecard.yml", ".github/scorecard.yml"},
locs: []string{"scorecard.yml", ".github/scorecard.yaml"},
found: "scorecard.yml",
wantFound: true,
},
{
desc: "no config exists so shouldn't find one",
desc: "no config exists",
locs: []string{},
wantFound: false,
},
Expand All @@ -400,12 +417,7 @@ func Test_findConfigFile(t *testing.T) {
if !slices.Contains(tt.locs, filename) {
return nil, fmt.Errorf("os.Open: %s", filename)
}
fullPath := filepath.Join("./testdata", filename)
f, err := os.Open(fullPath)
if err != nil {
return nil, fmt.Errorf("os.Open: %w", err)
}
return f, nil
return io.NopCloser(strings.NewReader("test config")), nil
})
r, path := findConfigFile(mockRepoClient)

Expand Down
5 changes: 0 additions & 5 deletions pkg/scorecard/testdata/.github/scorecard.yml

This file was deleted.

5 changes: 0 additions & 5 deletions pkg/scorecard/testdata/.scorecard.yml

This file was deleted.

5 changes: 0 additions & 5 deletions pkg/scorecard/testdata/scorecard.yml

This file was deleted.

Loading