Skip to content

Commit

Permalink
Fix failing linters (#2281)
Browse files Browse the repository at this point in the history
Signed-off-by: Azeem Shaikh <[email protected]>

Signed-off-by: Azeem Shaikh <[email protected]>
  • Loading branch information
azeemshaikh38 authored Sep 21, 2022
1 parent 7c24934 commit a6983ed
Show file tree
Hide file tree
Showing 27 changed files with 39 additions and 39 deletions.
5 changes: 0 additions & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ linters:
disable-all: true
enable:
- asciicheck
- bodyclose
- deadcode
- depguard
- dogsled
Expand Down Expand Up @@ -50,17 +49,13 @@ linters:
- misspell
- nakedret
- nestif
- noctx
- nolintlint
- paralleltest
- predeclared
- staticcheck
- stylecheck
- thelper
- tparallel
- typecheck
- unconvert
- unparam
- unused
- varcheck
- whitespace
Expand Down
2 changes: 2 additions & 0 deletions checker/check_result.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const (
)

// CheckResult captures result from a check run.
//
//nolint:govet
type CheckResult struct {
Name string
Expand Down Expand Up @@ -94,6 +95,7 @@ type CheckDetail struct {

// LogMessage is a structure that encapsulates detail's information.
// This allows updating the definition easily.
//
//nolint:govet
type LogMessage struct {
Text string // A short string explaining why the detail was recorded/logged.
Expand Down
1 change: 1 addition & 0 deletions checks/fileparser/listing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ func TestOnMatchingFileContent(t *testing.T) {
}

// TestOnAllFilesDo tests the OnAllFilesDo function.
//
//nolint:gocognit
func TestOnAllFilesDo(t *testing.T) {
t.Parallel()
Expand Down
2 changes: 1 addition & 1 deletion checks/raw/branch_protection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var (
mainBranchName = "main"
)

//nolint: govet
// nolint: govet
type branchArg struct {
err error
name string
Expand Down
1 change: 1 addition & 0 deletions checks/raw/license_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ func TestLicenseFileCheck(t *testing.T) {
},
}

//nolint: paralleltest
for _, tt := range tests {
tt := tt // Re-initializing variable so it is not changed while executing the closure below
for _, ext := range tt.extensions {
Expand Down
2 changes: 1 addition & 1 deletion checks/raw/shell_download_validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ func validateShellFileAndRecord(pathfn string, startLine, endLine uint, content
// TODO: support other interpreters.
// Example: https://github.com/apache/airflow/blob/main/scripts/ci/kubernetes/ci_run_kubernetes_tests.sh#L75
// HOST_PYTHON_VERSION=$(python3 -c 'import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")')``
// nolinter
// nolint
if ok && isShellInterpreterOrCommand([]string{i}) {
start, end := getLine(startLine, endLine, node)
e := validateShellFileAndRecord(pathfn, start, end,
Expand Down
2 changes: 1 addition & 1 deletion clients/githubrepo/graphql.go
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ func parseCheckRuns(data *checkRunsGraphqlData) checkRunCache {
return checkCache
}

//nolint:all
//nolint
func commitsFrom(data *graphqlData, repoOwner, repoName string) ([]clients.Commit, error) {
ret := make([]clients.Commit, 0)
for _, commit := range data.Repository.Object.Commit.History.Nodes {
Expand Down
1 change: 1 addition & 0 deletions clients/githubrepo/roundtripper/tokens/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ func main() {
panic(err)
}

//nolint: gosec // internal server.
if err := http.Serve(l, nil); err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion clients/githubrepo/tarball.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (handler *tarballHandler) getTarball() error {
return nil
}

//nolint: gocognit
// nolint: gocognit
func (handler *tarballHandler) extractTarball() error {
in, err := os.OpenFile(handler.tempTarFile, os.O_RDONLY, 0o644)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion clients/githubrepo/tarball_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func setup(inputFile string) (tarballHandler, error) {
return tarballHandler, nil
}

//nolint: gocognit
// nolint: gocognit
func TestExtractTarball(t *testing.T) {
t.Parallel()
testcases := []struct {
Expand Down
8 changes: 4 additions & 4 deletions cmd/package_managers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package cmd
import (
"bytes"
"errors"
"io/ioutil"
"io"
"net/http"
"testing"

Expand Down Expand Up @@ -143,7 +143,7 @@ func Test_fetchGitRepositoryFromNPM(t *testing.T) {

return &http.Response{
StatusCode: 200,
Body: ioutil.NopCloser(bytes.NewBufferString(tt.args.result)),
Body: io.NopCloser(bytes.NewBufferString(tt.args.result)),
}, nil
}).AnyTimes()
got, err := fetchGitRepositoryFromNPM(tt.args.packageName, p)
Expand Down Expand Up @@ -423,7 +423,7 @@ func Test_fetchGitRepositoryFromPYPI(t *testing.T) {

return &http.Response{
StatusCode: 200,
Body: ioutil.NopCloser(bytes.NewBufferString(tt.args.result)),
Body: io.NopCloser(bytes.NewBufferString(tt.args.result)),
}, nil
}).AnyTimes()
got, err := fetchGitRepositoryFromPYPI(tt.args.packageName, p)
Expand Down Expand Up @@ -692,7 +692,7 @@ func Test_fetchGitRepositoryFromRubyGems(t *testing.T) {

return &http.Response{
StatusCode: 200,
Body: ioutil.NopCloser(bytes.NewBufferString(tt.args.result)),
Body: io.NopCloser(bytes.NewBufferString(tt.args.result)),
}, nil
}).AnyTimes()
got, err := fetchGitRepositoryFromRubyGems(tt.args.packageName, p)
Expand Down
2 changes: 1 addition & 1 deletion cmd/packagemanager_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type packageManagerClient interface {

type packageManager struct{}

//nolint: noctx
// nolint: noctx
func (c *packageManager) Get(url, packageName string) (*http.Response, error) {
const timeout = 10
client := &http.Client{
Expand Down
1 change: 1 addition & 0 deletions cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ func serveCmd(o *options.Options) *cobra.Command {
port = "8080"
}
fmt.Printf("Listening on localhost:%s\n", port)
//nolint: gosec // unsused.
err = http.ListenAndServe(fmt.Sprintf("0.0.0.0:%s", port), nil)
if err != nil {
// TODO(log): Should this actually panic?
Expand Down
3 changes: 2 additions & 1 deletion cron/internal/data/update/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import (

// Adds "project=${PROJECT},dependency=true" to the repositories metadata.
// Args:
// file path to old_projects.csv new_projects.csv
//
// file path to old_projects.csv new_projects.csv
func main() {
if len(os.Args) != 3 {
panic("must provide 2 arguments")
Expand Down
1 change: 1 addition & 0 deletions cron/internal/webhook/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ func scriptHandler(w http.ResponseWriter, r *http.Request) {
func main() {
http.HandleFunc("/", scriptHandler)
fmt.Printf("Starting HTTP server on port 8080 ...\n")
// nolint:gosec // internal server.
if err := http.ListenAndServe(":8080", nil); err != nil {
log.Fatal(err)
}
Expand Down
3 changes: 2 additions & 1 deletion cron/internal/worker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const (

var ignoreRuntimeErrors = flag.Bool("ignoreRuntimeErrors", false, "if set to true any runtime errors will be ignored")

//nolint: gocognit
// nolint: gocognit
func processRequest(ctx context.Context,
batchRequest *data.ScorecardBatchRequest,
blacklistedChecks []string, bucketURL, rawBucketURL, apiBucketURL string,
Expand Down Expand Up @@ -267,6 +267,7 @@ func main() {
// Exposed for monitoring runtime profiles
go func() {
// TODO(log): Previously Fatal. Need to handle the error here.
//nolint: gosec // internal server.
logger.Info(fmt.Sprintf("%v", http.ListenAndServe(":8080", nil)))
}()

Expand Down
2 changes: 1 addition & 1 deletion docs/checks/internal/generate/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
1 change: 1 addition & 0 deletions docs/checks/internal/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
var checksYAML []byte

// Check stores a check's information.
//
//nolint:govet
type Check struct {
Risk string `yaml:"risk"`
Expand Down
3 changes: 1 addition & 2 deletions e2e/binary_artifacts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package e2e

import (
"context"
"io/ioutil"
"os"

"github.com/go-git/go-git/v5"
Expand Down Expand Up @@ -173,7 +172,7 @@ var _ = Describe("E2E TEST:"+checks.CheckBinaryArtifacts, func() {
})
It("Should return binary artifacts present at commit in source code when using local repoClient", func() {
// create temp dir
tmpDir, err := ioutil.TempDir("", "")
tmpDir, err := os.MkdirTemp("", "")
Expect(err).Should(BeNil())
defer os.RemoveAll(tmpDir)

Expand Down
5 changes: 2 additions & 3 deletions e2e/dangerous_workflow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -15,7 +15,6 @@ package e2e

import (
"context"
"io/ioutil"
"os"

"github.com/go-git/go-git/v5"
Expand Down Expand Up @@ -83,7 +82,7 @@ var _ = Describe("E2E TEST:"+checks.CheckTokenPermissions, func() {
It("Should return dangerous workflow for local repoClient", func() {
dl := scut.TestDetailLogger{}

tmpDir, err := ioutil.TempDir("", "")
tmpDir, err := os.MkdirTemp("", "")
Expect(err).Should(BeNil())
defer os.RemoveAll(tmpDir)

Expand Down
5 changes: 2 additions & 3 deletions e2e/license_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -15,7 +15,6 @@ package e2e

import (
"context"
"io/ioutil"
"os"

"github.com/go-git/go-git/v5"
Expand Down Expand Up @@ -85,7 +84,7 @@ var _ = Describe("E2E TEST:"+checks.CheckLicense, func() {
It("Should return license check works for the local repoclient", func() {
dl := scut.TestDetailLogger{}

tmpDir, err := ioutil.TempDir("", "")
tmpDir, err := os.MkdirTemp("", "")
Expect(err).Should(BeNil())
defer os.RemoveAll(tmpDir)

Expand Down
3 changes: 1 addition & 2 deletions e2e/permissions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ package e2e

import (
"context"
"io/ioutil"
"os"

"github.com/go-git/go-git/v5"
Expand Down Expand Up @@ -85,7 +84,7 @@ var _ = Describe("E2E TEST:"+checks.CheckTokenPermissions, func() {
It("Should return token permission for a local repo client", func() {
dl := scut.TestDetailLogger{}

tmpDir, err := ioutil.TempDir("", "")
tmpDir, err := os.MkdirTemp("", "")
Expect(err).Should(BeNil())
defer os.RemoveAll(tmpDir)

Expand Down
5 changes: 2 additions & 3 deletions e2e/pinned_dependencies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -15,7 +15,6 @@ package e2e

import (
"context"
"io/ioutil"
"os"

"github.com/go-git/go-git/v5"
Expand Down Expand Up @@ -87,7 +86,7 @@ var _ = Describe("E2E TEST:"+checks.CheckPinnedDependencies, func() {
It("Should return dependencies check for a local repoClient", func() {
dl := scut.TestDetailLogger{}

tmpDir, err := ioutil.TempDir("", "")
tmpDir, err := os.MkdirTemp("", "")
Expect(err).Should(BeNil())
defer os.RemoveAll(tmpDir)

Expand Down
5 changes: 2 additions & 3 deletions e2e/security_policy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -15,7 +15,6 @@ package e2e

import (
"context"
"io/ioutil"
"os"

"github.com/go-git/go-git/v5"
Expand Down Expand Up @@ -139,7 +138,7 @@ var _ = Describe("E2E TEST:"+checks.CheckSecurityPolicy, func() {
It("Should return valid security policy for local repoClient at head", func() {
dl := scut.TestDetailLogger{}

tmpDir, err := ioutil.TempDir("", "")
tmpDir, err := os.MkdirTemp("", "")
Expect(err).Should(BeNil())
defer os.RemoveAll(tmpDir)

Expand Down
7 changes: 4 additions & 3 deletions pkg/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/ossf/scorecard/v4/log"
)

//nolint
// nolint: govet
type jsonCheckResult struct {
Name string
Details []string
Expand All @@ -45,7 +45,7 @@ type jsonCheckDocumentationV2 struct {
// Can be extended if needed.
}

//nolint
// nolint: govet
type jsonCheckResultV2 struct {
Details []string `json:"details"`
Score int `json:"score"`
Expand All @@ -71,8 +71,9 @@ func (s jsonFloatScore) MarshalJSON() ([]byte, error) {
return []byte(fmt.Sprintf("%.1f", s)), nil
}

//nolint:govet
// JSONScorecardResultV2 exports results as JSON for new detail format.
//
//nolint:govet
type JSONScorecardResultV2 struct {
Date string `json:"date"`
Repo jsonRepoV2 `json:"repo"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/scorecard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
Loading

0 comments on commit a6983ed

Please sign in to comment.