From c0c4677a6734338b475e3b8ccd08a3ed47215eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geyslan=20Greg=C3=B3rio?= Date: Mon, 10 Jun 2024 16:54:31 -0300 Subject: [PATCH] chore: use errfmt module --- cmd/tracee-rules/input.go | 2 +- cmd/tracee-rules/output.go | 2 +- cmd/tracee/cmd/man.go | 2 +- cmd/tracee/cmd/root.go | 2 +- errfmt/go.mod | 10 ++++++++++ errfmt/go.sum | 6 ++++++ go.mod | 6 +++++- pkg/bucketscache/bucketscache.go | 2 +- pkg/bufferdecoder/decoder.go | 2 +- pkg/bufferdecoder/eventsreader.go | 2 +- pkg/capabilities/capabilities.go | 2 +- pkg/cgroup/cgroup.go | 2 +- pkg/cmd/cobra/cobra.go | 2 +- pkg/cmd/cobra/config.go | 2 +- pkg/cmd/flags/cache.go | 2 +- pkg/cmd/flags/capabilities.go | 2 +- pkg/cmd/flags/capture.go | 2 +- pkg/cmd/flags/containers.go | 2 +- pkg/cmd/flags/event.go | 2 +- pkg/cmd/flags/grpc.go | 2 +- pkg/cmd/flags/logger.go | 2 +- pkg/cmd/flags/output.go | 2 +- pkg/cmd/flags/policy.go | 2 +- pkg/cmd/flags/rego.go | 2 +- pkg/cmd/flags/scope.go | 2 +- pkg/cmd/flags/server/server.go | 2 +- pkg/cmd/flags/tracee_ebpf_output.go | 2 +- pkg/cmd/initialize/bpfobject.go | 2 +- pkg/cmd/printer/printer.go | 2 +- pkg/cmd/tracee.go | 2 +- pkg/cmd/urfave/urfave.go | 2 +- pkg/config/config.go | 2 +- pkg/containers/containers.go | 2 +- pkg/containers/path_resolver.go | 2 +- pkg/containers/runtime/containerd.go | 2 +- pkg/containers/runtime/crio.go | 2 +- pkg/containers/runtime/docker.go | 2 +- pkg/containers/runtime/sockets.go | 2 +- pkg/containers/service.go | 2 +- pkg/ebpf/bpf_log.go | 2 +- pkg/ebpf/capture.go | 2 +- pkg/ebpf/config.go | 2 +- pkg/ebpf/controlplane/cgroups.go | 2 +- pkg/ebpf/controlplane/signal.go | 2 +- pkg/ebpf/events_enrich.go | 2 +- pkg/ebpf/events_pipeline.go | 2 +- pkg/ebpf/finding.go | 2 +- pkg/ebpf/initialization/kconfig.go | 2 +- pkg/ebpf/ksymbols.go | 2 +- pkg/ebpf/probes/cgroup.go | 2 +- pkg/ebpf/probes/common.go | 2 +- pkg/ebpf/probes/probe_group.go | 2 +- pkg/ebpf/probes/trace.go | 2 +- pkg/ebpf/probes/uprobe.go | 2 +- pkg/ebpf/processor_funcs.go | 2 +- pkg/ebpf/tracee.go | 2 +- pkg/events/definition_group.go | 2 +- pkg/events/derive/container_create.go | 2 +- pkg/events/derive/container_remove.go | 2 +- pkg/events/derive/hooked_seq_ops.go | 2 +- pkg/events/derive/hooked_syscall.go | 2 +- pkg/events/derive/net_packet.go | 2 +- pkg/events/derive/net_tcp.go | 2 +- pkg/events/derive/symbols_collision.go | 2 +- pkg/events/derive/symbols_loaded.go | 2 +- pkg/events/parse/params.go | 2 +- pkg/events/parse_args.go | 2 +- pkg/events/sorting/cpu_queue.go | 2 +- pkg/events/sorting/pool.go | 2 +- pkg/events/sorting/queue.go | 2 +- pkg/events/sorting/sorting.go | 2 +- pkg/events/trigger/context.go | 2 +- pkg/filehash/hash.go | 2 +- pkg/filehash/hash_test.go | 2 +- pkg/filehash/key.go | 2 +- pkg/filters/binary.go | 2 +- pkg/filters/data.go | 2 +- pkg/filters/int.go | 2 +- pkg/filters/processtree.go | 2 +- pkg/filters/retval.go | 2 +- pkg/filters/scope.go | 2 +- pkg/filters/string.go | 2 +- pkg/filters/uint.go | 2 +- pkg/metrics/stats.go | 2 +- pkg/mount/mount.go | 2 +- pkg/pcaps/cache.go | 2 +- pkg/pcaps/common.go | 2 +- pkg/pcaps/pcap.go | 2 +- pkg/pcaps/pcaps.go | 2 +- pkg/policy/ebpf.go | 2 +- pkg/policy/snapshots.go | 2 +- pkg/policy/v1beta1/policy_file.go | 2 +- pkg/proctree/proctree.go | 2 +- pkg/proctree/proctree_feed.go | 2 +- pkg/proctree/proctree_procfs.go | 2 +- pkg/server/grpc/event_data.go | 2 +- pkg/utils/environment/amount_cpus.go | 2 +- pkg/utils/files.go | 2 +- pkg/utils/proc/exe.go | 2 +- pkg/utils/proc/ns.go | 2 +- pkg/utils/proc/stat.go | 2 +- pkg/utils/sharedobjs/container_symbols_loader.go | 2 +- pkg/utils/sharedobjs/host_symbols_loader.go | 2 +- 103 files changed, 121 insertions(+), 101 deletions(-) create mode 100644 errfmt/go.mod create mode 100644 errfmt/go.sum diff --git a/cmd/tracee-rules/input.go b/cmd/tracee-rules/input.go index 8265069aa5b3..a6668f9b0d4a 100644 --- a/cmd/tracee-rules/input.go +++ b/cmd/tracee-rules/input.go @@ -9,9 +9,9 @@ import ( "kernel.org/pub/linux/libs/security/libcap/cap" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/capabilities" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/types/protocol" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/cmd/tracee-rules/output.go b/cmd/tracee-rules/output.go index aeaf96af3556..5450d681259d 100644 --- a/cmd/tracee-rules/output.go +++ b/cmd/tracee-rules/output.go @@ -10,8 +10,8 @@ import ( "github.com/Masterminds/sprig/v3" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/types/detect" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/cmd/tracee/cmd/man.go b/cmd/tracee/cmd/man.go index 3bb36b4d7b96..935e69eb229e 100644 --- a/cmd/tracee/cmd/man.go +++ b/cmd/tracee/cmd/man.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) func init() { diff --git a/cmd/tracee/cmd/root.go b/cmd/tracee/cmd/root.go index da540fd48a83..4cf5c1177630 100644 --- a/cmd/tracee/cmd/root.go +++ b/cmd/tracee/cmd/root.go @@ -11,11 +11,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" cmdcobra "github.com/aquasecurity/tracee/pkg/cmd/cobra" "github.com/aquasecurity/tracee/pkg/cmd/flags/server" "github.com/aquasecurity/tracee/pkg/cmd/initialize" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/version" ) diff --git a/errfmt/go.mod b/errfmt/go.mod new file mode 100644 index 000000000000..c0e81da34682 --- /dev/null +++ b/errfmt/go.mod @@ -0,0 +1,10 @@ +module github.com/aquasecurity/tracee/errfmt + +go 1.22.0 + +require gotest.tools v2.2.0+incompatible + +require ( + github.com/google/go-cmp v0.6.0 // indirect + github.com/pkg/errors v0.9.1 // indirect +) diff --git a/errfmt/go.sum b/errfmt/go.sum new file mode 100644 index 000000000000..9621089c488d --- /dev/null +++ b/errfmt/go.sum @@ -0,0 +1,6 @@ +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= diff --git a/go.mod b/go.mod index 5418999ef426..3d4bc2b7d704 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/Masterminds/sprig/v3 v3.2.3 github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4 github.com/aquasecurity/tracee/api v0.0.0-20240607205742-90c301111aee + github.com/aquasecurity/tracee/errfmt v0.0.0-00010101000000-000000000000 github.com/aquasecurity/tracee/logger v0.0.0-00010101000000-000000000000 github.com/aquasecurity/tracee/signatures/helpers v0.0.0-20240607205742-90c301111aee github.com/aquasecurity/tracee/types v0.0.0-20240607205742-90c301111aee @@ -180,4 +181,7 @@ require ( ) // To be removed in a sequential PR -replace github.com/aquasecurity/tracee/logger => ./logger +replace ( + github.com/aquasecurity/tracee/errfmt => ./errfmt + github.com/aquasecurity/tracee/logger => ./logger +) diff --git a/pkg/bucketscache/bucketscache.go b/pkg/bucketscache/bucketscache.go index 757d36c3f1a2..1664f5705f24 100644 --- a/pkg/bucketscache/bucketscache.go +++ b/pkg/bucketscache/bucketscache.go @@ -3,7 +3,7 @@ package bucketscache import ( "sync" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) type BucketsCache struct { diff --git a/pkg/bufferdecoder/decoder.go b/pkg/bufferdecoder/decoder.go index c732bc6c5eb9..475c1e92bc33 100644 --- a/pkg/bufferdecoder/decoder.go +++ b/pkg/bufferdecoder/decoder.go @@ -10,8 +10,8 @@ import ( "encoding/binary" "errors" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/bufferdecoder/eventsreader.go b/pkg/bufferdecoder/eventsreader.go index c0ceadaccb53..dd330aa1de48 100644 --- a/pkg/bufferdecoder/eventsreader.go +++ b/pkg/bufferdecoder/eventsreader.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parsers" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/capabilities/capabilities.go b/pkg/capabilities/capabilities.go index 1a56df9fdec1..06a8ebced257 100644 --- a/pkg/capabilities/capabilities.go +++ b/pkg/capabilities/capabilities.go @@ -9,8 +9,8 @@ import ( "kernel.org/pub/linux/libs/security/libcap/cap" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) var caps *Capabilities // singleton for all packages diff --git a/pkg/cgroup/cgroup.go b/pkg/cgroup/cgroup.go index 0c5c3afb8f05..9243b65d45cf 100644 --- a/pkg/cgroup/cgroup.go +++ b/pkg/cgroup/cgroup.go @@ -10,8 +10,8 @@ import ( "syscall" "time" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/mount" ) diff --git a/pkg/cmd/cobra/cobra.go b/pkg/cmd/cobra/cobra.go index 06e1b01828fe..08e90bcf7071 100644 --- a/pkg/cmd/cobra/cobra.go +++ b/pkg/cmd/cobra/cobra.go @@ -6,6 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/cmd" "github.com/aquasecurity/tracee/pkg/cmd/flags" @@ -13,7 +14,6 @@ import ( "github.com/aquasecurity/tracee/pkg/cmd/initialize" "github.com/aquasecurity/tracee/pkg/cmd/printer" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/k8s" "github.com/aquasecurity/tracee/pkg/k8s/apis/tracee.aquasec.com/v1beta1" diff --git a/pkg/cmd/cobra/config.go b/pkg/cmd/cobra/config.go index 9f2cc27d4b84..4976fc328ad9 100644 --- a/pkg/cmd/cobra/config.go +++ b/pkg/cmd/cobra/config.go @@ -7,7 +7,7 @@ import ( "github.com/mitchellh/mapstructure" "github.com/spf13/viper" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) type cliFlagger interface { diff --git a/pkg/cmd/flags/cache.go b/pkg/cmd/flags/cache.go index a8d6c16bfcbe..ec1add9ab558 100644 --- a/pkg/cmd/flags/cache.go +++ b/pkg/cmd/flags/cache.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events/queue" ) diff --git a/pkg/cmd/flags/capabilities.go b/pkg/cmd/flags/capabilities.go index 538284454c86..a39c5cd298e9 100644 --- a/pkg/cmd/flags/capabilities.go +++ b/pkg/cmd/flags/capabilities.go @@ -3,9 +3,9 @@ package flags import ( "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/capabilities" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" ) func capabilitiesHelp() string { diff --git a/pkg/cmd/flags/capture.go b/pkg/cmd/flags/capture.go index e56e5b1b1c70..27916aa2ecf1 100644 --- a/pkg/cmd/flags/capture.go +++ b/pkg/cmd/flags/capture.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" ) func captureHelp() string { diff --git a/pkg/cmd/flags/containers.go b/pkg/cmd/flags/containers.go index 2afbb30790e7..f32ac979551a 100644 --- a/pkg/cmd/flags/containers.go +++ b/pkg/cmd/flags/containers.go @@ -3,9 +3,9 @@ package flags import ( "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/containers/runtime" - "github.com/aquasecurity/tracee/pkg/errfmt" ) func containersHelp() string { diff --git a/pkg/cmd/flags/event.go b/pkg/cmd/flags/event.go index b1343c24c481..c81cbb1ac297 100644 --- a/pkg/cmd/flags/event.go +++ b/pkg/cmd/flags/event.go @@ -3,7 +3,7 @@ package flags import ( "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) // PolicyEventMap maps policy id to its pre-parsed event flag fields diff --git a/pkg/cmd/flags/grpc.go b/pkg/cmd/flags/grpc.go index 1ae4c9cde0e6..06ea37d4eaae 100644 --- a/pkg/cmd/flags/grpc.go +++ b/pkg/cmd/flags/grpc.go @@ -4,7 +4,7 @@ import ( "os" "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/server/grpc" ) diff --git a/pkg/cmd/flags/logger.go b/pkg/cmd/flags/logger.go index a506fba89be7..9df7dba6c884 100644 --- a/pkg/cmd/flags/logger.go +++ b/pkg/cmd/flags/logger.go @@ -7,8 +7,8 @@ import ( "time" "unicode" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) func logHelp() string { diff --git a/pkg/cmd/flags/output.go b/pkg/cmd/flags/output.go index 668b56cd3609..3a089932d303 100644 --- a/pkg/cmd/flags/output.go +++ b/pkg/cmd/flags/output.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" ) type PrepareOutputResult struct { diff --git a/pkg/cmd/flags/policy.go b/pkg/cmd/flags/policy.go index 052d2c8028ba..a2e669062714 100644 --- a/pkg/cmd/flags/policy.go +++ b/pkg/cmd/flags/policy.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/filters" k8s "github.com/aquasecurity/tracee/pkg/k8s/apis/tracee.aquasec.com/v1beta1" diff --git a/pkg/cmd/flags/rego.go b/pkg/cmd/flags/rego.go index a4533f6d09d6..58023e81a88b 100644 --- a/pkg/cmd/flags/rego.go +++ b/pkg/cmd/flags/rego.go @@ -5,7 +5,7 @@ import ( "github.com/open-policy-agent/opa/compile" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/signatures/rego" ) diff --git a/pkg/cmd/flags/scope.go b/pkg/cmd/flags/scope.go index 4c56d87a5ee1..ab624836f314 100644 --- a/pkg/cmd/flags/scope.go +++ b/pkg/cmd/flags/scope.go @@ -3,7 +3,7 @@ package flags import ( "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) // PolicyScopeMap maps policy id to its pre-parsed scope flag fields diff --git a/pkg/cmd/flags/server/server.go b/pkg/cmd/flags/server/server.go index 6a78ed97a775..47619ef2bdb1 100644 --- a/pkg/cmd/flags/server/server.go +++ b/pkg/cmd/flags/server/server.go @@ -1,8 +1,8 @@ package server import ( + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/server/http" ) diff --git a/pkg/cmd/flags/tracee_ebpf_output.go b/pkg/cmd/flags/tracee_ebpf_output.go index 24f5957ff98b..c79b7856acb7 100644 --- a/pkg/cmd/flags/tracee_ebpf_output.go +++ b/pkg/cmd/flags/tracee_ebpf_output.go @@ -4,8 +4,8 @@ import ( "os" "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" ) func outputHelp() string { diff --git a/pkg/cmd/initialize/bpfobject.go b/pkg/cmd/initialize/bpfobject.go index e2b7d6219e8b..8f254fc83ab6 100644 --- a/pkg/cmd/initialize/bpfobject.go +++ b/pkg/cmd/initialize/bpfobject.go @@ -8,9 +8,9 @@ import ( "strings" embed "github.com/aquasecurity/tracee" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils/environment" ) diff --git a/pkg/cmd/printer/printer.go b/pkg/cmd/printer/printer.go index 688052178a13..3dba39fff98f 100644 --- a/pkg/cmd/printer/printer.go +++ b/pkg/cmd/printer/printer.go @@ -16,9 +16,9 @@ import ( forward "github.com/IBM/fluent-forward-go/fluent/client" "github.com/Masterminds/sprig/v3" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/metrics" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/cmd/tracee.go b/pkg/cmd/tracee.go index 01da8360d0d5..e81b808b80a1 100644 --- a/pkg/cmd/tracee.go +++ b/pkg/cmd/tracee.go @@ -6,11 +6,11 @@ import ( "strconv" "syscall" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/cmd/printer" "github.com/aquasecurity/tracee/pkg/config" tracee "github.com/aquasecurity/tracee/pkg/ebpf" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/server/grpc" "github.com/aquasecurity/tracee/pkg/server/http" "github.com/aquasecurity/tracee/pkg/utils" diff --git a/pkg/cmd/urfave/urfave.go b/pkg/cmd/urfave/urfave.go index 99983927339c..92609e990a02 100644 --- a/pkg/cmd/urfave/urfave.go +++ b/pkg/cmd/urfave/urfave.go @@ -3,6 +3,7 @@ package urfave import ( cli "github.com/urfave/cli/v2" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/cmd" "github.com/aquasecurity/tracee/pkg/cmd/flags" @@ -10,7 +11,6 @@ import ( "github.com/aquasecurity/tracee/pkg/cmd/initialize" "github.com/aquasecurity/tracee/pkg/cmd/printer" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/policy" "github.com/aquasecurity/tracee/pkg/utils/environment" ) diff --git a/pkg/config/config.go b/pkg/config/config.go index c60c202612db..21c6bdd0edd7 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -3,9 +3,9 @@ package config import ( "io" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/containers/runtime" "github.com/aquasecurity/tracee/pkg/dnscache" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events/queue" "github.com/aquasecurity/tracee/pkg/policy" "github.com/aquasecurity/tracee/pkg/proctree" diff --git a/pkg/containers/containers.go b/pkg/containers/containers.go index fce4544d78df..2ba9ac110308 100644 --- a/pkg/containers/containers.go +++ b/pkg/containers/containers.go @@ -17,10 +17,10 @@ import ( "github.com/aquasecurity/libbpfgo" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/cgroup" cruntime "github.com/aquasecurity/tracee/pkg/containers/runtime" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/k8s" ) diff --git a/pkg/containers/path_resolver.go b/pkg/containers/path_resolver.go index ffd76bafce61..69aeea99f115 100644 --- a/pkg/containers/path_resolver.go +++ b/pkg/containers/path_resolver.go @@ -7,9 +7,9 @@ import ( "os" "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/bucketscache" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // ContainerPathResolver generates an accessible absolute path from the root diff --git a/pkg/containers/runtime/containerd.go b/pkg/containers/runtime/containerd.go index 1f1604521fd8..0ca46e2d7c9b 100644 --- a/pkg/containers/runtime/containerd.go +++ b/pkg/containers/runtime/containerd.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/credentials/insecure" cri "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) type containerdEnricher struct { diff --git a/pkg/containers/runtime/crio.go b/pkg/containers/runtime/crio.go index 45640fac3ba3..d9249c774f30 100644 --- a/pkg/containers/runtime/crio.go +++ b/pkg/containers/runtime/crio.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/credentials/insecure" cri "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) type crioEnricher struct { diff --git a/pkg/containers/runtime/docker.go b/pkg/containers/runtime/docker.go index bb514088b700..3e56603b3532 100644 --- a/pkg/containers/runtime/docker.go +++ b/pkg/containers/runtime/docker.go @@ -6,7 +6,7 @@ import ( docker "github.com/docker/docker/client" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) type dockerEnricher struct { diff --git a/pkg/containers/runtime/sockets.go b/pkg/containers/runtime/sockets.go index e4f3682cd7e1..68439ebed97d 100644 --- a/pkg/containers/runtime/sockets.go +++ b/pkg/containers/runtime/sockets.go @@ -3,7 +3,7 @@ package runtime import ( "os" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) // Sockets represent existing container runtime connections diff --git a/pkg/containers/service.go b/pkg/containers/service.go index a0bcf6089e40..49aceffb6319 100644 --- a/pkg/containers/service.go +++ b/pkg/containers/service.go @@ -3,8 +3,8 @@ package containers import ( "context" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/containers/runtime" - "github.com/aquasecurity/tracee/pkg/errfmt" ) type runtimeInfoService struct { diff --git a/pkg/ebpf/bpf_log.go b/pkg/ebpf/bpf_log.go index 065ca789f336..2379fe5090e5 100644 --- a/pkg/ebpf/bpf_log.go +++ b/pkg/ebpf/bpf_log.go @@ -7,8 +7,8 @@ import ( "strings" "unsafe" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) const BPFMaxLogFileLen = 72 // BPF_MAX_LOG_FILE_LEN diff --git a/pkg/ebpf/capture.go b/pkg/ebpf/capture.go index 76b236ae32f7..9e4ed1449a29 100644 --- a/pkg/ebpf/capture.go +++ b/pkg/ebpf/capture.go @@ -9,9 +9,9 @@ import ( "path" "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/bufferdecoder" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/ebpf/config.go b/pkg/ebpf/config.go index b423b330c166..6db81650e13e 100644 --- a/pkg/ebpf/config.go +++ b/pkg/ebpf/config.go @@ -5,7 +5,7 @@ import ( bpf "github.com/aquasecurity/libbpfgo" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/policy" ) diff --git a/pkg/ebpf/controlplane/cgroups.go b/pkg/ebpf/controlplane/cgroups.go index 39a2bc0b2906..a44cedc0bffa 100644 --- a/pkg/ebpf/controlplane/cgroups.go +++ b/pkg/ebpf/controlplane/cgroups.go @@ -1,9 +1,9 @@ package controlplane import ( + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/capabilities" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/ebpf/controlplane/signal.go b/pkg/ebpf/controlplane/signal.go index 983fc2eea9a4..38d094b47aff 100644 --- a/pkg/ebpf/controlplane/signal.go +++ b/pkg/ebpf/controlplane/signal.go @@ -1,8 +1,8 @@ package controlplane import ( + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/bufferdecoder" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/ebpf/events_enrich.go b/pkg/ebpf/events_enrich.go index 95b0ce032944..b74ca8cbca3d 100644 --- a/pkg/ebpf/events_enrich.go +++ b/pkg/ebpf/events_enrich.go @@ -4,11 +4,11 @@ import ( gocontext "context" "sync" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/cgroup" "github.com/aquasecurity/tracee/pkg/containers" "github.com/aquasecurity/tracee/pkg/containers/runtime" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/ebpf/events_pipeline.go b/pkg/ebpf/events_pipeline.go index d472730bc6bd..0f042a1bdf33 100644 --- a/pkg/ebpf/events_pipeline.go +++ b/pkg/ebpf/events_pipeline.go @@ -8,9 +8,9 @@ import ( "sync" "unsafe" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/bufferdecoder" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/policy" "github.com/aquasecurity/tracee/pkg/utils" diff --git a/pkg/ebpf/finding.go b/pkg/ebpf/finding.go index 08ea68f49e9b..8841659af874 100644 --- a/pkg/ebpf/finding.go +++ b/pkg/ebpf/finding.go @@ -1,7 +1,7 @@ package ebpf import ( - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/types/detect" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/ebpf/initialization/kconfig.go b/pkg/ebpf/initialization/kconfig.go index b0c270781488..a17e3977731b 100644 --- a/pkg/ebpf/initialization/kconfig.go +++ b/pkg/ebpf/initialization/kconfig.go @@ -1,8 +1,8 @@ package initialization import ( + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils/environment" ) diff --git a/pkg/ebpf/ksymbols.go b/pkg/ebpf/ksymbols.go index d92761ecdaf7..1e8f8f50a7dd 100644 --- a/pkg/ebpf/ksymbols.go +++ b/pkg/ebpf/ksymbols.go @@ -3,8 +3,8 @@ package ebpf import ( "unsafe" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" ) diff --git a/pkg/ebpf/probes/cgroup.go b/pkg/ebpf/probes/cgroup.go index d59526d7bf61..999be339f2bc 100644 --- a/pkg/ebpf/probes/cgroup.go +++ b/pkg/ebpf/probes/cgroup.go @@ -3,9 +3,9 @@ package probes import ( bpf "github.com/aquasecurity/libbpfgo" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/capabilities" "github.com/aquasecurity/tracee/pkg/cgroup" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // NOTE: thread-safety guaranteed by the ProbeGroup big lock. diff --git a/pkg/ebpf/probes/common.go b/pkg/ebpf/probes/common.go index 6acec15e7e11..60f30f0c0e23 100644 --- a/pkg/ebpf/probes/common.go +++ b/pkg/ebpf/probes/common.go @@ -3,7 +3,7 @@ package probes import ( bpf "github.com/aquasecurity/libbpfgo" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) // enableDisableAutoload enables or disables an eBPF program automatic attachment to/from its hook. diff --git a/pkg/ebpf/probes/probe_group.go b/pkg/ebpf/probes/probe_group.go index 284fdd84f4cb..7c83414f728c 100644 --- a/pkg/ebpf/probes/probe_group.go +++ b/pkg/ebpf/probes/probe_group.go @@ -5,8 +5,8 @@ import ( bpf "github.com/aquasecurity/libbpfgo" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // diff --git a/pkg/ebpf/probes/trace.go b/pkg/ebpf/probes/trace.go index 78f46f6a9149..2100f1b14688 100644 --- a/pkg/ebpf/probes/trace.go +++ b/pkg/ebpf/probes/trace.go @@ -5,8 +5,8 @@ import ( bpf "github.com/aquasecurity/libbpfgo" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils/environment" ) diff --git a/pkg/ebpf/probes/uprobe.go b/pkg/ebpf/probes/uprobe.go index e693d352912b..4326b8ccbe91 100644 --- a/pkg/ebpf/probes/uprobe.go +++ b/pkg/ebpf/probes/uprobe.go @@ -3,7 +3,7 @@ package probes import ( bpf "github.com/aquasecurity/libbpfgo" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/ebpf/processor_funcs.go b/pkg/ebpf/processor_funcs.go index 1aa2b33aa282..433582bc2eb3 100644 --- a/pkg/ebpf/processor_funcs.go +++ b/pkg/ebpf/processor_funcs.go @@ -10,11 +10,11 @@ import ( "golang.org/x/sys/unix" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/capabilities" "github.com/aquasecurity/tracee/pkg/config" "github.com/aquasecurity/tracee/pkg/containers" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/pkg/filehash" diff --git a/pkg/ebpf/tracee.go b/pkg/ebpf/tracee.go index d08de853e4dc..b7fef018c360 100644 --- a/pkg/ebpf/tracee.go +++ b/pkg/ebpf/tracee.go @@ -15,6 +15,7 @@ import ( bpf "github.com/aquasecurity/libbpfgo" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/bucketscache" "github.com/aquasecurity/tracee/pkg/bufferdecoder" @@ -26,7 +27,6 @@ import ( "github.com/aquasecurity/tracee/pkg/ebpf/controlplane" "github.com/aquasecurity/tracee/pkg/ebpf/initialization" "github.com/aquasecurity/tracee/pkg/ebpf/probes" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/dependencies" "github.com/aquasecurity/tracee/pkg/events/derive" diff --git a/pkg/events/definition_group.go b/pkg/events/definition_group.go index 20813b9cca99..671249e0e946 100644 --- a/pkg/events/definition_group.go +++ b/pkg/events/definition_group.go @@ -4,8 +4,8 @@ import ( "sort" "sync" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // TODO: add states to the EventGroup struct (to keep states of events from that group) diff --git a/pkg/events/derive/container_create.go b/pkg/events/derive/container_create.go index f22363ec5081..404d8f0e914f 100644 --- a/pkg/events/derive/container_create.go +++ b/pkg/events/derive/container_create.go @@ -1,10 +1,10 @@ package derive import ( + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/cgroup" "github.com/aquasecurity/tracee/pkg/containers" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/events/derive/container_remove.go b/pkg/events/derive/container_remove.go index 2ec21f5cd235..6b4a7587419b 100644 --- a/pkg/events/derive/container_remove.go +++ b/pkg/events/derive/container_remove.go @@ -1,8 +1,8 @@ package derive import ( + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/containers" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/events/derive/hooked_seq_ops.go b/pkg/events/derive/hooked_seq_ops.go index 08af6ba5fe5f..650b6dc6e71b 100644 --- a/pkg/events/derive/hooked_seq_ops.go +++ b/pkg/events/derive/hooked_seq_ops.go @@ -1,7 +1,7 @@ package derive import ( - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/pkg/utils" diff --git a/pkg/events/derive/hooked_syscall.go b/pkg/events/derive/hooked_syscall.go index 9160e274f346..fd70896857eb 100644 --- a/pkg/events/derive/hooked_syscall.go +++ b/pkg/events/derive/hooked_syscall.go @@ -5,7 +5,7 @@ import ( lru "github.com/hashicorp/golang-lru/v2" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/pkg/utils/environment" diff --git a/pkg/events/derive/net_packet.go b/pkg/events/derive/net_packet.go index 008d3a1b40a8..01424b303dba 100644 --- a/pkg/events/derive/net_packet.go +++ b/pkg/events/derive/net_packet.go @@ -1,8 +1,8 @@ package derive import ( + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/events/derive/net_tcp.go b/pkg/events/derive/net_tcp.go index 7dc7d6e8d966..fbb5fbdaad98 100644 --- a/pkg/events/derive/net_tcp.go +++ b/pkg/events/derive/net_tcp.go @@ -4,9 +4,9 @@ import ( "errors" "strconv" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/dnscache" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/events/derive/symbols_collision.go b/pkg/events/derive/symbols_collision.go index 1186e2ab03aa..b82ad48bfe4c 100644 --- a/pkg/events/derive/symbols_collision.go +++ b/pkg/events/derive/symbols_collision.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/golang-lru/simplelru" "golang.org/x/exp/maps" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/filters" "github.com/aquasecurity/tracee/pkg/policy" diff --git a/pkg/events/derive/symbols_loaded.go b/pkg/events/derive/symbols_loaded.go index 43abbcc54b8d..2ba3bd4a41bf 100644 --- a/pkg/events/derive/symbols_loaded.go +++ b/pkg/events/derive/symbols_loaded.go @@ -8,8 +8,8 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "golang.org/x/exp/maps" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/pkg/filters" diff --git a/pkg/events/parse/params.go b/pkg/events/parse/params.go index cc504f1acd9a..2a09b522974c 100644 --- a/pkg/events/parse/params.go +++ b/pkg/events/parse/params.go @@ -1,7 +1,7 @@ package parse import ( - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/events/parse_args.go b/pkg/events/parse_args.go index c646d211fd05..4ee3152f09b0 100644 --- a/pkg/events/parse_args.go +++ b/pkg/events/parse_args.go @@ -8,7 +8,7 @@ import ( bpf "github.com/aquasecurity/libbpfgo" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events/parsers" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/events/sorting/cpu_queue.go b/pkg/events/sorting/cpu_queue.go index dcbdd7959244..16c6f0fba183 100644 --- a/pkg/events/sorting/cpu_queue.go +++ b/pkg/events/sorting/cpu_queue.go @@ -1,7 +1,7 @@ package sorting import ( - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/events/sorting/pool.go b/pkg/events/sorting/pool.go index 69a7797eb1f0..8476b4bd1192 100644 --- a/pkg/events/sorting/pool.go +++ b/pkg/events/sorting/pool.go @@ -3,7 +3,7 @@ package sorting import ( "sync" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/events/sorting/queue.go b/pkg/events/sorting/queue.go index 64ed539ea8bc..3de14c18e709 100644 --- a/pkg/events/sorting/queue.go +++ b/pkg/events/sorting/queue.go @@ -3,7 +3,7 @@ package sorting import ( "sync" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/events/sorting/sorting.go b/pkg/events/sorting/sorting.go index 06cd28858f65..e93a84eb02b4 100644 --- a/pkg/events/sorting/sorting.go +++ b/pkg/events/sorting/sorting.go @@ -105,8 +105,8 @@ import ( "sync" "time" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils/environment" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/events/trigger/context.go b/pkg/events/trigger/context.go index 7a403f9f5104..53a3b5e477d2 100644 --- a/pkg/events/trigger/context.go +++ b/pkg/events/trigger/context.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/counter" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events/parse" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/filehash/hash.go b/pkg/filehash/hash.go index a8709cbd0501..4a0cfceecdef 100644 --- a/pkg/filehash/hash.go +++ b/pkg/filehash/hash.go @@ -9,8 +9,8 @@ import ( miniosha "github.com/minio/sha256-simd" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // ComputeFileHashAtPath attempts to open a file at a path and calculate its diff --git a/pkg/filehash/hash_test.go b/pkg/filehash/hash_test.go index 04d8d2969dd7..1c1b87716b47 100644 --- a/pkg/filehash/hash_test.go +++ b/pkg/filehash/hash_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "gotest.tools/assert" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/filehash" ) diff --git a/pkg/filehash/key.go b/pkg/filehash/key.go index cabe5ee55d18..523a56dc14d5 100644 --- a/pkg/filehash/key.go +++ b/pkg/filehash/key.go @@ -3,8 +3,8 @@ package filehash import ( "fmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" ) const hostDigest = "host" diff --git a/pkg/filters/binary.go b/pkg/filters/binary.go index 7886dc8dc75b..46819bd75d02 100644 --- a/pkg/filters/binary.go +++ b/pkg/filters/binary.go @@ -6,7 +6,7 @@ import ( "golang.org/x/exp/maps" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/utils" "github.com/aquasecurity/tracee/pkg/utils/proc" ) diff --git a/pkg/filters/data.go b/pkg/filters/data.go index 2a54620245cf..eca8184a698c 100644 --- a/pkg/filters/data.go +++ b/pkg/filters/data.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/utils" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/filters/int.go b/pkg/filters/int.go index 5435e1eb808e..677011de8f3f 100644 --- a/pkg/filters/int.go +++ b/pkg/filters/int.go @@ -9,7 +9,7 @@ import ( "golang.org/x/exp/constraints" "golang.org/x/exp/maps" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/filters/processtree.go b/pkg/filters/processtree.go index 03c612445a04..9354459719ef 100644 --- a/pkg/filters/processtree.go +++ b/pkg/filters/processtree.go @@ -6,7 +6,7 @@ import ( "golang.org/x/exp/maps" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/filters/retval.go b/pkg/filters/retval.go index 1112bb6b0880..c44834bd3794 100644 --- a/pkg/filters/retval.go +++ b/pkg/filters/retval.go @@ -3,7 +3,7 @@ package filters import ( "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/filters/scope.go b/pkg/filters/scope.go index b7cddfc305f2..941044794307 100644 --- a/pkg/filters/scope.go +++ b/pkg/filters/scope.go @@ -3,7 +3,7 @@ package filters import ( "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/utils" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/filters/string.go b/pkg/filters/string.go index 470540a75a5e..e919b202d7a0 100644 --- a/pkg/filters/string.go +++ b/pkg/filters/string.go @@ -5,7 +5,7 @@ import ( "golang.org/x/exp/maps" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/filters/sets" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/filters/uint.go b/pkg/filters/uint.go index b9a785046782..4c76c769cf12 100644 --- a/pkg/filters/uint.go +++ b/pkg/filters/uint.go @@ -9,7 +9,7 @@ import ( "golang.org/x/exp/constraints" "golang.org/x/exp/maps" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/metrics/stats.go b/pkg/metrics/stats.go index 08eccfc5e8eb..44f22b290ee0 100644 --- a/pkg/metrics/stats.go +++ b/pkg/metrics/stats.go @@ -3,8 +3,8 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/counter" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // When updating this struct, please make sure to update the relevant exporting functions diff --git a/pkg/mount/mount.go b/pkg/mount/mount.go index a35bfbe1810b..7f4287801f2b 100644 --- a/pkg/mount/mount.go +++ b/pkg/mount/mount.go @@ -9,9 +9,9 @@ import ( "kernel.org/pub/linux/libs/security/libcap/cap" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/capabilities" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/pcaps/cache.go b/pkg/pcaps/cache.go index 211793bfe3e8..28ee3f43c081 100644 --- a/pkg/pcaps/cache.go +++ b/pkg/pcaps/cache.go @@ -3,8 +3,8 @@ package pcaps import ( lru "github.com/hashicorp/golang-lru/v2" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/pcaps/common.go b/pkg/pcaps/common.go index 637894de9a7d..c4ee05c3b2e4 100644 --- a/pkg/pcaps/common.go +++ b/pkg/pcaps/common.go @@ -9,9 +9,9 @@ import ( "github.com/google/gopacket/layers" "github.com/google/gopacket/pcapgo" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/pcaps/pcap.go b/pkg/pcaps/pcap.go index c25bf6d55c87..153cf7471995 100644 --- a/pkg/pcaps/pcap.go +++ b/pkg/pcaps/pcap.go @@ -7,8 +7,8 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/pcapgo" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/pcaps/pcaps.go b/pkg/pcaps/pcaps.go index 7faf1da8bf3e..f2a4d13f9c34 100644 --- a/pkg/pcaps/pcaps.go +++ b/pkg/pcaps/pcaps.go @@ -3,9 +3,9 @@ package pcaps import ( "os" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/config" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/types/trace" ) diff --git a/pkg/policy/ebpf.go b/pkg/policy/ebpf.go index c3c674fd39ba..2f3bd7e5a7b7 100644 --- a/pkg/policy/ebpf.go +++ b/pkg/policy/ebpf.go @@ -10,10 +10,10 @@ import ( bpf "github.com/aquasecurity/libbpfgo" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" "github.com/aquasecurity/tracee/pkg/bufferdecoder" "github.com/aquasecurity/tracee/pkg/containers" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/pkg/filters" "github.com/aquasecurity/tracee/pkg/utils/proc" diff --git a/pkg/policy/snapshots.go b/pkg/policy/snapshots.go index 3f96a56dc650..d2d2449217b8 100644 --- a/pkg/policy/snapshots.go +++ b/pkg/policy/snapshots.go @@ -4,8 +4,8 @@ import ( "sync" "time" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) const ( diff --git a/pkg/policy/v1beta1/policy_file.go b/pkg/policy/v1beta1/policy_file.go index 027072045e40..e7534f343343 100644 --- a/pkg/policy/v1beta1/policy_file.go +++ b/pkg/policy/v1beta1/policy_file.go @@ -9,7 +9,7 @@ import ( "gopkg.in/yaml.v2" "k8s.io/apimachinery/pkg/util/validation" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/events" k8s "github.com/aquasecurity/tracee/pkg/k8s/apis/tracee.aquasec.com/v1beta1" ) diff --git a/pkg/proctree/proctree.go b/pkg/proctree/proctree.go index ecf3957899aa..fdc61a41a5b5 100644 --- a/pkg/proctree/proctree.go +++ b/pkg/proctree/proctree.go @@ -7,8 +7,8 @@ import ( lru "github.com/hashicorp/golang-lru/v2" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // diff --git a/pkg/proctree/proctree_feed.go b/pkg/proctree/proctree_feed.go index 14dec9d04eb4..4eb0294cc299 100644 --- a/pkg/proctree/proctree_feed.go +++ b/pkg/proctree/proctree_feed.go @@ -3,8 +3,8 @@ package proctree import ( "path/filepath" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils" ) diff --git a/pkg/proctree/proctree_procfs.go b/pkg/proctree/proctree_procfs.go index 3af393f01ccf..97a75e9b647b 100644 --- a/pkg/proctree/proctree_procfs.go +++ b/pkg/proctree/proctree_procfs.go @@ -7,8 +7,8 @@ import ( "sync" "time" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/utils" "github.com/aquasecurity/tracee/pkg/utils/proc" ) diff --git a/pkg/server/grpc/event_data.go b/pkg/server/grpc/event_data.go index 3440131575a0..f1f9127e4aef 100644 --- a/pkg/server/grpc/event_data.go +++ b/pkg/server/grpc/event_data.go @@ -10,8 +10,8 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" pb "github.com/aquasecurity/tracee/api/v1beta1" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" "github.com/aquasecurity/tracee/pkg/events" "github.com/aquasecurity/tracee/types/detect" "github.com/aquasecurity/tracee/types/trace" diff --git a/pkg/utils/environment/amount_cpus.go b/pkg/utils/environment/amount_cpus.go index 740458ce5b6f..fda18e831de7 100644 --- a/pkg/utils/environment/amount_cpus.go +++ b/pkg/utils/environment/amount_cpus.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) const possibleCPUsFilePath = "/sys/devices/system/cpu/possible" diff --git a/pkg/utils/files.go b/pkg/utils/files.go index b7bb953c7dce..c514e11ced4f 100644 --- a/pkg/utils/files.go +++ b/pkg/utils/files.go @@ -8,8 +8,8 @@ import ( "golang.org/x/sys/unix" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // OpenExistingDir open a directory with given path, and return the os.File of it. diff --git a/pkg/utils/proc/exe.go b/pkg/utils/proc/exe.go index 08c553d0413b..40b0db17337b 100644 --- a/pkg/utils/proc/exe.go +++ b/pkg/utils/proc/exe.go @@ -5,8 +5,8 @@ import ( "os" "strconv" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // GetProcNS returns the namespace ID of a given namespace and process. diff --git a/pkg/utils/proc/ns.go b/pkg/utils/proc/ns.go index 3515977baef8..b9933ec41eb1 100644 --- a/pkg/utils/proc/ns.go +++ b/pkg/utils/proc/ns.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // GetMountNSFirstProcesses return mapping between mount NS to its first process diff --git a/pkg/utils/proc/stat.go b/pkg/utils/proc/stat.go index b10a2e1e1e90..58f741808c51 100644 --- a/pkg/utils/proc/stat.go +++ b/pkg/utils/proc/stat.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/aquasecurity/tracee/pkg/errfmt" + "github.com/aquasecurity/tracee/errfmt" ) // diff --git a/pkg/utils/sharedobjs/container_symbols_loader.go b/pkg/utils/sharedobjs/container_symbols_loader.go index f3327c0db984..cb296241824e 100644 --- a/pkg/utils/sharedobjs/container_symbols_loader.go +++ b/pkg/utils/sharedobjs/container_symbols_loader.go @@ -1,8 +1,8 @@ package sharedobjs import ( + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/pkg/containers" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // ContainersSymbolsLoader is a decorator for SO loaders that resolves containers-relative paths to diff --git a/pkg/utils/sharedobjs/host_symbols_loader.go b/pkg/utils/sharedobjs/host_symbols_loader.go index ba40f7b42261..742accbb3da9 100644 --- a/pkg/utils/sharedobjs/host_symbols_loader.go +++ b/pkg/utils/sharedobjs/host_symbols_loader.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/golang-lru/simplelru" "golang.org/x/exp/maps" + "github.com/aquasecurity/tracee/errfmt" "github.com/aquasecurity/tracee/logger" - "github.com/aquasecurity/tracee/pkg/errfmt" ) // HostSymbolsLoader is responsible for efficient reading of shared object's symbols.