Skip to content

Commit

Permalink
feat(decl/container): switch to docker client sdk
Browse files Browse the repository at this point in the history
Signed-off-by: Leonardo Di Giovanna <[email protected]>
  • Loading branch information
ekoops authored and poiana committed Feb 26, 2025
1 parent 1008768 commit ce29ffb
Show file tree
Hide file tree
Showing 6 changed files with 281 additions and 321 deletions.
8 changes: 4 additions & 4 deletions cmd/declarative/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ type Config struct {
// TestsTimeout is the maximal duration of the tests. If running tests lasts more than TestsTimeout, the execution
// of all pending tasks is canceled.
TestsTimeout time.Duration
// ContainerRuntimeUnixSocketPath is the unix socket path of the local container runtime.
ContainerRuntimeUnixSocketPath string
// ContainerRuntimeUnixSocketURL is the unix socket URL of the local container runtime.
ContainerRuntimeUnixSocketURL string
// ContainerBaseImageName is the event-generator base image to generate new containers.
ContainerBaseImageName string
// ContainerImagePullPolicy is container image pull policy.
Expand Down Expand Up @@ -141,8 +141,8 @@ func (c *Config) InitCommandFlags(cmd *cobra.Command) {
"all pending tasks is canceled")

// Container runtime flags.
flags.StringVar(&c.ContainerRuntimeUnixSocketPath, "container-runtime-unix-socket",
"/run/containerd/containerd.sock", "The unix socket path of the local container runtime")
flags.StringVar(&c.ContainerRuntimeUnixSocketURL, "container-runtime-unix-socket",
"unix:///run/docker.sock", "The unix socket path of the local container runtime")
flags.StringVar(&c.ContainerBaseImageName, "container-base-image",
"docker.io/falcosecurity/event-generator:latest", "The event-generator base image to generate new containers")
flags.Var(enumflag.New(&c.ContainerImagePullPolicy, "container-image-pull-policy", containerImagePullPolicies,
Expand Down
2 changes: 1 addition & 1 deletion cmd/declarative/test/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ func (cw *CommandWrapper) createRunnerBuilder() (runner.Builder, error) {
runnerProcessBuilder := processbuilder.New()

runnerContainerBuilderOptions := []containerbuilder.Option{
containerbuilder.WithUnixSocketPath(cw.ContainerRuntimeUnixSocketPath),
containerbuilder.WithUnixSocketURL(cw.ContainerRuntimeUnixSocketURL),
containerbuilder.WithBaseImageName(cw.ContainerBaseImageName),
containerbuilder.WithBaseImagePullPolicy(cw.ContainerImagePullPolicy),
}
Expand Down
53 changes: 17 additions & 36 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/falcosecurity/event-generator
go 1.23.1

require (
github.com/containerd/containerd v1.7.24
github.com/creasty/defaults v1.8.0
github.com/docker/docker v28.0.0+incompatible
github.com/dustin/go-humanize v1.0.1
github.com/falcosecurity/client-go v0.6.1
github.com/go-logr/logr v1.4.2
Expand All @@ -26,12 +26,12 @@ require (
github.com/stretchr/testify v1.9.0
github.com/thediveo/enumflag v0.10.1
github.com/vishvananda/netlink v1.3.0
go.uber.org/zap v1.26.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.26.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/apimachinery v0.31.1
k8s.io/apimachinery v0.32.2
k8s.io/cli-runtime v0.31.1
k8s.io/client-go v0.31.1
k8s.io/client-go v0.32.2
k8s.io/kubectl v0.31.1
kernel.org/pub/linux/libs/security/libcap/cap v1.2.74-rc4
)
Expand All @@ -49,27 +49,17 @@ require (
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16

require (
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.11.7 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/chai2010/gettext-go v1.0.3 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/containerd/api v1.7.19 // indirect
github.com/containerd/continuity v0.4.2 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/ttrpc v1.2.5 // indirect
github.com/containerd/typeurl/v2 v2.1.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand All @@ -82,7 +72,6 @@ require (
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
Expand All @@ -92,34 +81,26 @@ require (
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/signal v0.7.0 // indirect
github.com/moby/sys/user v0.3.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runtime-spec v1.1.0 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand All @@ -134,9 +115,9 @@ require (
github.com/vishvananda/netns v0.0.4 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
Expand All @@ -148,24 +129,24 @@ require (
golang.org/x/sync v0.8.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.6.0 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
golang.org/x/time v0.7.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.31.1 // indirect
k8s.io/component-base v0.31.1 // indirect
gotest.tools/v3 v3.5.2 // indirect
k8s.io/api v0.32.2 // indirect
k8s.io/component-base v0.32.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
kernel.org/pub/linux/libs/security/libcap/psx v1.2.73 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/kustomize/api v0.17.3 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit ce29ffb

Please sign in to comment.