Skip to content

Commit

Permalink
chore: Golangci config update & clean repo (#152)
Browse files Browse the repository at this point in the history
* update golangci config

* lint repo

* lint nilerr

* remove false positives

* clean

* remove changelog
  • Loading branch information
kaymckay authored Mar 8, 2022
1 parent 011c25e commit a7bf6f0
Show file tree
Hide file tree
Showing 22 changed files with 119 additions and 275 deletions.
30 changes: 0 additions & 30 deletions .chglog/CHANGELOG.tpl.md

This file was deleted.

28 changes: 0 additions & 28 deletions .chglog/config.yml

This file was deleted.

53 changes: 0 additions & 53 deletions .github/workflows/release.yml

This file was deleted.

172 changes: 96 additions & 76 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,27 @@ linters-settings:

# https://github.com/ultraware/funlen
funlen:
lines: 100
statements: 50
# accounting for comments
lines: 160
statements: 70

# https://github.com/golang/lint
golint:
min-confidence: 0

# https://github.com/tommy-muehle/go-mnd
gomnd:
settings:
mnd:
# don't include the "operation" and "assign"
checks: argument,case,condition,return

# https://github.com/walle/lll
lll:
line-length: 100

# https://github.com/mdempsky/maligned
maligned:
suggest-new: true
# https://github.com/denis-tingaikin/go-header
goheader:
template: |-
Copyright (c) {{ YEAR }} Target Brands, Inc. All rights reserved.
Use of this source code is governed by the LICENSE file in this repository.
# https://github.com/client9/misspell
misspell:
locale: US

# https://github.com/golangci/golangci-lint/blob/master/pkg/golinters/nolintlint
nolintlint:
allow-leading-space: true # allow non-"machine-readable" format (ie. with leading space)
allow-unused: false # allow nolint directives that don't address a linting issue
require-explanation: true # require an explanation for nolint directives
require-specific: true # require nolint directives to be specific about which linter is being skipped
allow-leading-space: true # allow non-"machine-readable" format (ie. with leading space)
allow-unused: false # allow nolint directives that don't address a linting issue
require-explanation: true # require an explanation for nolint directives
require-specific: true # require nolint directives to be specific about which linter is being skipped

# This section provides the configuration for which linters
# golangci will execute. Several of them were disabled by
Expand All @@ -70,58 +59,91 @@ linters:

# enable a specific set of linters to run
enable:
- bodyclose
- deadcode # enabled by default
- dupl
- errcheck # enabled by default
- funlen
- goconst
- gocyclo
- godot
- gofmt
- goimports
- golint
- gomnd
- goprintffuncname
- gosec
- gosimple # enabled by default
- govet # enabled by default
- ineffassign # enabled by default
- lll
- maligned
- misspell
- nakedret
- nolintlint
- staticcheck # enabled by default
- structcheck # enabled by default
- stylecheck
- typecheck # enabled by default
- unconvert
- unparam
- unused # enabled by default
- varcheck # enabled by default
- whitespace

- bidichk # checks for dangerous unicode character sequences
- bodyclose # checks whether HTTP response body is closed successfully
- contextcheck # check the function whether use a non-inherited context
- deadcode # finds unused code
- dupl # code clone detection
- errcheck # checks for unchecked errors
- errorlint # find misuses of errors
- exportloopref # check for exported loop vars
- funlen # detects long functions
- goconst # finds repeated strings that could be replaced by a constant
- gocyclo # computes and checks the cyclomatic complexity of functions
- godot # checks if comments end in a period
- gofmt # checks whether code was gofmt-ed
- goheader # checks is file header matches to pattern
- goimports # fixes imports and formats code in same style as gofmt
- gomoddirectives # manage the use of 'replace', 'retract', and 'excludes' directives in go.mod
- goprintffuncname # checks that printf-like functions are named with f at the end
- gosec # inspects code for security problems
- gosimple # linter that specializes in simplifying a code
- govet # reports suspicious constructs, ex. Printf calls whose arguments don't align with the format string
- ineffassign # detects when assignments to existing variables aren't used
- makezero # finds slice declarations with non-zero initial length
- misspell # finds commonly misspelled English words in comments
- nakedret # finds naked returns in functions greater than a specified function length
- nilerr # finds the code that returns nil even if it checks that the error is not nil
- noctx # noctx finds sending http request without context.Context
- nolintlint # reports ill-formed or insufficient nolint directives
- revive # linter for go
- staticcheck # applies static analysis checks, go vet on steroids
- structcheck # finds unused struct fields
- stylecheck # replacement for golint
- tenv # analyzer that detects using os.Setenv instead of t.Setenv since Go1.17
- typecheck # parses and type-checks go code, like the front-end of a go compiler
- unconvert # remove unnecessary type conversions
- unparam # reports unused function parameters
- unused # checks for unused constants, variables, functions and types
- varcheck # finds unused global variables and constants
- whitespace # detects leading and trailing whitespace
- wsl # forces code to use empty lines

# static list of linters we know golangci can run but we've
# chosen to leave disabled for now
# - asciicheck
# - depguard
# - dogsled
# - exhaustive
# - gochecknoinits
# - gochecknoglobals
# - gocognit
# - gocritic
# - godox
# - goerr113
# - interfacer
# - nestif
# - noctx
# - prealloc
# - rowserrcheck
# - scopelint
# - testpackage
# - wsl
# - asciicheck - non-critical
# - cyclop - unused complexity metric
# - depguard - unused
# - dogsled - blanks allowed
# - durationcheck - unused
# - errname - unused
# - exhaustive - unused
# - exhaustivestruct - style preference
# - forbidigo - unused
# - forcetypeassert - unused
# - gci - use goimports
# - gochecknoinits - unused
# - gochecknoglobals - global variables allowed
# - gocognit - unused complexity metric
# - gocritic - style preference
# - godox - to be used in the future
# - goerr113 - to be used in the future
# - golint - archived, replaced with revive
# - gofumpt - use gofmt
# - gomnd - get too many false-positives
# - gomodguard - unused
# - ifshort - use both styles
# - ireturn - allow interfaces to be returned
# - importas - want flexibility with naming
# - lll - not too concerned about line length
# - interfacer - archived
# - nestif - non-critical
# - nilnil - style preference
# - nlreturn - style preference
# - maligned - archived, replaced with govet 'fieldalignment'
# - paralleltest - false-positives
# - prealloc - don't use
# - predeclared - unused
# - promlinter - style preference
# - rowserrcheck - unused
# - scopelint - deprecated - replaced with exportloopref
# - sqlclosecheck - unused
# - tagliatelle - use a mix of variable naming
# - testpackage - don't use this style of testing
# - thelper - false-positives
# - varnamelen - unused
# - wastedassign - duplicate functionality
# - wrapcheck - style preference

# This section provides the configuration for how golangci
# will report the issues it finds.
Expand All @@ -135,5 +157,3 @@ issues:
- funlen
- goconst
- gocyclo
- gomnd
- lll
4 changes: 0 additions & 4 deletions vela/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ func (svc *AdminBuildService) GetQueue(opt *GetQueueOptions) (*[]library.BuildQu
}

// GetAll returns a list of all deployments.
//
// nolint: lll // ignore long line length due to variable names
func (svc *AdminDeploymentService) GetAll(opt *ListOptions) (*[]library.Deployment, *Response, error) {
// set the API endpoint path we send the request to
u := "/api/v1/admin/deployments"
Expand All @@ -142,8 +140,6 @@ func (svc *AdminDeploymentService) GetAll(opt *ListOptions) (*[]library.Deployme
}

// Update modifies a deployment with the provided details.
//
// nolint: lll // ignore long line length due to variable names
func (svc *AdminDeploymentService) Update(d *library.Deployment) (*library.Deployment, *Response, error) {
// set the API endpoint path we send the request to
u := "/api/v1/admin/deployment"
Expand Down
1 change: 1 addition & 0 deletions vela/admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ func TestAdmin_Build_Queue_200(t *testing.T) {
data := []byte(server.BuildQueueResp)

var want *[]library.BuildQueue

err := json.Unmarshal(data, &want)
if err != nil {
t.Error(err)
Expand Down
6 changes: 3 additions & 3 deletions vela/authentication.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package vela

import (
"context"
"fmt"
"net/http"

Expand Down Expand Up @@ -88,7 +89,7 @@ func (svc *AuthenticationService) RefreshAccessToken(refreshToken string) (*Resp
return nil, err
}

req, err := http.NewRequest("GET", url, nil)
req, err := http.NewRequestWithContext(context.Background(), "GET", url, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -134,7 +135,7 @@ func (svc *AuthenticationService) AuthenticateWithToken(token string) (string, *
}

// create a new request that we can attach a header to
req, err := http.NewRequest("POST", url, nil)
req, err := http.NewRequestWithContext(context.Background(), "POST", url, nil)
if err != nil {
return "", nil, err
}
Expand All @@ -151,7 +152,6 @@ func (svc *AuthenticationService) AuthenticateWithToken(token string) (string, *
// ExchangeTokens handles the last part of the OAuth flow. It uses the supplied
// code and state values to attempt to exchange them for Vela Access and
// Refresh tokens.
// nolint:lll // long struct names
func (svc *AuthenticationService) ExchangeTokens(opt *OAuthExchangeOptions) (string, string, *Response, error) {
// set the API endpoint path we send the request to
u := "/authenticate"
Expand Down
Loading

0 comments on commit a7bf6f0

Please sign in to comment.