Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix dependency conflicts in go.mod #771

Merged
merged 4 commits into from Jul 20, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 1 addition & 17 deletions .github/workflows/golangci.yml
Expand Up @@ -16,25 +16,9 @@ jobs:
os: [ ubuntu-latest ]
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 #v2.4.0
# https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds
- uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d #v2.1.7
with:
# In order:
# * Module download cache
# * Build cache (Linux)
# * Build cache (Mac)
# * Build cache (Windows)
path: |
~/go/pkg/mod
~/.cache/go-build
~/Library/Caches/go-build
%LocalAppData%\go-build
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a #v2.1.5
with:
go-version: '1.17.x'
go-version: '1.18'
- uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc
with:
only-new-issues: true
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Expand Up @@ -36,7 +36,7 @@ jobs:
${{ runner.os }}-go-
- uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a #v2.1.5
with:
go-version: '1.17.x'
go-version: '1.18'
- name: Run Go tests
# cannot run tests with race because we are mutating state (setting ENV variables)
run: go test -covermode=atomic -coverprofile=unit-coverage.out ./...
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Expand Up @@ -22,8 +22,8 @@
# -e GITHUB_REPOSITORY="ossf/scorecard" \
# laurentsimon/scorecard-action:latest

#v1.17 go
FROM golang@sha256:bd9823cdad5700fb4abe983854488749421d5b4fc84154c30dae474100468b85 AS base
#v1.18 go
FROM golang@sha256:ea3d912d500b1ae0a691b2e53eb8a6345b579d42d7e6a64acca83d274b949740 AS base
WORKDIR /src
ENV CGO_ENABLED=0
COPY go.* ./
Expand Down
4 changes: 2 additions & 2 deletions github/github.go
Expand Up @@ -20,10 +20,10 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"net/url"
"os"

"github.com/ossf/scorecard/v4/clients/githubrepo/roundtripper"
sclog "github.com/ossf/scorecard/v4/log"
Expand Down Expand Up @@ -123,7 +123,7 @@ func (c *Client) ParseFromFile(filepath string) (RepoInfo, error) {
var ret RepoInfo

log.Printf("getting repo info from file: %s", filepath)
repoInfo, err := ioutil.ReadFile(filepath)
repoInfo, err := os.ReadFile(filepath)
if err != nil {
return ret, fmt.Errorf("reading GitHub event path: %w", err)
}
Expand Down
142 changes: 70 additions & 72 deletions go.mod

Large diffs are not rendered by default.

1,242 changes: 167 additions & 1,075 deletions go.sum

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions install/install.go
Expand Up @@ -19,8 +19,8 @@ package install
import (
"context"
"fmt"
"io/ioutil"
"log"
"os"

"github.com/google/go-github/v42/github"

Expand All @@ -42,8 +42,11 @@ var workflowFiles = []string{
// organization.
// TODO(install): Improve description.
// TODO(install): Accept a context instead of setting one.
//nolint:gocognit
// TODO(lint): cognitive complexity 31 of func `Run` is high (> 30) (gocognit).
//
// TODO(lint): cognitive complexity 31 of func `Run` is high (> 30) (gocognit).
//
//nolint:gocognit
func Run(o *options.Options) error {
err := o.Validate()
if err != nil {
Expand All @@ -69,7 +72,7 @@ func Run(o *options.Options) error {
}

// Get yml file into byte array.
workflowContent, err := ioutil.ReadFile(o.ConfigPath)
workflowContent, err := os.ReadFile(o.ConfigPath)
if err != nil {
return fmt.Errorf("reading scorecard workflow file: %w", err)
}
Expand Down
3 changes: 1 addition & 2 deletions signing/signing.go
Expand Up @@ -22,7 +22,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -78,7 +77,7 @@ func GetJSONScorecardResults() ([]byte, error) {
}

// Get json output data from file.
jsonPayload, err := ioutil.ReadFile(os.Getenv(options.EnvInputResultsFile))
jsonPayload, err := os.ReadFile(os.Getenv(options.EnvInputResultsFile))
if err != nil {
return nil, fmt.Errorf("reading scorecard json results from file: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions signing/signing_test.go
Expand Up @@ -17,7 +17,7 @@
package signing

import (
"io/ioutil"
"os"
"testing"
)

Expand Down Expand Up @@ -76,7 +76,7 @@ import (
func Test_ProcessSignature(t *testing.T) {
t.Parallel()

jsonPayload, err := ioutil.ReadFile("testdata/results.json")
jsonPayload, err := os.ReadFile("testdata/results.json")
repoName := "ossf-tests/scorecard-action"
repoRef := "refs/heads/main"
accessToken := ""
Expand Down