Skip to content

Commit 3c8a4b3

Browse files
postnatipostnati
committed
Fixed linting issues
1 parent 60718d1 commit 3c8a4b3

5 files changed

Lines changed: 32 additions & 35 deletions

File tree

‎receiver/windowseventlogreceiver/internal/sidcache/cache_windows.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var (
3131

3232
// LSA constants
3333
const (
34-
POLICY_LOOKUP_NAMES = 0x00000800
34+
policyLookupNames = 0x00000800
3535
)
3636

3737
// SID_NAME_USE enumeration
@@ -224,7 +224,7 @@ func lookupSID(sidString string) (*ResolvedSID, error) {
224224
if ret == 0 {
225225
return nil, errors.New("ConvertStringSidToSid failed")
226226
}
227-
defer procLocalFree.Call(uintptr(unsafe.Pointer(sid)))
227+
defer procLocalFree.Call(uintptr(unsafe.Pointer(sid))) //nolint:errcheck // cleanup: no action on error
228228

229229
// Open LSA policy
230230
var policyHandle windows.Handle
@@ -235,13 +235,13 @@ func lookupSID(sidString string) (*ResolvedSID, error) {
235235
status, _, _ := procLsaOpenPolicy.Call(
236236
0, // Local system
237237
uintptr(unsafe.Pointer(&objAttrs)),
238-
POLICY_LOOKUP_NAMES,
238+
policyLookupNames,
239239
uintptr(unsafe.Pointer(&policyHandle)),
240240
)
241241
if status != 0 {
242242
return nil, fmt.Errorf("LsaOpenPolicy failed with status: %x", status)
243243
}
244-
defer procLsaClose.Call(uintptr(policyHandle))
244+
defer procLsaClose.Call(uintptr(policyHandle)) //nolint:errcheck // cleanup: no action on error
245245

246246
// Prepare SID array for LsaLookupSids2
247247
sidArray := []*windows.SID{sid}
@@ -261,10 +261,10 @@ func lookupSID(sidString string) (*ResolvedSID, error) {
261261

262262
// Clean up LSA memory
263263
if domains != nil {
264-
defer procLsaFreeMemory.Call(uintptr(unsafe.Pointer(domains)))
264+
defer procLsaFreeMemory.Call(uintptr(unsafe.Pointer(domains))) //nolint:errcheck // cleanup: no action on error
265265
}
266266
if names != nil {
267-
defer procLsaFreeMemory.Call(uintptr(unsafe.Pointer(names)))
267+
defer procLsaFreeMemory.Call(uintptr(unsafe.Pointer(names))) //nolint:errcheck // cleanup: no action on error
268268
}
269269

270270
// status == 0 means success, 0xC0000073 (STATUS_NONE_MAPPED) means SID not found
@@ -284,9 +284,7 @@ func lookupSID(sidString string) (*ResolvedSID, error) {
284284
if names.DomainIndex >= 0 && domains != nil && uint32(names.DomainIndex) < domains.Entries {
285285
// Get the domain from the domain list
286286
domainPtr := unsafe.Pointer(domains.Domains)
287-
domainInfo := (*lsaTrustInformation)(unsafe.Pointer(
288-
uintptr(domainPtr) + uintptr(names.DomainIndex)*unsafe.Sizeof(lsaTrustInformation{}),
289-
))
287+
domainInfo := (*lsaTrustInformation)(unsafe.Add(domainPtr, uintptr(names.DomainIndex)*unsafe.Sizeof(lsaTrustInformation{})))
290288

291289
if domainInfo.Name.Buffer != nil {
292290
domainUTF16 := unsafe.Slice(domainInfo.Name.Buffer, domainInfo.Name.Length/2)

‎receiver/windowseventlogreceiver/receiver_windows.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"go.opentelemetry.io/collector/receiver"
1414
"go.uber.org/zap"
1515

16-
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver/internal/metadata"
17-
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver/internal/sidcache"
1816
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
1917
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator"
18+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver/internal/metadata"
19+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver/internal/sidcache"
2020
)
2121

2222
// newFactoryAdapter creates a factory for windowseventlog receiver

‎receiver/windowseventlogreceiver/receiver_windows_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"golang.org/x/sys/windows/registry"
2626
"golang.org/x/sys/windows/svc/eventlog"
2727

28-
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver/internal/metadata"
2928
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
3029
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator"
3130
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/windows"
31+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver/internal/metadata"
3232
)
3333

3434
func TestDefaultConfig(t *testing.T) {

‎receiver/windowseventlogreceiver/sid_enrichment_windows.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (s *sidEnrichingConsumer) ConsumeLogs(ctx context.Context, logs plog.Logs)
5151
scopeLogs := resourceLogs.ScopeLogs().At(j)
5252
for k := 0; k < scopeLogs.LogRecords().Len(); k++ {
5353
logRecord := scopeLogs.LogRecords().At(k)
54-
s.enrichLogRecord(ctx, logRecord)
54+
s.enrichLogRecord(logRecord)
5555
}
5656
}
5757
}
@@ -60,7 +60,7 @@ func (s *sidEnrichingConsumer) ConsumeLogs(ctx context.Context, logs plog.Logs)
6060
}
6161

6262
// enrichLogRecord enriches a single log record with SID resolution
63-
func (s *sidEnrichingConsumer) enrichLogRecord(ctx context.Context, record plog.LogRecord) {
63+
func (s *sidEnrichingConsumer) enrichLogRecord(record plog.LogRecord) {
6464
body := record.Body()
6565
if body.Type() != pcommon.ValueTypeMap {
6666
return

‎receiver/windowseventlogreceiver/sid_enrichment_windows_test.go‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package windowseventlogreceiver
77

88
import (
9-
"context"
109
"errors"
1110
"testing"
1211

@@ -32,11 +31,11 @@ func (m *mockCache) Resolve(sid string) (*sidcache.ResolvedSID, error) {
3231
return nil, errors.New("not implemented")
3332
}
3433

35-
func (m *mockCache) Close() error {
34+
func (*mockCache) Close() error {
3635
return nil
3736
}
3837

39-
func (m *mockCache) Stats() sidcache.Stats {
38+
func (*mockCache) Stats() sidcache.Stats {
4039
return sidcache.Stats{}
4140
}
4241

@@ -72,7 +71,7 @@ func TestSIDEnrichingConsumer_ConsumeLogs_NilCache(t *testing.T) {
7271
lr := sl.LogRecords().AppendEmpty()
7372
lr.Body().SetStr("test log")
7473

75-
err := consumer.ConsumeLogs(context.Background(), logs)
74+
err := consumer.ConsumeLogs(t.Context(), logs)
7675
require.NoError(t, err)
7776
assert.Equal(t, 1, nextConsumer.LogRecordCount())
7877
}
@@ -106,7 +105,7 @@ func TestSIDEnrichingConsumer_EnrichSecurityField(t *testing.T) {
106105
securityMap := bodyMap.PutEmptyMap("security")
107106
securityMap.PutStr("user_id", testSID)
108107

109-
err := consumer.ConsumeLogs(context.Background(), logs)
108+
err := consumer.ConsumeLogs(t.Context(), logs)
110109
require.NoError(t, err)
111110

112111
// Verify enrichment
@@ -137,7 +136,7 @@ func TestSIDEnrichingConsumer_EnrichSecurityField(t *testing.T) {
137136

138137
func TestSIDEnrichingConsumer_EnrichSecurityField_NoSecurityMap(t *testing.T) {
139138
cache := &mockCache{
140-
resolveFunc: func(sid string) (*sidcache.ResolvedSID, error) {
139+
resolveFunc: func(_ string) (*sidcache.ResolvedSID, error) {
141140
return &sidcache.ResolvedSID{AccountName: "TEST"}, nil
142141
},
143142
}
@@ -151,14 +150,14 @@ func TestSIDEnrichingConsumer_EnrichSecurityField_NoSecurityMap(t *testing.T) {
151150
lr := sl.LogRecords().AppendEmpty()
152151
lr.Body().SetStr("no security map")
153152

154-
err := consumer.ConsumeLogs(context.Background(), logs)
153+
err := consumer.ConsumeLogs(t.Context(), logs)
155154
require.NoError(t, err)
156155
assert.Equal(t, 1, nextConsumer.LogRecordCount())
157156
}
158157

159158
func TestSIDEnrichingConsumer_EnrichSecurityField_ResolveError(t *testing.T) {
160159
cache := &mockCache{
161-
resolveFunc: func(sid string) (*sidcache.ResolvedSID, error) {
160+
resolveFunc: func(_ string) (*sidcache.ResolvedSID, error) {
162161
return nil, errors.New("lookup failed")
163162
},
164163
}
@@ -175,7 +174,7 @@ func TestSIDEnrichingConsumer_EnrichSecurityField_ResolveError(t *testing.T) {
175174
securityMap := bodyMap.PutEmptyMap("security")
176175
securityMap.PutStr("user_id", "S-1-5-18")
177176

178-
err := consumer.ConsumeLogs(context.Background(), logs)
177+
err := consumer.ConsumeLogs(t.Context(), logs)
179178
require.NoError(t, err)
180179

181180
// Should still pass through without enrichment
@@ -240,7 +239,7 @@ func TestSIDEnrichingConsumer_EnrichEventDataArray(t *testing.T) {
240239
item2Map := item2.SetEmptyMap()
241240
item2Map.PutStr("TargetUserSid", testSID2)
242241

243-
err := consumer.ConsumeLogs(context.Background(), logs)
242+
err := consumer.ConsumeLogs(t.Context(), logs)
244243
require.NoError(t, err)
245244

246245
// Verify enrichment
@@ -312,7 +311,7 @@ func TestSIDEnrichingConsumer_EnrichEventDataMap(t *testing.T) {
312311
eventDataMap.PutStr("SubjectUserSid", testSID)
313312
eventDataMap.PutStr("OtherField", "some value")
314313

315-
err := consumer.ConsumeLogs(context.Background(), logs)
314+
err := consumer.ConsumeLogs(t.Context(), logs)
316315
require.NoError(t, err)
317316

318317
// Verify enrichment
@@ -355,7 +354,7 @@ func TestSIDEnrichingConsumer_EnrichEventDataMap(t *testing.T) {
355354

356355
func TestSIDEnrichingConsumer_EnrichEventDataMap_NoEventData(t *testing.T) {
357356
cache := &mockCache{
358-
resolveFunc: func(sid string) (*sidcache.ResolvedSID, error) {
357+
resolveFunc: func(_ string) (*sidcache.ResolvedSID, error) {
359358
return &sidcache.ResolvedSID{AccountName: "TEST"}, nil
360359
},
361360
}
@@ -369,14 +368,14 @@ func TestSIDEnrichingConsumer_EnrichEventDataMap_NoEventData(t *testing.T) {
369368
lr := sl.LogRecords().AppendEmpty()
370369
lr.Body().SetEmptyMap()
371370

372-
err := consumer.ConsumeLogs(context.Background(), logs)
371+
err := consumer.ConsumeLogs(t.Context(), logs)
373372
require.NoError(t, err)
374373
assert.Equal(t, 1, nextConsumer.LogRecordCount())
375374
}
376375

377376
func TestSIDEnrichingConsumer_EnrichEventDataMap_EmptyEventData(t *testing.T) {
378377
cache := &mockCache{
379-
resolveFunc: func(sid string) (*sidcache.ResolvedSID, error) {
378+
resolveFunc: func(_ string) (*sidcache.ResolvedSID, error) {
380379
return &sidcache.ResolvedSID{AccountName: "TEST"}, nil
381380
},
382381
}
@@ -392,7 +391,7 @@ func TestSIDEnrichingConsumer_EnrichEventDataMap_EmptyEventData(t *testing.T) {
392391
bodyMap := lr.Body().SetEmptyMap()
393392
bodyMap.PutEmptyMap("event_data")
394393

395-
err := consumer.ConsumeLogs(context.Background(), logs)
394+
err := consumer.ConsumeLogs(t.Context(), logs)
396395
require.NoError(t, err)
397396
assert.Equal(t, 1, nextConsumer.LogRecordCount())
398397
}
@@ -421,14 +420,14 @@ func TestSIDEnrichingConsumer_MultipleLogRecords(t *testing.T) {
421420
sl := rl.ScopeLogs().AppendEmpty()
422421

423422
// Add multiple log records
424-
for i := 0; i < 3; i++ {
423+
for range 3 {
425424
lr := sl.LogRecords().AppendEmpty()
426425
bodyMap := lr.Body().SetEmptyMap()
427426
securityMap := bodyMap.PutEmptyMap("security")
428427
securityMap.PutStr("user_id", testSID)
429428
}
430429

431-
err := consumer.ConsumeLogs(context.Background(), logs)
430+
err := consumer.ConsumeLogs(t.Context(), logs)
432431
require.NoError(t, err)
433432

434433
// All records should be enriched
@@ -438,7 +437,7 @@ func TestSIDEnrichingConsumer_MultipleLogRecords(t *testing.T) {
438437
records := consumedLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords()
439438
assert.Equal(t, 3, records.Len())
440439

441-
for i := 0; i < records.Len(); i++ {
440+
for i := range records.Len() {
442441
record := records.At(i)
443442
secVal, ok := record.Body().Map().Get("security")
444443
require.True(t, ok)
@@ -452,7 +451,7 @@ func TestSIDEnrichingConsumer_MultipleLogRecords(t *testing.T) {
452451

453452
func TestSIDEnrichingConsumer_NonMapBody(t *testing.T) {
454453
cache := &mockCache{
455-
resolveFunc: func(sid string) (*sidcache.ResolvedSID, error) {
454+
resolveFunc: func(_ string) (*sidcache.ResolvedSID, error) {
456455
return &sidcache.ResolvedSID{AccountName: "TEST"}, nil
457456
},
458457
}
@@ -466,7 +465,7 @@ func TestSIDEnrichingConsumer_NonMapBody(t *testing.T) {
466465
lr := sl.LogRecords().AppendEmpty()
467466
lr.Body().SetStr("string body, not a map")
468467

469-
err := consumer.ConsumeLogs(context.Background(), logs)
468+
err := consumer.ConsumeLogs(t.Context(), logs)
470469
require.NoError(t, err)
471470

472471
// Should pass through without error
@@ -503,7 +502,7 @@ func TestSIDEnrichingConsumer_UserIDField(t *testing.T) {
503502
eventDataMap := bodyMap.PutEmptyMap("event_data")
504503
eventDataMap.PutStr("UserID", testSID)
505504

506-
err := consumer.ConsumeLogs(context.Background(), logs)
505+
err := consumer.ConsumeLogs(t.Context(), logs)
507506
require.NoError(t, err)
508507

509508
// Verify enrichment

0 commit comments

Comments
 (0)