Skip to content

Commit 0dd4098

Browse files
author
iwankgb
authored
golanci-lint based cleanup (google#2503)
* Cleanups based on linter Signed-off-by: Maciej "Iwan" Iwanowski <[email protected]>
1 parent 1298173 commit 0dd4098

31 files changed

+108
-123
lines changed

‎accelerators/nvidia.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ var initializeNVML = func(nm *nvidiaManager) error {
128128
// Destroy shuts down NVML.
129129
func (nm *nvidiaManager) Destroy() {
130130
if nm.nvmlInitialized {
131-
gonvml.Shutdown()
131+
err := gonvml.Shutdown()
132+
if err != nil {
133+
klog.Warningf("nvml library shutdown failed: %s", err)
134+
}
132135
}
133136
}
134137

‎client/client_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import (
2727

2828
info "github.com/google/cadvisor/info/v1"
2929
itest "github.com/google/cadvisor/info/v1/test"
30+
31+
"github.com/stretchr/testify/assert"
3032
)
3133

3234
func cadvisorTestClient(path string, expectedPostObj *info.ContainerInfoRequest, replyObj interface{}, t *testing.T) (*Client, *httptest.Server, error) {
@@ -45,7 +47,8 @@ func cadvisorTestClient(path string, expectedPostObj *info.ContainerInfoRequest,
4547
}
4648
}
4749
encoder := json.NewEncoder(w)
48-
encoder.Encode(replyObj)
50+
err := encoder.Encode(replyObj)
51+
assert.NoError(t, err)
4952
} else {
5053
w.WriteHeader(http.StatusNotFound)
5154
fmt.Fprintf(w, "Page not found.")

‎client/v2/client_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ func cadvisorTestClient(path string, expectedPostObj *v1.ContainerInfoRequest, r
4545
}
4646
}
4747
encoder := json.NewEncoder(w)
48-
encoder.Encode(replyObj)
48+
err := encoder.Encode(replyObj)
49+
assert.NoError(t, err)
4950
} else if r.URL.Path == "/api/v2.1/version" {
5051
fmt.Fprintf(w, "0.1.2")
5152
} else {

‎collector/prometheus_collector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func prometheusLabelSetToCadvisorLabel(promLabels model.Metric) string {
209209
b.WriteString(l.GetValue())
210210
}
211211

212-
return string(b.Bytes())
212+
return b.String()
213213
}
214214

215215
// Returns collected metrics and the next collection time of the collector

‎collector/prometheus_collector_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ func TestPrometheus(t *testing.T) {
3333

3434
// Create a prometheus collector using the config file 'sample_config_prometheus.json'
3535
configFile, err := ioutil.ReadFile("config/sample_config_prometheus.json")
36+
assert.NoError(err)
3637
containerHandler := containertest.NewMockContainerHandler("mockContainer")
3738
collector, err := NewPrometheusCollector("Prometheus", configFile, 100, containerHandler, http.DefaultClient)
3839
assert.NoError(err)
@@ -116,6 +117,7 @@ func TestPrometheusEndpointConfig(t *testing.T) {
116117

117118
//Create a prometheus collector using the config file 'sample_config_prometheus.json'
118119
configFile, err := ioutil.ReadFile("config/sample_config_prometheus_endpoint_config.json")
120+
assert.NoError(err)
119121
containerHandler := containertest.NewMockContainerHandler("mockContainer")
120122
containerHandler.On("GetContainerIPAddress").Return(
121123
"222.222.222.222",
@@ -132,6 +134,7 @@ func TestPrometheusShortResponse(t *testing.T) {
132134

133135
// Create a prometheus collector using the config file 'sample_config_prometheus.json'
134136
configFile, err := ioutil.ReadFile("config/sample_config_prometheus.json")
137+
assert.NoError(err)
135138
containerHandler := containertest.NewMockContainerHandler("mockContainer")
136139
collector, err := NewPrometheusCollector("Prometheus", configFile, 100, containerHandler, http.DefaultClient)
137140
assert.NoError(err)
@@ -155,6 +158,7 @@ func TestPrometheusMetricCountLimit(t *testing.T) {
155158

156159
// Create a prometheus collector using the config file 'sample_config_prometheus.json'
157160
configFile, err := ioutil.ReadFile("config/sample_config_prometheus.json")
161+
assert.NoError(err)
158162
containerHandler := containertest.NewMockContainerHandler("mockContainer")
159163
collector, err := NewPrometheusCollector("Prometheus", configFile, 10, containerHandler, http.DefaultClient)
160164
assert.NoError(err)
@@ -184,6 +188,7 @@ func TestPrometheusFiltersMetrics(t *testing.T) {
184188

185189
// Create a prometheus collector using the config file 'sample_config_prometheus_filtered.json'
186190
configFile, err := ioutil.ReadFile("config/sample_config_prometheus_filtered.json")
191+
assert.NoError(err)
187192
containerHandler := containertest.NewMockContainerHandler("mockContainer")
188193
collector, err := NewPrometheusCollector("Prometheus", configFile, 100, containerHandler, http.DefaultClient)
189194
assert.NoError(err)
@@ -223,6 +228,7 @@ func TestPrometheusFiltersMetricsCountLimit(t *testing.T) {
223228

224229
// Create a prometheus collector using the config file 'sample_config_prometheus_filtered.json'
225230
configFile, err := ioutil.ReadFile("config/sample_config_prometheus_filtered.json")
231+
assert.NoError(err)
226232
containerHandler := containertest.NewMockContainerHandler("mockContainer")
227233
_, err = NewPrometheusCollector("Prometheus", configFile, 1, containerHandler, http.DefaultClient)
228234
assert.Error(err)

‎container/containerd/handler_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ func TestHandler(t *testing.T) {
4343
inHostNamespace bool
4444
metadataEnvs []string
4545
includedMetrics container.MetricSet
46-
storageDir string
4746

4847
hasErr bool
4948
errContains string
@@ -67,7 +66,6 @@ func TestHandler(t *testing.T) {
6766
false,
6867
nil,
6968
nil,
70-
"",
7169
true,
7270
"unable to find container \"40af7cdcbe507acad47a5a62025743ad3ddc6ab93b77b21363aa1c1d641047c9\"",
7371
nil,
@@ -81,7 +79,6 @@ func TestHandler(t *testing.T) {
8179
false,
8280
nil,
8381
nil,
84-
"",
8582
false,
8683
"",
8784
&info.ContainerReference{

‎container/crio/handler.go

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package crio
1717

1818
import (
1919
"fmt"
20-
"path"
2120
"path/filepath"
2221
"strconv"
2322
"strings"
@@ -105,7 +104,6 @@ func newCrioContainerHandler(
105104
rootFs := "/"
106105
if !inHostNamespace {
107106
rootFs = "/rootfs"
108-
storageDir = path.Join(rootFs, storageDir)
109107
}
110108

111109
id := ContainerNameToCrioId(name)

‎container/libcontainer/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func processLimitsFile(fileData string) []info.UlimitSpec {
187187
if strings.HasPrefix(lim, "Max") {
188188

189189
// Line format: Max open files 16384 16384 files
190-
fields := regexp.MustCompile("[\\s]{2,}").Split(lim, -1)
190+
fields := regexp.MustCompile(`[\s]{2,}`).Split(lim, -1)
191191
name := strings.Replace(strings.ToLower(strings.TrimSpace(fields[0])), " ", "_", -1)
192192

193193
found := isUlimitWhitelisted(name)

‎container/libcontainer/helpers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func TestGetCgroupSubsystems(t *testing.T) {
9090
},
9191
{
9292
// most subsystems not mounted
93-
mounts: append(cgroupMountsAt("/sys/fs/cgroup", []string{"cpu"})),
93+
mounts: cgroupMountsAt("/sys/fs/cgroup", []string{"cpu"}),
9494
expected: CgroupSubsystems{
9595
MountPoints: map[string]string{
9696
"cpu": "/sys/fs/cgroup/cpu",

‎container/raw/handler.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,7 @@ func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error {
200200
}
201201
} else if self.includedMetrics.Has(container.DiskUsageMetrics) || self.includedMetrics.Has(container.DiskIOMetrics) {
202202
if len(self.externalMounts) > 0 {
203-
var mountSet map[string]struct{}
204-
mountSet = make(map[string]struct{})
203+
mountSet := make(map[string]struct{})
205204
for _, mount := range self.externalMounts {
206205
mountSet[mount.HostDir] = struct{}{}
207206
}

‎devicemapper/thin_pool_watcher.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ func (w *ThinPoolWatcher) Refresh() error {
135135

136136
defer func() {
137137
klog.V(5).Infof("releasing metadata snapshot for thin-pool %v", w.poolName)
138-
w.dmsetup.Message(w.poolName, 0, releaseMetadataMessage)
138+
_, err := w.dmsetup.Message(w.poolName, 0, releaseMetadataMessage)
139+
if err != nil {
140+
klog.Warningf("Unable to release metadata snapshot for thin-pool %v: %s", w.poolName, err)
141+
}
139142
}()
140143

141144
klog.V(5).Infof("running thin_ls on metadata device %v", w.metadataDevice)

‎events/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func DefaultStoragePolicy() StoragePolicy {
150150
// returns a pointer to an initialized Events object.
151151
func NewEventManager(storagePolicy StoragePolicy) *events {
152152
return &events{
153-
eventStore: make(map[info.EventType]*utils.TimedStore, 0),
153+
eventStore: make(map[info.EventType]*utils.TimedStore),
154154
watchers: make(map[int]*watch),
155155
storagePolicy: storagePolicy,
156156
}
@@ -196,7 +196,7 @@ func getMaxEventsReturned(request *Request, eSlice []*info.Event) []*info.Event
196196
// it checks that the container paths of the event and request are
197197
// equivalent
198198
func checkIfIsSubcontainer(request *Request, event *info.Event) bool {
199-
if request.IncludeSubcontainers == true {
199+
if request.IncludeSubcontainers {
200200
return request.ContainerName == "/" || strings.HasPrefix(event.ContainerName+"/", request.ContainerName+"/")
201201
}
202202
return event.ContainerName == request.ContainerName

‎events/handler_test.go

+18-9
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,10 @@ func TestWatchEventsDetectsNewEvents(t *testing.T) {
121121
returnEventChannel, err := myEventHolder.WatchEvents(myRequest)
122122
assert.Nil(t, err)
123123

124-
myEventHolder.AddEvent(fakeEvent)
125-
myEventHolder.AddEvent(fakeEvent2)
124+
err = myEventHolder.AddEvent(fakeEvent)
125+
assert.NoError(t, err)
126+
err = myEventHolder.AddEvent(fakeEvent2)
127+
assert.NoError(t, err)
126128

127129
startTime := time.Now()
128130
go func() {
@@ -149,8 +151,9 @@ func TestWatchEventsDetectsNewEvents(t *testing.T) {
149151
func TestAddEventAddsEventsToEventManager(t *testing.T) {
150152
myEventHolder, _, fakeEvent, _ := initializeScenario(t)
151153

152-
myEventHolder.AddEvent(fakeEvent)
154+
err := myEventHolder.AddEvent(fakeEvent)
153155

156+
assert.NoError(t, err)
154157
checkNumberOfEvents(t, 1, len(myEventHolder.eventStore))
155158
ensureProperEventReturned(t, fakeEvent, myEventHolder.eventStore[info.EventOom].Get(0).(*info.Event))
156159
}
@@ -160,8 +163,10 @@ func TestGetEventsForOneEvent(t *testing.T) {
160163
myRequest.MaxEventsReturned = 1
161164
myRequest.EventType[info.EventOom] = true
162165

163-
myEventHolder.AddEvent(fakeEvent)
164-
myEventHolder.AddEvent(fakeEvent2)
166+
err := myEventHolder.AddEvent(fakeEvent)
167+
assert.NoError(t, err)
168+
err = myEventHolder.AddEvent(fakeEvent2)
169+
assert.NoError(t, err)
165170

166171
receivedEvents, err := myEventHolder.GetEvents(myRequest)
167172
assert.Nil(t, err)
@@ -175,8 +180,10 @@ func TestGetEventsForTimePeriod(t *testing.T) {
175180
myRequest.EndTime = time.Now().Add(time.Second * 10)
176181
myRequest.EventType[info.EventOom] = true
177182

178-
myEventHolder.AddEvent(fakeEvent)
179-
myEventHolder.AddEvent(fakeEvent2)
183+
err := myEventHolder.AddEvent(fakeEvent)
184+
assert.NoError(t, err)
185+
err = myEventHolder.AddEvent(fakeEvent2)
186+
assert.NoError(t, err)
180187

181188
receivedEvents, err := myEventHolder.GetEvents(myRequest)
182189
assert.Nil(t, err)
@@ -188,8 +195,10 @@ func TestGetEventsForTimePeriod(t *testing.T) {
188195
func TestGetEventsForNoTypeRequested(t *testing.T) {
189196
myEventHolder, myRequest, fakeEvent, fakeEvent2 := initializeScenario(t)
190197

191-
myEventHolder.AddEvent(fakeEvent)
192-
myEventHolder.AddEvent(fakeEvent2)
198+
err := myEventHolder.AddEvent(fakeEvent)
199+
assert.NoError(t, err)
200+
err = myEventHolder.AddEvent(fakeEvent2)
201+
assert.NoError(t, err)
193202

194203
receivedEvents, err := myEventHolder.GetEvents(myRequest)
195204
assert.Nil(t, err)

‎fs/fs.go

+3-11
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ func NewFsInfo(context Context) (FsInfo, error) {
109109
excluded := []string{fmt.Sprintf("%s/devicemapper/mnt", context.Docker.Root)}
110110
fsInfo := &RealFsInfo{
111111
partitions: processMounts(mounts, excluded),
112-
labels: make(map[string]string, 0),
113-
mounts: make(map[string]mount.MountInfo, 0),
112+
labels: make(map[string]string),
113+
mounts: make(map[string]mount.MountInfo),
114114
dmsetup: devicemapper.NewDmsetupClient(),
115115
fsUUIDToDeviceName: fsUUIDToDeviceName,
116116
}
@@ -163,7 +163,7 @@ func getFsUUIDToDeviceNameMap() (map[string]string, error) {
163163
}
164164

165165
func processMounts(mounts []mount.MountInfo, excludedMountpointPrefixes []string) map[string]partition {
166-
partitions := make(map[string]partition, 0)
166+
partitions := make(map[string]partition)
167167

168168
supportedFsType := map[string]bool{
169169
// all ext systems are checked through prefix.
@@ -727,14 +727,6 @@ func getZfstats(poolName string) (uint64, uint64, uint64, error) {
727727
return total, dataset.Avail, dataset.Avail, nil
728728
}
729729

730-
// Simple io.Writer implementation that counts how many bytes were written.
731-
type byteCounter struct{ bytesWritten uint64 }
732-
733-
func (b *byteCounter) Write(p []byte) (int, error) {
734-
b.bytesWritten += uint64(len(p))
735-
return len(p), nil
736-
}
737-
738730
// Get major and minor Ids for a mount point using btrfs as filesystem.
739731
func getBtrfsMajorMinorIds(mount *mount.MountInfo) (int, int, error) {
740732
// btrfs fix: following workaround fixes wrong btrfs Major and Minor Ids reported in /proc/self/mountinfo.

‎info/v1/container.go

+4-7
Original file line numberDiff line numberDiff line change
@@ -907,10 +907,7 @@ func timeEq(t1, t2 time.Time, tolerance time.Duration) bool {
907907
t1, t2 = t2, t1
908908
}
909909
diff := t2.Sub(t1)
910-
if diff <= tolerance {
911-
return true
912-
}
913-
return false
910+
return diff <= tolerance
914911
}
915912

916913
const (
@@ -987,9 +984,9 @@ type EventType string
987984

988985
const (
989986
EventOom EventType = "oom"
990-
EventOomKill = "oomKill"
991-
EventContainerCreation = "containerCreation"
992-
EventContainerDeletion = "containerDeletion"
987+
EventOomKill EventType = "oomKill"
988+
EventContainerCreation EventType = "containerCreation"
989+
EventContainerDeletion EventType = "containerDeletion"
993990
)
994991

995992
// Extra information about an event. Only one type will be set.

‎info/v1/machine.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ type CloudProvider string
138138

139139
const (
140140
GCE CloudProvider = "GCE"
141-
AWS = "AWS"
142-
Azure = "Azure"
143-
UnknownProvider = "Unknown"
141+
AWS CloudProvider = "AWS"
142+
Azure CloudProvider = "Azure"
143+
UnknownProvider CloudProvider = "Unknown"
144144
)
145145

146146
type InstanceType string

‎integration/tests/api/machine_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestMachineInformationIsReturned(t *testing.T) {
4343
if fs.Device == "" {
4444
t.Errorf("Expected a non-empty device name in: %+v", fs)
4545
}
46-
if fs.Capacity < 0 || fs.Capacity >= (1<<60 /* 1 EB*/) {
46+
if fs.Capacity >= (1 << 60 /* 1 EB*/) {
4747
t.Errorf("Unexpected capacity in device %q: %v", fs.Device, fs.Capacity)
4848
}
4949
if fs.Type == "" {

‎manager/container_test.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,10 @@ func TestOnDemandHousekeeping(t *testing.T) {
237237

238238
cd, mockHandler, memoryCache, fakeClock := newTestContainerData(t)
239239
mockHandler.On("GetStats").Return(stats, nil)
240-
defer cd.Stop()
240+
defer func() {
241+
err := cd.Stop()
242+
assert.NoError(t, err)
243+
}()
241244

242245
// 0 seconds should always trigger an update
243246
go cd.OnDemandHousekeeping(0 * time.Second)
@@ -261,7 +264,10 @@ func TestConcurrentOnDemandHousekeeping(t *testing.T) {
261264

262265
cd, mockHandler, memoryCache, fakeClock := newTestContainerData(t)
263266
mockHandler.On("GetStats").Return(stats, nil)
264-
defer cd.Stop()
267+
defer func() {
268+
err := cd.Stop()
269+
assert.NoError(t, err)
270+
}()
265271

266272
numConcurrentCalls := 5
267273
var waitForHousekeeping sync.WaitGroup
@@ -303,7 +309,8 @@ func TestOnDemandHousekeepingReturnsAfterStopped(t *testing.T) {
303309

304310
fakeClock.Step(2 * time.Second)
305311

306-
cd.Stop()
312+
err := cd.Stop()
313+
assert.NoError(t, err)
307314
// housekeeping tick should detect stop and not store any more metrics
308315
assert.False(t, cd.housekeepingTick(fakeClock.NewTimer(time.Minute).C(), testLongHousekeeping))
309316
fakeClock.Step(1 * time.Second)

0 commit comments

Comments
 (0)