Skip to content

Commit bf225d1

Browse files
authored
Merge pull request #7208 from oscr/more-linters-more-fun
✨ Enable linters: asasalint, bidichk, durationcheck, errchkjson. Fix findings
2 parents daab6fd + b486316 commit bf225d1

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
linters:
22
disable-all: true
33
enable:
4+
- asasalint
45
- asciicheck
6+
- bidichk
57
- bodyclose
68
- containedctx
79
- depguard
810
- dogsled
11+
- durationcheck
912
- errcheck
13+
- errchkjson
1014
- exportloopref
1115
- gci
1216
- goconst

docs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
FROM maven:3-jdk-8
1919

2020
RUN apt-get update && apt-get install -y --no-install-recommends graphviz=2.42.2-5 fonts-symbola=2.60-1.1 fonts-wqy-zenhei=0.9.45-8 && rm -rf /var/lib/apt/lists/*
21-
RUN wget -O /plantuml.jar https://github.com/plantuml/plantuml/releases/download/v1.2022.6/plantuml-1.2022.6.jar
21+
RUN wget -nv -O /plantuml.jar https://github.com/plantuml/plantuml/releases/download/v1.2022.6/plantuml-1.2022.6.jar
2222

2323
# By default, java writes a 'hsperfdata_<username>' directory in the work dir.
2424
# This directory is not needed; to ensure it is not written, we set `-XX:-UsePerfData`

test/infrastructure/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ENV GOPROXY=$goproxy
3333
# Gets additional CAPD dependencies
3434
WORKDIR /tmp
3535

36-
RUN curl -LO https://dl.k8s.io/release/v1.25.0/bin/linux/${ARCH}/kubectl && \
36+
RUN curl -LO "https://dl.k8s.io/release/v1.25.0/bin/linux/${ARCH}/kubectl" && \
3737
chmod +x ./kubectl && \
3838
mv ./kubectl /usr/bin/kubectl
3939

util/conditions/matcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (m matchConditions) Match(actual interface{}) (success bool, err error) {
4242
elems = append(elems, MatchCondition(condition))
4343
}
4444

45-
return gomega.ConsistOf(elems).Match(actual)
45+
return gomega.ConsistOf(elems...).Match(actual)
4646
}
4747

4848
func (m matchConditions) FailureMessage(actual interface{}) (message string) {

0 commit comments

Comments
 (0)