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.

Sign up for GitHub

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

{,x-pack/}auditbeat: remove unused fields and params and mark platform-specific code #30490

Merged
merged 1 commit into from
Feb 22, 2022
Merged

{,x-pack/}auditbeat: remove unused fields and params and mark platform-specific code #30490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions auditbeat/module/file_integrity/eventreader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ func changeGID(t testing.TB, file string) int {

// mustRun runs a sub-test and stops the execution of the parent if the sub-test
// fails.
//lint:ignore U1000 Used in unconditionally skipped flakey tests.
Copy link
Member

Choose a reason for hiding this comment

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

IIUC this is a comment for staticcheck. If we decide to standardize on golangci-lint then will this need to change to the //nolint:staticcheck // <comment> format?

Copy link
Contributor Author

@efd6 efd6 Feb 22, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, this needs discussion. It would be good if golangci-lint honoured its dependencies' linter directives (this is golangci/golangci-lint#1658). In the past the coverage of lint classes by staticcheck was quite a lot less than for the metalinters, this is less true now (vim-go defaults now to staticcheck now and gopls integrates it (currently experimentally)), so when incremental linting is possible with staticcheck I think that is would be the better option (also for the reason of the default-on .so loading that golangci-lint does). These were in my thinking when I wrote this, with the view that it could be changed down the track if an alternative decision were made.

func mustRun(t *testing.T, name string, f func(t *testing.T)) {
if !t.Run(name, f) {
t.FailNow()
Expand Down
4 changes: 2 additions & 2 deletions x-pack/auditbeat/module/system/package/rpm_common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// or more contributor license agreements. Licensed under the Elastic License;
// you may not use this file except in compliance with the Elastic License.

//go:build !windows
// +build !windows
//go:build linux
// +build linux

package pkg

Expand Down
3 changes: 3 additions & 0 deletions x-pack/auditbeat/module/system/socket/dns/afpacket/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
// or more contributor license agreements. Licensed under the Elastic License;
// you may not use this file except in compliance with the Elastic License.

//go:build linux
// +build linux

package afpacket

type config struct {
Expand Down
6 changes: 2 additions & 4 deletions x-pack/auditbeat/module/system/socket/guess/creds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@ func init() {
}
}

type guessStructCreds struct {
ctx Context
}
type guessStructCreds struct{}

// Name of this guess.
func (g *guessStructCreds) Name() string {
Expand Down Expand Up @@ -100,7 +98,7 @@ func (g *guessStructCreds) Probes() ([]helper.ProbeDef, error) {
}

// Prepare is a no-op.
func (g *guessStructCreds) Prepare(ctx Context) error {
func (g *guessStructCreds) Prepare(Context) error {
return nil
}

Expand Down
3 changes: 3 additions & 0 deletions x-pack/auditbeat/module/system/user/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
// or more contributor license agreements. Licensed under the Elastic License;
// you may not use this file except in compliance with the Elastic License.

//go:build linux && cgo
// +build linux,cgo

package user

import (
Expand Down