Skip to content

Commit

Permalink
chore: use environment module
Browse files Browse the repository at this point in the history
  • Loading branch information
geyslan committed Jun 10, 2024
1 parent e7d67ba commit e957b6f
Show file tree
Hide file tree
Showing 21 changed files with 68 additions and 18 deletions.
24 changes: 24 additions & 0 deletions environment/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module github.com/aquasecurity/tracee/environment

go 1.22.0

require (
github.com/aquasecurity/tracee/errfmt v0.0.0-00010101000000-000000000000
github.com/aquasecurity/tracee/logger v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.9.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

// To be removed in a sequential PR
replace (
github.com/aquasecurity/tracee/errfmt => ../errfmt
github.com/aquasecurity/tracee/logger => ../logger
)
24 changes: 24 additions & 0 deletions environment/go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
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=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 h1:LoYXNGAShUG3m/ehNk4iFctuhGX/+R1ZpfJ4/ia80JM=
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
2 changes: 2 additions & 0 deletions 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/environment v0.0.0-00010101000000-000000000000
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
Expand Down Expand Up @@ -182,6 +183,7 @@ require (

// To be removed in a sequential PR
replace (
github.com/aquasecurity/tracee/environment => ./environment
github.com/aquasecurity/tracee/errfmt => ./errfmt
github.com/aquasecurity/tracee/logger => ./logger
)
2 changes: 1 addition & 1 deletion pkg/cmd/cobra/cobra.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/cmd"
Expand All @@ -20,7 +21,6 @@ import (
"github.com/aquasecurity/tracee/pkg/policy"
"github.com/aquasecurity/tracee/pkg/signatures/engine"
"github.com/aquasecurity/tracee/pkg/signatures/signature"
"github.com/aquasecurity/tracee/pkg/utils/environment"
)

func GetTraceeRunner(c *cobra.Command, version string) (cmd.Runner, error) {
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,10 +8,10 @@ import (
"strings"

embed "github.com/aquasecurity/tracee"
"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/config"
"github.com/aquasecurity/tracee/pkg/utils/environment"
)

// BpfObject sets up and configures a BPF object for tracing and monitoring
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/initialize/kernelconfig.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package initialize

import (
"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/utils/environment"
)

func KernelConfig() (*environment.KernelConfig, error) {
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,6 +3,7 @@ package urfave
import (
cli "github.com/urfave/cli/v2"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/cmd"
Expand All @@ -12,7 +13,6 @@ import (
"github.com/aquasecurity/tracee/pkg/cmd/printer"
"github.com/aquasecurity/tracee/pkg/config"
"github.com/aquasecurity/tracee/pkg/policy"
"github.com/aquasecurity/tracee/pkg/utils/environment"
)

func GetTraceeRunner(c *cli.Context, version string) (cmd.Runner, error) {
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,14 +3,14 @@ package config
import (
"io"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/pkg/containers/runtime"
"github.com/aquasecurity/tracee/pkg/dnscache"
"github.com/aquasecurity/tracee/pkg/events/queue"
"github.com/aquasecurity/tracee/pkg/policy"
"github.com/aquasecurity/tracee/pkg/proctree"
"github.com/aquasecurity/tracee/pkg/signatures/engine"
"github.com/aquasecurity/tracee/pkg/utils/environment"
)

// Config is a struct containing user defined configuration of tracee
Expand Down
2 changes: 1 addition & 1 deletion pkg/ebpf/hooked_syscall_table.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (

bpf "github.com/aquasecurity/libbpfgo"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/capabilities"
"github.com/aquasecurity/tracee/pkg/events"
"github.com/aquasecurity/tracee/pkg/events/derive"
"github.com/aquasecurity/tracee/pkg/utils"
"github.com/aquasecurity/tracee/pkg/utils/environment"
)

var expectedSyscallTableInit = false
Expand Down
2 changes: 1 addition & 1 deletion pkg/ebpf/initialization/kconfig.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package initialization

import (
"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/utils/environment"
)

// Custom KernelConfigOption's to extend kernel_config helper support
Expand Down
2 changes: 1 addition & 1 deletion pkg/ebpf/probes/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

bpf "github.com/aquasecurity/libbpfgo"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/utils/environment"
)

// NOTE: thread-safety guaranteed by the ProbeGroup big lock.
Expand Down
2 changes: 1 addition & 1 deletion pkg/ebpf/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"sync"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/events"
"github.com/aquasecurity/tracee/pkg/proctree"
"github.com/aquasecurity/tracee/pkg/utils/environment"
"github.com/aquasecurity/tracee/types/trace"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/ebpf/tracee.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

bpf "github.com/aquasecurity/libbpfgo"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/bucketscache"
Expand All @@ -41,7 +42,6 @@ import (
"github.com/aquasecurity/tracee/pkg/signatures/engine"
"github.com/aquasecurity/tracee/pkg/streams"
"github.com/aquasecurity/tracee/pkg/utils"
"github.com/aquasecurity/tracee/pkg/utils/environment"
"github.com/aquasecurity/tracee/pkg/utils/proc"
"github.com/aquasecurity/tracee/pkg/utils/sharedobjs"
"github.com/aquasecurity/tracee/types/trace"
Expand Down
2 changes: 1 addition & 1 deletion pkg/events/derive/hooked_seq_ops.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package derive

import (
"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/pkg/events"
"github.com/aquasecurity/tracee/pkg/events/parse"
"github.com/aquasecurity/tracee/pkg/utils"
"github.com/aquasecurity/tracee/pkg/utils/environment"
"github.com/aquasecurity/tracee/types/trace"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/events/derive/hooked_syscall.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

lru "github.com/hashicorp/golang-lru/v2"

"github.com/aquasecurity/tracee/environment"
"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"
"github.com/aquasecurity/tracee/types/trace"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/events/parsers/data_parsers.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"golang.org/x/sys/unix"

"github.com/aquasecurity/tracee/pkg/utils/environment"
"github.com/aquasecurity/tracee/environment"
)

type SystemFunctionArgument interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/events/sorting/sorting.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ import (
"sync"
"time"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/errfmt"
"github.com/aquasecurity/tracee/logger"
"github.com/aquasecurity/tracee/pkg/utils/environment"
"github.com/aquasecurity/tracee/types/trace"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"time"

"github.com/aquasecurity/tracee/pkg/utils/environment"
"github.com/aquasecurity/tracee/environment"
)

// Cloner is a generic interface for objects that can clone themselves.
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-inst-signatures/e2e-process_execute_failed.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"sync"

"github.com/aquasecurity/tracee/pkg/utils/environment"
"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/signatures/helpers"
"github.com/aquasecurity/tracee/types/detect"
"github.com/aquasecurity/tracee/types/protocol"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-inst-signatures/e2e-set_fs_pwd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/aquasecurity/tracee/pkg/utils/environment"
"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/signatures/helpers"
"github.com/aquasecurity/tracee/types/detect"
"github.com/aquasecurity/tracee/types/protocol"
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tracee.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"testing"
"time"

"github.com/aquasecurity/tracee/environment"
"github.com/aquasecurity/tracee/pkg/cmd/initialize"
"github.com/aquasecurity/tracee/pkg/config"
tracee "github.com/aquasecurity/tracee/pkg/ebpf"
"github.com/aquasecurity/tracee/pkg/proctree"
"github.com/aquasecurity/tracee/pkg/utils/environment"
uproc "github.com/aquasecurity/tracee/pkg/utils/proc"
"github.com/aquasecurity/tracee/types/trace"
)
Expand Down

0 comments on commit e957b6f

Please sign in to comment.