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

golangci-lint configuration file #895

Merged
merged 1 commit into from
May 23, 2020
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
20 changes: 20 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: golangci-lint
on:
push:
tags:
- v*
branches:
- master
pull_request:
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: golangci-lint
uses: golangci/golangci-lint-action@v0.2.0
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JFYI we've launched v1 with support of caching and without slow docker image pulling, it works much faster

with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.27
args: ./...
15 changes: 15 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
linters:
enable:
- vet
- errcheck
- staticcheck
# - dupl
# - funlen
# - goconst
# - gocritic
- gofmt
# - golint
# - misspell
# - stylecheck
- unconvert
# - whitespace
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ install:
@echo "${APP} installed into ${INSTALLPATH}"

## lint: runs a number of code quality checks against the source code
cilint:
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should have mentioned, I called this cilint just so I could leave the original lint target in. Its a poor name, given that ci doesn't use it, it just uses the action. Oops.

I think the cilint target should be renamed lint, and the (current) lint target deleted.

golangci-lint run

lint:
@echo "\033[35mhttps://github.com/kisielk/errcheck\033[0m"
errcheck ./app
Expand Down
2 changes: 1 addition & 1 deletion app/focus_tracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (tracker *FocusTracker) focusables() []wtf.Wtfable {
}

// Sort for deterministic ordering
sort.SliceStable(focusable[:], func(i, j int) bool {
sort.SliceStable(focusable, func(i, j int) bool {
iTop := focusable[i].CommonSettings().Top
jTop := focusable[j].CommonSettings().Top

Expand Down
1 change: 1 addition & 0 deletions app/wtf_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ func (wtfApp *WtfApp) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
switch string(event.Rune()) {
case "/":
return nil
default:
}
}

Expand Down
2 changes: 1 addition & 1 deletion cfg/config_files.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func WtfConfigDir() (string, error) {
if configDir == "" {
configDir = WtfConfigDirV2
} else {
configDir = configDir + "/wtf/"
configDir += "/wtf/"
}
configDir, err := expandHomeDir(configDir)
if err != nil {
Expand Down
7 changes: 4 additions & 3 deletions modules/cds/queue/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ func (widget *Widget) generateQueueJobLine(id int64, parameters []sdk.Parameter,
row[2] = pad(run, 7)
row[3] = pad(prj+"/"+workflow+"/"+node, 40)

if status == sdk.StatusBuilding {
switch {
case status == sdk.StatusBuilding:
row[1] = pad(fmt.Sprintf(" %s.%s ", executedJob.WorkerName, executedJob.WorkerID), 27)
} else if bookedBy.ID != 0 {
case bookedBy.ID != 0:
row[1] = pad(fmt.Sprintf(" %s.%d ", bookedBy.Name, bookedBy.ID), 27)
} else {
default:
row[1] = pad("", 27)
}

Expand Down
13 changes: 7 additions & 6 deletions modules/cds/status/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,18 @@ func (widget *Widget) displayStatus() string {
)

for _, line := range status.Lines {
if line.Status == sdk.MonitoringStatusWarn && strings.Contains(line.Component, "Global") {
switch {
case line.Status == sdk.MonitoringStatusWarn && strings.Contains(line.Component, "Global"):
globalWarn = append(globalWarn, line.String())
} else if line.Status != sdk.MonitoringStatusOK && strings.Contains(line.Component, "Global") {
case line.Status != sdk.MonitoringStatusOK && strings.Contains(line.Component, "Global"):
globalRed = append(globalRed, line.String())
} else if strings.Contains(line.Component, "Global") {
case strings.Contains(line.Component, "Global"):
global = append(global, line.String())
} else if line.Status == sdk.MonitoringStatusWarn {
case line.Status == sdk.MonitoringStatusWarn:
warn = append(warn, line.String())
} else if line.Status == sdk.MonitoringStatusOK {
case line.Status == sdk.MonitoringStatusOK:
ok = append(ok, line.String())
} else {
default:
red = append(red, line.String())
}
}
Expand Down
1 change: 0 additions & 1 deletion modules/cryptoexchanges/cryptolive/price/widget.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ func (widget *Widget) updateCurrencies() {

setPrices(&jsonResponse, fromCurrency)
}

}

func makeRequest(currency *fromCurrency) *http.Request {
Expand Down
8 changes: 4 additions & 4 deletions modules/digitalclock/clocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const AM = "A"
const PM = "P"
const minRowsForBorder = 3

// Converts integer to string along with makes sure the lenght of string is > 2
// Converts integer to string along with makes sure the length of string is > 2
func intStrConv(val int) string {
valStr := strconv.Itoa(val)

Expand All @@ -39,9 +39,9 @@ func getHourMinute(hourFormat string) string {

}

strMintues := intStrConv(time.Now().Minute())
strMintues = strMintues + AMPM
return strHours + getColon() + strMintues
strMinutes := intStrConv(time.Now().Minute())
strMinutes += AMPM
return strHours + getColon() + strMinutes
}

// Returns the : with blinking based on the seconds
Expand Down
2 changes: 1 addition & 1 deletion modules/digitalclock/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package digitalclock
import "strings"

func mergeLines(outString []string) string {
return strings.Join(outString[:], "\n")
return strings.Join(outString, "\n")
}

func renderWidget(widgetSettings Settings) string {
Expand Down
7 changes: 4 additions & 3 deletions modules/gcal/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,12 @@ func (widget *Widget) timeUntil(calEvent *CalEvent) string {
untilStr := ""

color := "[lightblue]"
if days > 0 {
switch {
case days > 0:
untilStr = fmt.Sprintf("%dd", days)
} else if hours > 0 {
case hours > 0:
untilStr = fmt.Sprintf("%dh", hours)
} else {
default:
untilStr = fmt.Sprintf("%dm", mins)
if mins < 30 {
color = "[red]"
Expand Down
2 changes: 1 addition & 1 deletion modules/gitlabtodo/widget.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (widget *Widget) getTodos(apiKey string) ([]*gitlab.Todo, error) {
func (widget *Widget) trimTodoBody(body string) string {
r := []rune(body)

// Cut at first occurance of a newline
// Cut at first occurence of a newline
for i, a := range r {
if a == '\n' {
return string(r[:i])
Expand Down
2 changes: 1 addition & 1 deletion modules/hibp/widget.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (widget *Widget) content() (string, string, bool) {
return title, widget.err.Error(), true
}

title = title + widget.sinceDateForTitle()
title += widget.sinceDateForTitle()
str := ""

for _, status := range widget.statuses {
Expand Down
4 changes: 2 additions & 2 deletions modules/jenkins/widget.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (widget *Widget) content() (string, string, bool) {
row := fmt.Sprintf(
`[%s] [%s]%-6s[white]`,
widget.RowColor(idx),
widget.jobColor(&job),
widget.jobColor(job),
jobName,
)

Expand All @@ -92,7 +92,7 @@ func (widget *Widget) content() (string, string, bool) {
return title, str, false
}

func (widget *Widget) jobColor(job *Job) string {
func (widget *Widget) jobColor(job Job) string {
switch job.Color {
case "blue":
// Override color if successBallColor boolean param provided in config
Expand Down
7 changes: 4 additions & 3 deletions modules/kubernetes/widget.go
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,12 @@ func (client *clientInstance) getNodes() ([]string, error) {
var nodeStatus string
for _, condition := range node.Status.Conditions {
if condition.Reason == "KubeletReady" {
if condition.Status == "True" {
switch {
case condition.Status == "True":
nodeStatus = "Ready"
} else if condition.Reason == "False" {
case condition.Reason == "False":
nodeStatus = "NotReady"
} else {
default:
nodeStatus = "Unknown"
}
}
Expand Down
4 changes: 2 additions & 2 deletions modules/pocket/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (client *Client) GetAccessToken(requestToken string) (accessToken string, e

}

/*LinkState represents links states to be retrived
/*LinkState represents link states to be retrieved
According to the api https://getpocket.com/developer/docs/v3/retrieve
there are 3 states:
1-archive
Expand All @@ -197,7 +197,7 @@ const (
Unread LinkState = "unread"
)

// GetLinks retrive links of a given states https://getpocket.com/developer/docs/v3/retrieve
// GetLinks retrieve links of a given states https://getpocket.com/developer/docs/v3/retrieve
func (client *Client) GetLinks(state LinkState) (response ItemLists, err error) {
url := fmt.Sprintf("%s/get?sort=newest&state=%s&consumer_key=%s&access_token=%s", client.baseURL, state, client.consumerKey, *client.accessToken)
req := request{
Expand Down
2 changes: 1 addition & 1 deletion modules/resourceusage/widget.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func MakeGraph(widget *Widget) {
}
}

widget.BarGraph.BuildBars(stats[:])
widget.BarGraph.BuildBars(stats)

}

Expand Down
7 changes: 4 additions & 3 deletions modules/transmission/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@ func (widget *Widget) torrentPercentDone(torrent *transmissionrpc.Torrent) strin
pctDone := *torrent.PercentDone
str := fmt.Sprintf("%3d%%↓", int(pctDone*100))

if pctDone == 0.0 {
switch pctDone {
case 0.0:
str = "[gray::b]" + str
} else if pctDone == 1.0 {
case 1.0:
str = "[green::b]" + str
} else {
default:
str = "[lightblue::b]" + str
}

Expand Down
4 changes: 2 additions & 2 deletions modules/travisci/widget.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (widget *Widget) content() (string, string, bool) {
row := fmt.Sprintf(
rowFormat,
widget.RowColor(idx),
buildColor(&build),
buildColor(build),
build.Repository.Name,
build.Number,
build.Branch.Name,
Expand All @@ -92,7 +92,7 @@ func (widget *Widget) content() (string, string, bool) {
return title, str, false
}

func buildColor(build *Build) string {
func buildColor(build Build) string {
switch build.State {
case "broken":
return "red"
Expand Down
1 change: 0 additions & 1 deletion modules/zendesk/tickets.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func (widget *Widget) listTickets(pag ...string) (*TicketArray, error) {
}

return TicketStruct, err

}

func (widget *Widget) newTickets() (*TicketArray, error) {
Expand Down
4 changes: 2 additions & 2 deletions utils/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func Test_ExecuteCommand(t *testing.T) {
}

func Test_FindMatch(t *testing.T) {
expected := [][]string([][]string{[]string{"SSID: 7E5B5C", "7E5B5C"}})
expected := [][]string{{"SSID: 7E5B5C", "7E5B5C"}}
result := FindMatch(`s*SSID: (.+)s*`, "SSID: 7E5B5C")

assert.Equal(t, expected, result)
Expand Down Expand Up @@ -115,7 +115,7 @@ func Test_ReadFileBytes(t *testing.T) {
expected []byte
}{
{
name: "with non-existant file",
name: "with non-existent file",
file: "/tmp/junk-daa6bf613f4c.md",
expected: []byte{},
},
Expand Down
7 changes: 4 additions & 3 deletions view/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,12 @@ func (base *Base) ConfigText() string {
}

func (base *Base) ContextualTitle(defaultStr string) string {
if defaultStr == "" && base.FocusChar() == "" {
switch {
case defaultStr == "" && base.FocusChar() == "":
return ""
} else if defaultStr != "" && base.FocusChar() == "" {
case defaultStr != "" && base.FocusChar() == "":
return fmt.Sprintf(" %s ", defaultStr)
} else if defaultStr == "" && base.FocusChar() != "" {
case defaultStr == "" && base.FocusChar() != "":
return fmt.Sprintf(" [darkgray::u]%s[::-][white] ", base.FocusChar())
}

Expand Down