Skip to content

Commit 4f6c0da

Browse files
committed
linters: enable intrange linter
Intrange is a linter to find places where for loops could make use of an integer range. Signed-off-by: Mahe Tardy <[email protected]>
1 parent fc39a54 commit 4f6c0da

File tree

34 files changed

+83
-86
lines changed

34 files changed

+83
-86
lines changed

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ linters:
1414
- goheader
1515
- govet
1616
- ineffassign
17+
- intrange
1718
- makezero
1819
- misspell
1920
- revive

cmd/dump-syscalls-info/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func dumpSyscalls(fname string) (map[string][]SyscallArg, error) {
123123

124124
arr := make([]SyscallArg, 0)
125125
n := typSym.Size / 8
126-
for i := uint64(0); i < n; i++ {
126+
for i := range n {
127127
typPtr := typSym.Value + (i * 8)
128128
typStr, err := ReadString(typPtr)
129129
if err != nil {

cmd/tetra/getevents/io_reader_client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func Test_ioReaderClient_GetEvents(t *testing.T) {
2020
client := newIOReaderClient(events, false)
2121
getEventsClient, err := client.GetEvents(context.Background(), &tetragon.GetEventsRequest{})
2222
assert.NoError(t, err)
23-
for i := 0; i < 3; i++ {
23+
for range 3 {
2424
_, err := getEventsClient.Recv()
2525
assert.NoError(t, err)
2626
}

operator/podinfo/podinfo_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func getRandIP() string {
6666
func getRandIPs() (string, []string) {
6767
length := getRandNum() + 1
6868
podIPs := make([]string, length)
69-
for i := 0; i < length; i++ {
69+
for i := range length {
7070
podIPs[i] = getRandIP()
7171
}
7272
return podIPs[0], podIPs

pkg/bench/trace_bench_open.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ func (src traceBenchOpen) Run(ctx context.Context, _ *Arguments, _ *Summary) err
6363

6464
fmt.Printf("threads %v, loops %v, sleep %v(us)\n", *openThreads, *openLoops, *openSleep)
6565

66-
var i uint
67-
68-
for i = 0; i < *openThreads; i++ {
66+
for range uint(*openThreads) {
6967
wg.Add(1)
7068
go func() {
7169
defer wg.Done()

pkg/bench/trace_bench_rw.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ func (src traceBenchRw) Run(ctx context.Context, _ *Arguments, _ *Summary) error
107107
var wg sync.WaitGroup
108108
defer wg.Wait()
109109

110-
var i uint
111-
112-
for i = 0; i < *rwThreads; i++ {
110+
for range uint(*rwThreads) {
113111
wg.Add(1)
114112
go func() {
115113
defer wg.Done()

pkg/bpf/maps_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ map_extra: 0x0
2222
memlock: 74056`)
2323

2424
func Benchmark_parseMemlockFromFDInfoReader(b *testing.B) {
25-
for i := 0; i < b.N; i++ {
25+
for range b.N {
2626
parseMemlockFromFDInfoReader(mapFDinfo)
2727
}
2828
}

pkg/cgidmap/cri.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (c *criResolver) enqeue(unmappedIDs []unmappedID) {
6060
// remove IDs from the end that for which we don't have the capacity
6161
newCnt := len(unmappedIDs) + c.unresolvedIDs.Len()
6262
if newCnt > maxUnmappedIDs {
63-
for i := 0; i < (newCnt - maxUnmappedIDs); i++ {
63+
for range newCnt - maxUnmappedIDs {
6464
c.unresolvedIDs.Remove(c.unresolvedIDs.Back())
6565
}
6666
}

pkg/exporter/exporter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func Test_rateLimitExport(t *testing.T) {
205205
ratelimit.NewRateLimiter(ctx, 50*time.Millisecond, tt.rateLimit, encoder),
206206
)
207207
assert.NoError(t, exporter.Start(), "exporter must start without errors")
208-
for i := 0; i < tt.totalEvents; i++ {
208+
for i := range tt.totalEvents {
209209
eventNotifier.NotifyListener(nil, &tetragon.GetEventsResponse{
210210
Event: &tetragon.GetEventsResponse_ProcessExec{
211211
ProcessExec: &tetragon.ProcessExec{Process: &tetragon.Process{Binary: fmt.Sprintf("a%d", i)}},

pkg/fieldfilters/benchmark_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (gen *randomEventGenerator) Generate(tb testing.TB) *tetragon.GetEventsResp
4545

4646
func (gen *randomEventGenerator) GenerateN(b *testing.B) []*tetragon.GetEventsResponse {
4747
evs := make([]*tetragon.GetEventsResponse, b.N)
48-
for i := 0; i < b.N; i++ {
48+
for i := range b.N {
4949
ev := gen.Generate(b)
5050
evs[i] = ev
5151
}
@@ -75,7 +75,7 @@ func BenchmarkSerialize(b *testing.B) {
7575
evs := gen.GenerateN(b)
7676
b.StartTimer()
7777

78-
for i := 0; i < b.N; i++ {
78+
for i := range b.N {
7979
ev := evs[i]
8080
err := encoder.Encode(ev)
8181
assert.NoError(b, err, "event must encode")
@@ -91,7 +91,7 @@ func BenchmarkSerialize_DeepCopy(b *testing.B) {
9191
evs := gen.GenerateN(b)
9292
b.StartTimer()
9393

94-
for i := 0; i < b.N; i++ {
94+
for i := range b.N {
9595
ev := evs[i]
9696
ev = proto.Clone(ev).(*tetragon.GetEventsResponse)
9797
err := encoder.Encode(ev)
@@ -107,7 +107,7 @@ func BenchmarkSerialize_DeepCopyProcess(b *testing.B) {
107107
evs := gen.GenerateN(b)
108108
b.StartTimer()
109109

110-
for i := 0; i < b.N; i++ {
110+
for i := range b.N {
111111
ev := evs[i]
112112
if setter, ok := tetragon.UnwrapGetEventsResponse(ev).(tetragon.ProcessEvent); ok {
113113
proc := helpers.ResponseGetProcess(ev)
@@ -130,7 +130,7 @@ func BenchmarkSerialize_FieldFilters(b *testing.B) {
130130
require.NoError(b, err)
131131
b.StartTimer()
132132

133-
for i := 0; i < b.N; i++ {
133+
for i := range b.N {
134134
ev := evs[i]
135135
ev, err = ff.Filter(ev)
136136
assert.NoError(b, err, "event must filter")
@@ -149,7 +149,7 @@ func BenchmarkSerialize_FieldFilters_NoProcessInfo(b *testing.B) {
149149
require.NoError(b, err)
150150
b.StartTimer()
151151

152-
for i := 0; i < b.N; i++ {
152+
for i := range b.N {
153153
ev := evs[i]
154154
ev, err = ff.Filter(ev)
155155
assert.NoError(b, err, "event must filter")
@@ -169,7 +169,7 @@ func BenchmarkSerialize_FieldFilters_NoProcesInfoKeepExecid(b *testing.B) {
169169
require.NoError(b, err)
170170
b.StartTimer()
171171

172-
for i := 0; i < b.N; i++ {
172+
for i := range b.N {
173173
ev := evs[i]
174174
ev, err = ff.Filter(ev)
175175
assert.NoError(b, err, "event must filter")
@@ -189,7 +189,7 @@ func BenchmarkSerialize_RedactionFilters(b *testing.B) {
189189
require.NoError(b, err)
190190
b.StartTimer()
191191

192-
for i := 0; i < b.N; i++ {
192+
for i := range b.N {
193193
ev := evs[i]
194194
getProcess, ok := ev.Event.(interface{ GetProcess() *tetragon.Process })
195195
if ok {

0 commit comments

Comments
 (0)