diff --git a/actionners/kubernetes/labelize/labelize.go b/actionners/kubernetes/labelize/labelize.go index d0daf300..cf772719 100644 --- a/actionners/kubernetes/labelize/labelize.go +++ b/actionners/kubernetes/labelize/labelize.go @@ -21,6 +21,10 @@ type patch struct { Value string `json:"value,omitempty"` } +const ( + metadataLabels = "/metadata/labels/" +) + var Labelize = func(rule *rules.Rule, event *events.Event) (utils.LogLine, error) { pod := event.GetPodName() namespace := event.GetNamespaceName() @@ -38,7 +42,7 @@ var Labelize = func(rule *rules.Rule, event *events.Event) (utils.LogLine, error } payload = append(payload, patch{ Op: "replace", - Path: "/metadata/labels/" + i, + Path: metadataLabels + i, Value: fmt.Sprintf("%v", j), }) } @@ -64,7 +68,7 @@ var Labelize = func(rule *rules.Rule, event *events.Event) (utils.LogLine, error } payload = append(payload, patch{ Op: "remove", - Path: "/metadata/labels/" + i, + Path: metadataLabels + i, }) } diff --git a/mageFile.go b/mageFile.go index f9428d58..0130e96f 100644 --- a/mageFile.go +++ b/mageFile.go @@ -12,6 +12,9 @@ import ( ) func Lint() error { + if err := sh.RunV("golangci-lint", "--version"); err != nil { + return err + } if err := sh.RunV("golangci-lint", "run", "--timeout", "3m"); err != nil { return err } diff --git a/notifiers/k8sevents/k8sevents.go b/notifiers/k8sevents/k8sevents.go index ae2fcbbb..bb5eba41 100644 --- a/notifiers/k8sevents/k8sevents.go +++ b/notifiers/k8sevents/k8sevents.go @@ -14,6 +14,10 @@ import ( "github.com/Issif/falco-talon/utils" ) +const ( + falcoTalon = "falco-talon" +) + var plaintextTmpl = `Status: {{ .Status }} Action: {{ .Action }} Rule: {{ .Rule }} @@ -60,23 +64,23 @@ var Notify = func(log utils.LogLine) error { APIVersion: "v1beta1", }, ObjectMeta: metav1.ObjectMeta{ - GenerateName: "falco-talon.", + GenerateName: falcoTalon + ".", }, InvolvedObject: corev1.ObjectReference{ Kind: "Pod", Namespace: log.Objects["Namespace"], Name: log.Objects["Pod"], }, - Reason: "falco-talon:" + log.Action + ":" + log.Status, + Reason: falcoTalon + ":" + log.Action + ":" + log.Status, Message: strings.ReplaceAll(message, `'`, `"`), Source: corev1.EventSource{ - Component: "falco-talon", + Component: falcoTalon, }, Type: corev1.EventTypeNormal, EventTime: metav1.NowMicro(), - ReportingController: "falcosecurity.org/falco-talon", - ReportingInstance: "falco-talon", - Action: "falco-talon:" + log.Action, + ReportingController: "falcosecurity.org/" + falcoTalon, + ReportingInstance: falcoTalon, + Action: falcoTalon + ":" + log.Action, } k8sclient := kubernetes.GetClient() _, err = k8sclient.CoreV1().Events(log.Objects["Namespace"]).Create(context.TODO(), k8sevent, metav1.CreateOptions{})