Skip to content

Fix master's linting issue #26517

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

Merged
merged 2 commits into from
Jun 28, 2021
Merged

Fix master's linting issue #26517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b231e41
Fix master's linting issue
ChrsMark Jun 28, 2021
6dd5a11
Remove empty lines
ChrsMark Jun 28, 2021
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
3 changes: 2 additions & 1 deletion x-pack/osquerybeat/beater/config_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import (
"path/filepath"
"testing"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/google/go-cmp/cmp"

"github.com/elastic/beats/v7/libbeat/logp"

Copy link
Contributor

@mtojek mtojek Jun 28, 2021

Choose a reason for hiding this comment

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

nit: should there be an empty line?

Copy link
Member Author

@ChrsMark ChrsMark Jun 28, 2021

Choose a reason for hiding this comment

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

This is what mage ftm gave, but yes removing is ok. Thanks!

"github.com/elastic/beats/v7/x-pack/osquerybeat/internal/testutil"
)

Expand Down
3 changes: 2 additions & 1 deletion x-pack/osquerybeat/beater/logger_plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import (
"context"
"encoding/json"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/kolide/osquery-go/plugin/logger"

"github.com/elastic/beats/v7/libbeat/logp"
)

type SnapshotResult struct {
Expand Down
3 changes: 2 additions & 1 deletion x-pack/osquerybeat/beater/logger_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ import (
"encoding/json"
"testing"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/google/go-cmp/cmp"
"github.com/kolide/osquery-go/plugin/logger"

"github.com/elastic/beats/v7/libbeat/logp"

Copy link
Contributor

@mtojek mtojek Jun 28, 2021

Choose a reason for hiding this comment

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

nit: same here

"github.com/elastic/beats/v7/x-pack/osquerybeat/internal/testutil"
)

Expand Down
3 changes: 2 additions & 1 deletion x-pack/osquerybeat/internal/osqd/osqueryd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ import (
"time"

"github.com/dolmen-go/contextio"
"github.com/elastic/beats/v7/libbeat/logp"
"github.com/pkg/errors"

"github.com/elastic/beats/v7/libbeat/logp"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion x-pack/osquerybeat/internal/osqd/osqueryd_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ import (

"github.com/gofrs/uuid"
)

const (
extensionName = "osquery-extension.exe"
extensionName = "osquery-extension.exe"
)

func CreateSocketPath() (string, func(), error) {
Expand Down
3 changes: 2 additions & 1 deletion x-pack/osquerybeat/internal/osqdcli/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import (

"golang.org/x/sync/semaphore"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/kolide/osquery-go"

"github.com/elastic/beats/v7/libbeat/logp"
)

const (
Expand Down