From 01a94acf7cddb3dd3296406c718e1dac90d869ed Mon Sep 17 00:00:00 2001 From: Pratik Jagrut Date: Mon, 28 Aug 2023 16:25:29 +0530 Subject: [PATCH] refactor: remove logger and minor changes --- .github/workflows/charts.yaml | 2 +- .github/workflows/label.yml | 22 ---------- .gitignore | 2 + dev/config/default/manager_patch.yaml | 1 - .../tarian-cluster-agent.yaml | 1 - go.mod | 6 --- go.sum | 15 ------- pkg/clusteragent/falcosidekick_listener.go | 3 +- pkg/logger/logger.go | 43 ------------------- pkg/logger/logger_test.go | 19 -------- pkg/nodeagent/logger.go | 21 --------- 11 files changed, 4 insertions(+), 131 deletions(-) delete mode 100644 .github/workflows/label.yml delete mode 100644 pkg/logger/logger.go delete mode 100644 pkg/logger/logger_test.go delete mode 100644 pkg/nodeagent/logger.go diff --git a/.github/workflows/charts.yaml b/.github/workflows/charts.yaml index 04e4c142..43212d2b 100644 --- a/.github/workflows/charts.yaml +++ b/.github/workflows/charts.yaml @@ -66,7 +66,7 @@ jobs: - name: Install NATS run: | helm repo add nats https://nats-io.github.io/k8s/helm/charts/ - helm upgrade -i nats nats/nats -n tarian-system -f ./dev/nats-helm-values.yaml + helm upgrade -i nats nats/nats -n tarian-system -f ./dev/nats-helm-values.yaml --version 0.19.16 - name: Install charts run: | diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml deleted file mode 100644 index a8a1bd72..00000000 --- a/.github/workflows/label.yml +++ /dev/null @@ -1,22 +0,0 @@ -# This workflow will triage pull requests and apply a label based on the -# paths that are modified in the pull request. -# -# To use this workflow, you will need to set up a .github/labeler.yml -# file with configuration. For more information, see: -# https://github.com/actions/labeler - -name: Labeler -on: [pull_request] - -jobs: - label: - - runs-on: ubuntu-latest - permissions: - contents: read - pull-requests: write - - steps: - - uses: actions/labeler@v4 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.gitignore b/.gitignore index 6d9210ee..83115815 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /.local /.vscode /pkg/**/capture_exec.bpf.o +/pkg/tarianpb/api.pb.go +/pkg/tarianpb/types.pb.go diff --git a/dev/config/default/manager_patch.yaml b/dev/config/default/manager_patch.yaml index 53064531..96d70568 100644 --- a/dev/config/default/manager_patch.yaml +++ b/dev/config/default/manager_patch.yaml @@ -11,7 +11,6 @@ spec: containers: - command: null args: - - --log-formatter=json - --log-level=debug - run-webhook-server name: manager diff --git a/dev/config/tarian-cluster-agent/tarian-cluster-agent.yaml b/dev/config/tarian-cluster-agent/tarian-cluster-agent.yaml index b1ba0b0a..39be5765 100644 --- a/dev/config/tarian-cluster-agent/tarian-cluster-agent.yaml +++ b/dev/config/tarian-cluster-agent/tarian-cluster-agent.yaml @@ -16,7 +16,6 @@ spec: - name: tarian-cluster-agent image: localhost:5000/tarian-cluster-agent:latest args: - - --log-formatter=json - --log-level=debug - run - "--server-address=tarian-server:80" diff --git a/go.mod b/go.mod index 78983714..e3e3d892 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/kube-tarian/tarian go 1.19 require ( - github.com/go-logr/zapr v1.2.3 github.com/go-openapi/runtime v0.25.0 github.com/go-openapi/strfmt v0.21.3 github.com/gogo/status v1.1.1 @@ -12,8 +11,6 @@ require ( github.com/prometheus/alertmanager v0.24.0 github.com/scylladb/go-set v1.0.2 github.com/stretchr/testify v1.8.1 - github.com/urfave/cli/v2 v2.24.2 - go.uber.org/zap v1.24.0 google.golang.org/grpc v1.52.3 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v3 v3.0.1 @@ -27,7 +24,6 @@ require ( github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/falcosecurity/falcosidekick v0.0.0-20211206092417-aef760059143 github.com/fsnotify/fsnotify v1.6.0 // indirect @@ -63,7 +59,6 @@ require ( github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spf13/pflag v1.0.5 go.mongodb.org/mongo-driver v1.10.0 // indirect go.uber.org/atomic v1.10.0 // indirect @@ -109,7 +104,6 @@ require ( github.com/nats-io/nkeys v0.3.0 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/olekukonko/tablewriter v0.0.5 - github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect golang.org/x/crypto v0.1.0 // indirect diff --git a/go.sum b/go.sum index 2de99402..7517f5ef 100644 --- a/go.sum +++ b/go.sum @@ -50,8 +50,6 @@ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -67,7 +65,6 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -114,7 +111,6 @@ github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= -github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= @@ -406,7 +402,6 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/scylladb/go-set v1.0.2 h1:SkvlMCKhP0wyyct6j+0IHJkBkSZL+TDzZ4E7f7BCcRE= @@ -447,16 +442,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/urfave/cli/v2 v2.24.2 h1:q1VA+ofZ8SWfEKB9xXHUD4QZaeI9e+ItEqSbfH2JBXk= -github.com/urfave/cli/v2 v2.24.2/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -478,18 +469,13 @@ go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZ go.opentelemetry.io/otel/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ= go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= -go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -694,7 +680,6 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= diff --git a/pkg/clusteragent/falcosidekick_listener.go b/pkg/clusteragent/falcosidekick_listener.go index 8bf5246d..9f1c0e25 100644 --- a/pkg/clusteragent/falcosidekick_listener.go +++ b/pkg/clusteragent/falcosidekick_listener.go @@ -116,8 +116,7 @@ func sanitizeK8sResourceName(str string) string { func (f *FalcoSidekickListener) processFalcoPayload(payload *types.FalcoPayload) error { if payload.Rule == tarianRuleSpawnedProcess { if !f.configCache.IsConstraintInitialized() { - f.logger.WithField("payload", payload). - Info("can not validate process because constraint is not yet initialized") + f.logger.Info("can not validate process because constraint is not yet initialized") return nil } diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go deleted file mode 100644 index 9a1afb7d..00000000 --- a/pkg/logger/logger.go +++ /dev/null @@ -1,43 +0,0 @@ -// Package logger provides configured logger that is ready to use -package logger - -import ( - "log" - - "go.uber.org/zap" -) - -func GetLogger(level string, encoding string) *zap.SugaredLogger { - zapLevel := zap.InfoLevel - switch level { - case "debug": - zapLevel = zap.DebugLevel - case "info": - zapLevel = zap.InfoLevel - case "warn": - zapLevel = zap.WarnLevel - case "error": - zapLevel = zap.ErrorLevel - } - - config := zap.Config{ - Level: zap.NewAtomicLevelAt(zapLevel), - Development: false, - Sampling: &zap.SamplingConfig{ - Initial: 100, - Thereafter: 100, - }, - Encoding: encoding, - EncoderConfig: zap.NewProductionEncoderConfig(), - OutputPaths: []string{"stderr"}, - ErrorOutputPaths: []string{"stderr"}, - } - - logger, err := config.Build() - - if err != nil { - log.Fatal(err) - } - - return logger.Sugar() -} diff --git a/pkg/logger/logger_test.go b/pkg/logger/logger_test.go deleted file mode 100644 index 7ef81b14..00000000 --- a/pkg/logger/logger_test.go +++ /dev/null @@ -1,19 +0,0 @@ -package logger - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.uber.org/zap/zapcore" -) - -func TestGetLogger(t *testing.T) { - logger := GetLogger("debug", "json") - - entry := logger.Desugar().Check(zapcore.DebugLevel, "log message") - - require.NotNil(t, entry) - assert.Equal(t, zapcore.DebugLevel, entry.Level) - assert.Equal(t, "log message", entry.Message) -} diff --git a/pkg/nodeagent/logger.go b/pkg/nodeagent/logger.go deleted file mode 100644 index 9d92512a..00000000 --- a/pkg/nodeagent/logger.go +++ /dev/null @@ -1,21 +0,0 @@ -package nodeagent - -import ( - "go.uber.org/zap" -) - -var logger *zap.SugaredLogger - -func init() { - l, err := zap.NewProduction() - - if err != nil { - panic("Can not create logger") - } - - logger = l.Sugar() -} - -func SetLogger(l *zap.SugaredLogger) { - logger = l -}