From db79dba8a0338060afe065b2c0e0677e4ac3d7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20G=C3=B6gge?= Date: Wed, 7 Aug 2024 13:44:04 +0200 Subject: [PATCH] ci/goimports: group cilium/ebpf imports after 3rd party imports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robin Gögge --- .golangci.yaml | 6 ++++++ btf/types_test.go | 3 ++- cmd/bpf2go/main_test.go | 3 ++- internal/epoll/poller_test.go | 3 ++- link/uprobe_multi_test.go | 3 ++- link/xdp_test.go | 3 ++- 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 65f91b910..366d4893f 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -11,3 +11,9 @@ linters: - typecheck - unused - gofmt +linters-settings: + goimports: + # A comma-separated list of prefixes, which, if set, checks import paths + # with the given prefixes are grouped after 3rd-party packages. + # Default: "" + local-prefixes: github.com/cilium/ebpf diff --git a/btf/types_test.go b/btf/types_test.go index 95ddb9dae..24583b553 100644 --- a/btf/types_test.go +++ b/btf/types_test.go @@ -8,9 +8,10 @@ import ( "reflect" "testing" - "github.com/cilium/ebpf/internal/testutils" "github.com/go-quicktest/qt" "github.com/google/go-cmp/cmp" + + "github.com/cilium/ebpf/internal/testutils" ) func TestSizeof(t *testing.T) { diff --git a/cmd/bpf2go/main_test.go b/cmd/bpf2go/main_test.go index 218bb8742..5cf5cf027 100644 --- a/cmd/bpf2go/main_test.go +++ b/cmd/bpf2go/main_test.go @@ -10,10 +10,11 @@ import ( "strings" "testing" + "github.com/go-quicktest/qt" + "github.com/cilium/ebpf/cmd/bpf2go/gen" "github.com/cilium/ebpf/cmd/bpf2go/internal" "github.com/cilium/ebpf/internal/testutils" - "github.com/go-quicktest/qt" ) const minimalSocketFilter = `__attribute__((section("socket"), used)) int main() { return 0; }` diff --git a/internal/epoll/poller_test.go b/internal/epoll/poller_test.go index 98f949419..cac4493f8 100644 --- a/internal/epoll/poller_test.go +++ b/internal/epoll/poller_test.go @@ -7,8 +7,9 @@ import ( "testing" "time" - "github.com/cilium/ebpf/internal/unix" "github.com/go-quicktest/qt" + + "github.com/cilium/ebpf/internal/unix" ) func TestPoller(t *testing.T) { diff --git a/link/uprobe_multi_test.go b/link/uprobe_multi_test.go index 65f0e4303..6bee216fa 100644 --- a/link/uprobe_multi_test.go +++ b/link/uprobe_multi_test.go @@ -7,9 +7,10 @@ import ( "os/exec" "testing" + "github.com/go-quicktest/qt" + "github.com/cilium/ebpf" "github.com/cilium/ebpf/internal/testutils" - "github.com/go-quicktest/qt" ) func TestUprobeMulti(t *testing.T) { diff --git a/link/xdp_test.go b/link/xdp_test.go index c25deb140..67bc27004 100644 --- a/link/xdp_test.go +++ b/link/xdp_test.go @@ -4,9 +4,10 @@ import ( "math" "testing" + "github.com/go-quicktest/qt" + "github.com/cilium/ebpf" "github.com/cilium/ebpf/internal/testutils" - "github.com/go-quicktest/qt" ) const IfIndexLO = 1