From c02d181e7db489da341d748f295f905f23ee4ccd Mon Sep 17 00:00:00 2001 From: Oleg Sucharevich Date: Thu, 20 Oct 2022 11:44:24 +0300 Subject: [PATCH] chore: tidy Signed-off-by: Oleg Sucharevich --- go.mod | 381 +++++++++--------- go.sum | 7 - launcher/launcher_test.go | 2 +- tests/configuration.py | 3 + .../tests/test_process_kubelet_rules.py | 12 +- 5 files changed, 203 insertions(+), 202 deletions(-) diff --git a/go.mod b/go.mod index f43e8ee158..0a93218322 100644 --- a/go.mod +++ b/go.mod @@ -3,61 +3,49 @@ module github.com/elastic/cloudbeat go 1.18 require ( - code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee - code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a - github.com/akavel/rsrc v0.10.2 + code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee // indirect + code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a // indirect + github.com/akavel/rsrc v0.10.2 // indirect github.com/aws/aws-sdk-go-v2 v1.16.7 - github.com/dlclark/regexp2 v1.7.0 - github.com/go-ole/go-ole v1.2.6 - github.com/go-sourcemap/sourcemap v2.1.3+incompatible + github.com/dlclark/regexp2 v1.7.0 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect github.com/gofrs/uuid v4.2.0+incompatible github.com/magefile/mage v1.13.0 - github.com/mailru/easyjson v0.7.6 + github.com/mailru/easyjson v0.7.6 // indirect github.com/mitchellh/gox v1.0.1 github.com/mitchellh/mapstructure v1.5.0 - github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0 github.com/stretchr/testify v1.8.0 github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/tools v0.1.12 - gopkg.in/jcmturner/aescts.v1 v1.0.1 - gopkg.in/jcmturner/dnsutils.v1 v1.0.1 - gopkg.in/jcmturner/goidentity.v3 v3.0.0 - gopkg.in/jcmturner/rpc.v1 v1.1.0 + gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect + gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect + gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect + gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect gotest.tools/gotestsum v1.7.0 k8s.io/apimachinery v0.24.2 k8s.io/client-go v0.24.2 ) require ( - github.com/aws/aws-sdk-go-v2/config v1.15.12 github.com/aws/aws-sdk-go-v2/credentials v1.12.7 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.7 - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.14 - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.8 - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.14 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.36.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.17.8 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.8 github.com/aws/aws-sdk-go-v2/service/eks v1.21.4 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.8 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.4 github.com/aws/aws-sdk-go-v2/service/iam v1.18.4 - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.7 - github.com/aws/aws-sdk-go-v2/service/sso v1.11.10 github.com/aws/aws-sdk-go-v2/service/sts v1.16.8 - github.com/aws/smithy-go v1.12.0 github.com/djherbis/times v1.5.0 - github.com/dschmidt/go-layerfs v0.1.0 github.com/elastic/e2e-testing v1.99.2-0.20220117192005-d3365c99b9c4 github.com/elastic/elastic-agent-autodiscover v0.2.1 github.com/elastic/elastic-agent-libs v0.2.11 - github.com/elastic/elastic-agent-shipper-client v0.2.0 github.com/elastic/go-licenser v0.4.1 - github.com/open-policy-agent/opa v0.42.0 - github.com/pierrec/lz4/v4 v4.1.15 + github.com/open-policy-agent/opa v0.43.1 github.com/pkg/errors v0.9.1 go.elastic.co/go-licence-detector v0.5.0 go.uber.org/goleak v1.1.12 @@ -66,17 +54,32 @@ require ( ) require ( - code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f - github.com/OneOfOne/xxhash v1.2.8 - github.com/armon/go-radix v1.0.0 - github.com/bytecodealliance/wasmtime-go v0.36.0 - github.com/cespare/xxhash v1.1.0 - github.com/containerd/containerd v1.6.6 - github.com/davecgh/go-spew v1.1.1 - github.com/dgraph-io/ristretto v0.1.0 + github.com/aws/aws-sdk-go-v2/config v1.15.12 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.14 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.8 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.14 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.7 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.11.10 // indirect + github.com/aws/smithy-go v1.12.0 // indirect + github.com/dschmidt/go-layerfs v0.1.0 // indirect + github.com/elastic/elastic-agent-shipper-client v0.2.0 // indirect + github.com/pierrec/lz4/v4 v4.1.15 // indirect +) + +require ( + code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect + github.com/OneOfOne/xxhash v1.2.8 // indirect + github.com/armon/go-radix v1.0.0 // indirect + github.com/bytecodealliance/wasmtime-go v0.36.0 // indirect + github.com/cespare/xxhash v1.1.0 // indirect + github.com/containerd/containerd v1.6.6 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/docker/distribution v2.8.1+incompatible - github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 - github.com/eapache/queue v1.1.0 + github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect + github.com/eapache/queue v1.1.0 // indirect github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220726163833-e8a0da132f1f github.com/elastic/csp-security-policies v1.2.1 github.com/ghodss/yaml v1.0.0 // indirect @@ -93,164 +96,164 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/go-uuid v1.0.2 - github.com/hashicorp/go-version v1.2.0 - github.com/imdario/mergo v0.3.12 - github.com/inconshreveable/mousetrap v1.0.0 - github.com/jcmturner/aescts/v2 v2.0.0 - github.com/jcmturner/dnsutils/v2 v2.0.0 - github.com/jcmturner/gofork v1.0.0 - github.com/jcmturner/gokrb5/v8 v8.4.2 - github.com/jcmturner/rpc/v2 v2.0.3 - github.com/jmespath/go-jmespath v0.4.0 - github.com/josharian/intern v1.0.0 - github.com/json-iterator/go v1.1.12 - github.com/klauspost/compress v1.13.6 - github.com/mattn/go-isatty v0.0.14 - github.com/mitchellh/go-homedir v1.1.0 - github.com/mitchellh/iochan v1.0.0 - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd - github.com/modern-go/reflect2 v1.0.2 - github.com/pierrec/lz4 v2.6.0+incompatible - github.com/santhosh-tekuri/jsonschema v1.2.4 - github.com/sirupsen/logrus v1.8.1 - github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 - github.com/xdg/stringprep v1.0.3 - github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb - github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 - github.com/yashtewari/glob-intersection v0.1.0 - go.elastic.co/fastjson v1.1.0 - go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.7.0 - go.opentelemetry.io/otel/trace v1.7.0 - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 - google.golang.org/appengine v1.6.7 - gopkg.in/yaml.v3 v3.0.1 - k8s.io/klog/v2 v2.60.1 - k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 - sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 - sigs.k8s.io/yaml v1.2.0 + github.com/hashicorp/go-version v1.2.0 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/gofork v1.0.0 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect + github.com/jcmturner/rpc/v2 v2.0.3 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/iochan v1.0.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pierrec/lz4 v2.6.0+incompatible // indirect + github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect + github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 // indirect + github.com/xdg/stringprep v1.0.3 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/yashtewari/glob-intersection v0.1.0 // indirect + go.elastic.co/fastjson v1.1.0 // indirect + go.opencensus.io v0.23.0 // indirect + go.opentelemetry.io/otel v1.7.0 // indirect + go.opentelemetry.io/otel/trace v1.7.0 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + google.golang.org/appengine v1.6.7 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/klog/v2 v2.60.1 // indirect + k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect + k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect + sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect ) require ( - code.cloudfoundry.org/go-loggregator v7.4.0+incompatible - github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 - github.com/Jeffail/gabs/v2 v2.6.0 - github.com/Masterminds/semver v1.5.0 - github.com/Microsoft/go-winio v0.5.2 - github.com/PuerkitoBio/purell v1.1.1 - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 - github.com/Shopify/sarama v1.27.0 - github.com/agnivade/levenshtein v1.0.1 - github.com/beorn7/perks v1.0.1 - github.com/cenkalti/backoff/v4 v4.1.3 - github.com/cespare/xxhash/v2 v2.1.2 - github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f - github.com/cloudfoundry/noaa v2.1.0+incompatible - github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 - github.com/cyphar/filepath-securejoin v0.2.3 - github.com/dgraph-io/badger/v3 v3.2103.2 - github.com/dnephin/pflag v1.0.7 - github.com/docker/cli v20.10.17+incompatible - github.com/docker/docker v20.10.17+incompatible - github.com/docker/docker-credential-helpers v0.6.4 - github.com/docker/go-connections v0.4.0 - github.com/docker/go-metrics v0.0.1 - github.com/docker/go-units v0.4.0 - github.com/dop251/goja v0.0.0-20220801092856-7adb49968576 - github.com/dop251/goja_nodejs v0.0.0-20220712185256-8cad205bf387 - github.com/dustin/go-humanize v1.0.0 - github.com/eapache/go-resiliency v1.2.0 - github.com/elastic/elastic-agent-client/v7 v7.0.0-20220804181728-b0328d2fe484 - github.com/elastic/elastic-agent-system-metrics v0.4.4 - github.com/elastic/go-concert v0.2.0 - github.com/elastic/go-lumber v0.1.0 - github.com/elastic/go-seccomp-bpf v1.2.0 - github.com/elastic/go-structform v0.0.10 - github.com/elastic/go-sysinfo v1.8.1 + code.cloudfoundry.org/go-loggregator v7.4.0+incompatible // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Jeffail/gabs/v2 v2.6.0 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/Shopify/sarama v1.27.0 // indirect + github.com/agnivade/levenshtein v1.0.1 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f // indirect + github.com/cloudfoundry/noaa v2.1.0+incompatible // indirect + github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 // indirect + github.com/cyphar/filepath-securejoin v0.2.3 // indirect + github.com/dgraph-io/badger/v3 v3.2103.2 // indirect + github.com/dnephin/pflag v1.0.7 // indirect + github.com/docker/cli v20.10.17+incompatible // indirect + github.com/docker/docker v20.10.17+incompatible // indirect + github.com/docker/docker-credential-helpers v0.6.4 // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-metrics v0.0.1 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/dop251/goja v0.0.0-20220801092856-7adb49968576 // indirect + github.com/dop251/goja_nodejs v0.0.0-20220712185256-8cad205bf387 // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/eapache/go-resiliency v1.2.0 // indirect + github.com/elastic/elastic-agent-client/v7 v7.0.0-20220804181728-b0328d2fe484 // indirect + github.com/elastic/elastic-agent-system-metrics v0.4.4 // indirect + github.com/elastic/go-concert v0.2.0 // indirect + github.com/elastic/go-lumber v0.1.0 // indirect + github.com/elastic/go-seccomp-bpf v1.2.0 // indirect + github.com/elastic/go-structform v0.0.10 // indirect + github.com/elastic/go-sysinfo v1.8.1 // indirect github.com/elastic/go-ucfg v0.8.6 - github.com/elastic/go-windows v1.0.1 - github.com/elastic/gosigar v0.14.2 - github.com/emicklei/go-restful v2.9.5+incompatible - github.com/evanphx/json-patch v4.12.0+incompatible - github.com/fatih/color v1.13.0 - github.com/fsnotify/fsnotify v1.5.4 - github.com/go-openapi/jsonpointer v0.19.5 - github.com/go-openapi/jsonreference v0.19.5 - github.com/go-openapi/swag v0.19.14 - github.com/gobuffalo/here v0.6.0 - github.com/gofrs/flock v0.8.1 - github.com/gogo/protobuf v1.3.2 - github.com/golang/protobuf v1.5.2 - github.com/golang/snappy v0.0.4 - github.com/gomodule/redigo v1.8.3 - github.com/google/flatbuffers v1.12.1 - github.com/google/gnostic v0.5.7-v3refs - github.com/google/go-cmp v0.5.8 - github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 - github.com/google/uuid v1.3.0 - github.com/gorilla/mux v1.8.0 - github.com/h2non/filetype v1.1.1 - github.com/hashicorp/go-multierror v1.1.1 - github.com/hashicorp/nomad/api v0.0.0-20201203164818-6318a8ac7bf8 - github.com/jcchavezs/porto v0.4.0 - github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 - github.com/jonboulle/clockwork v0.2.2 - github.com/josephspurrier/goversioninfo v1.4.0 - github.com/karrick/godirwalk v1.15.8 - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 - github.com/markbates/pkger v0.17.0 - github.com/mattn/go-colorable v0.1.12 - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 - github.com/miekg/dns v1.1.43 - github.com/mitchellh/hashstructure v1.1.0 - github.com/moby/locker v1.0.1 - github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 - github.com/morikuni/aec v1.0.0 - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 - github.com/pmezard/go-difflib v1.0.0 - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c - github.com/prometheus/client_golang v1.12.2 - github.com/prometheus/client_model v0.2.0 - github.com/prometheus/common v0.32.1 - github.com/prometheus/procfs v0.8.0 - github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 - github.com/sergi/go-diff v1.1.0 - github.com/shirou/gopsutil/v3 v3.21.12 - github.com/spf13/cobra v1.5.0 - github.com/spf13/pflag v1.0.5 - github.com/stretchr/objx v0.4.0 - github.com/tklauser/go-sysconf v0.3.9 - github.com/tklauser/numcpus v0.3.0 - github.com/ugorji/go/codec v1.1.8 - github.com/urso/sderr v0.0.0-20210525210834-52b04e8f5c71 - github.com/vektah/gqlparser/v2 v2.4.5 - github.com/xdg/scram v1.0.3 - github.com/yusufpapurcu/wmi v1.2.2 - go.elastic.co/apm v1.15.0 - go.elastic.co/apm/module/apmelasticsearch/v2 v2.0.0 - go.elastic.co/apm/module/apmhttp/v2 v2.1.0 - go.elastic.co/apm/v2 v2.1.0 - go.elastic.co/ecszap v1.0.1 - go.uber.org/atomic v1.9.0 - go.uber.org/multierr v1.8.0 + github.com/elastic/go-windows v1.0.1 // indirect + github.com/elastic/gosigar v0.14.2 // indirect + github.com/emicklei/go-restful v2.9.5+incompatible // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/swag v0.19.14 // indirect + github.com/gobuffalo/here v0.6.0 // indirect + github.com/gofrs/flock v0.8.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/gomodule/redigo v1.8.3 // indirect + github.com/google/flatbuffers v1.12.1 // indirect + github.com/google/gnostic v0.5.7-v3refs // indirect + github.com/google/go-cmp v0.5.8 // indirect + github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/gorilla/mux v1.8.0 // indirect + github.com/h2non/filetype v1.1.1 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/nomad/api v0.0.0-20201203164818-6318a8ac7bf8 // indirect + github.com/jcchavezs/porto v0.4.0 // indirect + github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect + github.com/jonboulle/clockwork v0.2.2 // indirect + github.com/josephspurrier/goversioninfo v1.4.0 // indirect + github.com/karrick/godirwalk v1.15.8 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/markbates/pkger v0.17.0 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/miekg/dns v1.1.43 // indirect + github.com/mitchellh/hashstructure v1.1.0 // indirect + github.com/moby/locker v1.0.1 // indirect + github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/prometheus/client_golang v1.12.2 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.8.0 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/shirou/gopsutil/v3 v3.21.12 // indirect + github.com/spf13/cobra v1.5.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.9 // indirect + github.com/tklauser/numcpus v0.3.0 // indirect + github.com/ugorji/go/codec v1.1.8 // indirect + github.com/urso/sderr v0.0.0-20210525210834-52b04e8f5c71 // indirect + github.com/vektah/gqlparser/v2 v2.4.6 // indirect + github.com/xdg/scram v1.0.3 // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect + go.elastic.co/apm v1.15.0 // indirect + go.elastic.co/apm/module/apmelasticsearch/v2 v2.0.0 // indirect + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 // indirect + go.elastic.co/apm/v2 v2.1.0 // indirect + go.elastic.co/ecszap v1.0.1 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 - golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 - golang.org/x/net v0.0.0-20220802222814-0bcc04d9c69b - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 - golang.org/x/sys v0.0.0-20220731174439-a90be440212d - golang.org/x/text v0.3.7 - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 - google.golang.org/genproto v0.0.0-20220802133213-ce4fa296bf78 - google.golang.org/grpc v1.48.0 - google.golang.org/protobuf v1.28.1 - gopkg.in/inf.v0 v0.9.1 - gopkg.in/jcmturner/gokrb5.v7 v7.5.0 // indirectresources/manager/data.go - howett.net/plist v1.0.0 - oras.land/oras-go v1.2.0 + golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect + golang.org/x/net v0.0.0-20220802222814-0bcc04d9c69b // indirect + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect + golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + google.golang.org/genproto v0.0.0-20220802133213-ce4fa296bf78 // indirect + google.golang.org/grpc v1.48.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/jcmturner/gokrb5.v7 v7.5.0 // indirect; indirectresources/manager/data.go + howett.net/plist v1.0.0 // indirect + oras.land/oras-go v1.2.0 // indirect ) replace ( diff --git a/go.sum b/go.sum index 8473fbb95f..dd811bb0f5 100644 --- a/go.sum +++ b/go.sum @@ -531,10 +531,6 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/elastic/csp-security-policies v1.0.8 h1:Wy13f5kFlwoJLMhnhS8O5gmP3EnGEsPxPlDDz1Eo/Z4= -github.com/elastic/csp-security-policies v1.0.8/go.mod h1:iiMuf3IRjGmWD+a88MGen0qeYgReNd2EUqDDb+LZJGc= -github.com/elastic/csp-security-policies v1.2.0 h1:o0FP379xv8xF/HUcow4cSoswtORV6CLzbri001ioI2U= -github.com/elastic/csp-security-policies v1.2.0/go.mod h1:3fA3X9OiyP7IRNyacOGnWqt1eHSMVZRx7p3bmZm98oE= github.com/elastic/csp-security-policies v1.2.1 h1:exmKOXId1rT1P/SUYweuwCkuZMaxGD0/1ex8yv3JqXs= github.com/elastic/csp-security-policies v1.2.1/go.mod h1:3fA3X9OiyP7IRNyacOGnWqt1eHSMVZRx7p3bmZm98oE= github.com/elastic/e2e-testing v1.99.2-0.20220117192005-d3365c99b9c4 h1:uYT+Krd8dsvnhnLK9pe/JHZkYtXEGPfbV4Wt1JPPol0= @@ -1236,7 +1232,6 @@ github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDs github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/open-policy-agent/opa v0.42.0/go.mod h1:MrmoTi/BsKWT58kXlVayBb+rYVeaMwuBm3nYAN3923s= github.com/open-policy-agent/opa v0.43.1 h1:GAtUd6aO5lObFP6rRpteXDVffKa4vGUF4I6qVLdhUng= github.com/open-policy-agent/opa v0.43.1/go.mod h1:xfTsKQEMvy7CxxgsCFoYuzT9jA/8C4JWLignCkN4Dzw= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1499,7 +1494,6 @@ github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 h1:OHNw/6pXODJAB32NujjdQ github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod h1:pNWFTeQ+V1OYT/TzWpnWb6eQBdoXpdx+H+lrH97/Oyo= github.com/urso/sderr v0.0.0-20210525210834-52b04e8f5c71 h1:CehQeKbysHV8J2V7AD0w8NL2x1h04kmmo/Ft5su4lU0= github.com/urso/sderr v0.0.0-20210525210834-52b04e8f5c71/go.mod h1:Wp40HwmjM59FkDIVFfcCb9LzBbnc0XAMp8++hJuWvSU= -github.com/vektah/gqlparser/v2 v2.4.5/go.mod h1:flJWIR04IMQPGz+BXLrORkrARBxv/rtyIAFvd/MceW0= github.com/vektah/gqlparser/v2 v2.4.6 h1:Yjzp66g6oVq93Jihbi0qhGnf/6zIWjcm8H6gA27zstE= github.com/vektah/gqlparser/v2 v2.4.6/go.mod h1:flJWIR04IMQPGz+BXLrORkrARBxv/rtyIAFvd/MceW0= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= @@ -2245,7 +2239,6 @@ google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= diff --git a/launcher/launcher_test.go b/launcher/launcher_test.go index ca2d4e1f0f..086418ae38 100644 --- a/launcher/launcher_test.go +++ b/launcher/launcher_test.go @@ -163,7 +163,7 @@ func (s *LauncherTestSuite) MockBeatManager(mocks *launcherMocks) { } b, err := instance.NewInitializedBeat(settings) s.NoError(err) - b.Manager, err = management.Factory(b.Config.Management)(b.Config.Management, reload.Register, b.Beat.Info.ID) + b.Manager, err = management.Factory(b.Config.Management)(b.Config.Management, reload.RegisterV2, b.Beat.Info.ID) s.NoError(err) mocks.beat = &b.Beat } diff --git a/tests/configuration.py b/tests/configuration.py index 11d3cad388..e7d8f0dc1e 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -12,6 +12,9 @@ agent.name = os.getenv('AGENT_NAME', 'cloudbeat') agent.namespace = os.getenv('AGENT_NAMESPACE', 'kube-system') agent.findings_timeout = 500 +agent.cluster_type = os.getenv('CLUSTER_TYPE', 'eks') # options: vanilla / eks + +agent.node_name = os.getenv('NODE_NAME') # this is the node name where the test pod is running # --- Kubernetes environment definition -------------------- kubernetes = Munch() diff --git a/tests/product/tests/test_process_kubelet_rules.py b/tests/product/tests/test_process_kubelet_rules.py index fc58bd1a3f..5a5d6090fa 100644 --- a/tests/product/tests/test_process_kubelet_rules.py +++ b/tests/product/tests/test_process_kubelet_rules.py @@ -47,13 +47,15 @@ def test_process_kubelet(elastic_client, time.sleep(60) def identifier(eval_resource): - # Needs to be done because EKS findings are showing up in vanilla K8S tests, - # leading to unexpected findings structure. - # See: https://github.com/elastic/security-team/issues/5107 - if 'external_data' not in eval_resource.keys(): + try: + kubelet_config = eval_resource.external_data.config + except AttributeError: return False - return config_contains_arguments(eval_resource.external_data.config, dictionary) + if kubelet_config is None: + return False + + return config_contains_arguments(kubelet_config, dictionary) evaluation = get_ES_evaluation( elastic_client=elastic_client,