Skip to content

Commit

Permalink
chore: use errfmt module
Browse files Browse the repository at this point in the history
  • Loading branch information
geyslan committed Jun 10, 2024
1 parent efae8e6 commit c0c4677
Show file tree
Hide file tree
Showing 103 changed files with 121 additions and 101 deletions.
2 changes: 1 addition & 1 deletion cmd/tracee-rules/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/tracee-rules/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/tracee/cmd/man.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/spf13/cobra"

"github.com/aquasecurity/tracee/pkg/errfmt"
"github.com/aquasecurity/tracee/errfmt"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/tracee/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
10 changes: 10 additions & 0 deletions errfmt/go.mod
Original file line number Diff line number Diff line change
@@ -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
)
6 changes: 6 additions & 0 deletions errfmt/go.sum
Original file line number Diff line number Diff line change
@@ -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=
6 changes: 5 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
2 changes: 1 addition & 1 deletion pkg/bucketscache/bucketscache.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package bucketscache
import (
"sync"

"github.com/aquasecurity/tracee/pkg/errfmt"
"github.com/aquasecurity/tracee/errfmt"
)

type BucketsCache struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/bufferdecoder/decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/bufferdecoder/eventsreader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/capabilities/capabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/cgroup/cgroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cobra/cobra.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ 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"
"github.com/aquasecurity/tracee/pkg/cmd/flags/server"
"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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cobra/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/capabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/capture.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/rego.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/scope.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/server/server.go
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/flags/tracee_ebpf_output.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/initialize/bpfobject.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/printer/printer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/tracee.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/urfave/urfave.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ 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"
"github.com/aquasecurity/tracee/pkg/cmd/flags/server"
"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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/containers/containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/containers/path_resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/containers/runtime/containerd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/containers/runtime/crio.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/containers/runtime/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit c0c4677

Please sign in to comment.