Merge branch 'main' into check_suite

ossf · Mar 2, 2023 · b07f6b9 · b07f6b9
2 parents 5c99f59 + 82a122b
commit b07f6b9
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/publishimage.yml b/.github/workflows/publishimage.yml
@@ -61,7 +61,7 @@ jobs:
             make install
             make scorecard-ko
      - name: Install Cosign
-       uses: sigstore/cosign-installer@9becc617647dfa20ae7b1151972e9b3a2c338a2b
+       uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65
      - name: Sign image
        run: |
           cosign sign ghcr.io/${{github.repository_owner}}/scorecard/v4:${{ github.sha }}
diff --git a/pkg/json.go b/pkg/json.go
@@ -18,6 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"time"
 
 	"github.com/ossf/scorecard/v4/checker"
 	docs "github.com/ossf/scorecard/v4/docs/checks"
@@ -163,7 +164,7 @@ func (r *ScorecardResult) AsJSON2(showDetails bool,
 			Version: r.Scorecard.Version,
 			Commit:  r.Scorecard.CommitSHA,
 		},
-		Date:           r.Date.Format("2006-01-02"),
+		Date:           r.Date.Format(time.RFC3339),
 		Metadata:       r.Metadata,
 		AggregateScore: jsonFloatScore(score),
 	}

diff --git a/pkg/json_test.go b/pkg/json_test.go
@@ -73,7 +73,8 @@ func TestJSONOutput(t *testing.T) {
 	scorecardCommit := "ccbc59901773ab4c051dfcea0cc4201a1567abdd"
 	scorecardVersion := "1.2.3"
 	repoName := "org/name"
-	date, e := time.Parse("2006-01-02", "2021-08-25")
+	date, e := time.Parse(time.RFC3339, "2023-03-02T10:30:43-06:00")
+	t.Logf("date: %v", date)
 	if e != nil {
 		panic(fmt.Errorf("time.Parse: %w", e))
 	}

diff --git a/pkg/testdata/check1.json b/pkg/testdata/check1.json
@@ -1,5 +1,5 @@
 {
-   "date": "2021-08-25",
+   "date": "2023-03-02T10:30:43-06:00",
    "repo": {
       "name": "org/name",
       "commit": "68bc59901773ab4c051dfcea0cc4201a1567ab32"

diff --git a/pkg/testdata/check2.json b/pkg/testdata/check2.json
@@ -1,5 +1,5 @@
 {
-   "date": "2021-08-25",
+   "date": "2023-03-02T10:30:43-06:00",
    "repo": {
       "name": "org/name",
       "commit": "68bc59901773ab4c051dfcea0cc4201a1567ab32"

diff --git a/pkg/testdata/check3.json b/pkg/testdata/check3.json
@@ -1,5 +1,5 @@
 {
-   "date": "2021-08-25",
+   "date": "2023-03-02T10:30:43-06:00",
    "repo": {
       "name": "org/name",
       "commit": "68bc59901773ab4c051dfcea0cc4201a1567ab32"

diff --git a/pkg/testdata/check4.json b/pkg/testdata/check4.json
@@ -1,5 +1,5 @@
 {
-   "date": "2021-08-25",
+   "date": "2023-03-02T10:30:43-06:00",
    "repo": {
       "name": "org/name",
       "commit": "68bc59901773ab4c051dfcea0cc4201a1567ab32"

diff --git a/pkg/testdata/check5.json b/pkg/testdata/check5.json
@@ -1,5 +1,5 @@
 {
-   "date": "2021-08-25",
+   "date": "2023-03-02T10:30:43-06:00",
    "repo": {
       "name": "org/name",
       "commit": "68bc59901773ab4c051dfcea0cc4201a1567ab32"

diff --git a/pkg/testdata/check6.json b/pkg/testdata/check6.json
@@ -1,5 +1,5 @@
 {
-   "date": "2021-08-25",
+   "date": "2023-03-02T10:30:43-06:00",
    "repo": {
       "name": "org/name",
       "commit": "68bc59901773ab4c051dfcea0cc4201a1567ab32"