diff --git a/cmd/flux/logs.go b/cmd/flux/logs.go
index 90ee8fbe1aa84aa65cc231fbe6834ad65a15ed19..ff00a913f747f8c9d775bba3d2f949d28f745a08 100644
--- a/cmd/flux/logs.go
+++ b/cmd/flux/logs.go
@@ -277,15 +277,15 @@ func logRequest(ctx context.Context, request rest.ResponseWrapper, w io.Writer)
}
func filterPrintLog(t *template.Template, l *ControllerLogEntry, w io.Writer) {
- if logsArgs.logLevel != "" && logsArgs.logLevel != l.Level ||
- logsArgs.kind != "" && strings.EqualFold(logsArgs.kind, l.Kind) ||
- logsArgs.name != "" && strings.EqualFold(logsArgs.name, l.Name) ||
- !logsArgs.allNamespaces && strings.EqualFold(*kubeconfigArgs.Namespace, l.Namespace) {
- return
- }
- err := t.Execute(w, l)
- if err != nil {
- logger.Failuref("log template error: %s", err)
+ //fmt.
+ if (logsArgs.logLevel == "" || logsArgs.logLevel == l.Level) &&
+ (logsArgs.kind == "" || strings.EqualFold(logsArgs.kind, l.Kind)) &&
+ (logsArgs.name == "" || strings.EqualFold(logsArgs.name, l.Name)) &&
+ (logsArgs.allNamespaces || strings.EqualFold(*kubeconfigArgs.Namespace, l.Namespace)) {
+ err := t.Execute(w, l)
+ if err != nil {
+ logger.Failuref("log template error: %s", err)
+ }
}
}
diff --git a/cmd/flux/logs_test.go b/cmd/flux/logs_test.go
index 9355e37b25d82e62c3b21136e0b0a167b03ee0f8..88a61dfe9dda239dac5598e24e6f9bae15f0a68e 100644
--- a/cmd/flux/logs_test.go
+++ b/cmd/flux/logs_test.go
@@ -20,7 +20,15 @@ limitations under the License.
package main
import (
+ "bytes"
+ "context"
+ "fmt"
+ "io"
+ "os"
+ "strings"
"testing"
+
+ . "github.com/onsi/gomega"
)
func TestLogsNoArgs(t *testing.T) {
@@ -78,3 +86,106 @@ func TestLogsSinceOnlyOneAllowed(t *testing.T) {
}
cmd.runTestCmd(t)
}
+
+var testPodLogs = `{"level":"info","ts":"2022-08-02T12:55:34.419Z","logger":"controller.gitrepository","msg":"no changes since last reconcilation: observed revision","reconciler group":"source.toolkit.fluxcd.io","reconciler kind":"GitRepository","name":"podinfo","namespace":"default"}
+{"level":"error","ts":"2022-08-02T12:56:04.679Z","logger":"controller.gitrepository","msg":"no changes since last reconcilation: observed revision","reconciler group":"source.toolkit.fluxcd.io","reconciler kind":"GitRepository","name":"flux-system","namespace":"flux-system"}
+{"level":"error","ts":"2022-08-02T12:56:34.961Z","logger":"controller.kustomization","msg":"no changes since last reconcilation: observed revision","reconciler group":"kustomize.toolkit.fluxcd.io","reconciler kind":"Kustomization","name":"flux-system","namespace":"flux-system"}
+{"level":"info","ts":"2022-08-02T12:56:34.961Z","logger":"controller.kustomization","msg":"no changes since last reconcilation: observed revision","reconciler group":"kustomize.toolkit.fluxcd.io","reconciler kind":"Kustomization","name":"podinfo","namespace":"default"}
+{"level":"info","ts":"2022-08-02T12:56:34.961Z","logger":"controller.gitrepository","msg":"no changes since last reconcilation: observed revision","reconciler group":"source.toolkit.fluxcd.io","reconciler kind":"GitRepository","name":"podinfo","namespace":"default"}
+{"level":"error","ts":"2022-08-02T12:56:34.961Z","logger":"controller.kustomization","msg":"no changes since last reconcilation: observed revision","reconciler group":"kustomize.toolkit.fluxcd.io","reconciler kind":"Kustomization","name":"podinfo","namespace":"flux-system"}`
+
+type testResponseMapper struct {
+}
+
+func (t *testResponseMapper) DoRaw(_ context.Context) ([]byte, error) {
+ return nil, nil
+}
+
+func (t *testResponseMapper) Stream(_ context.Context) (io.ReadCloser, error) {
+ return io.NopCloser(strings.NewReader(testPodLogs)), nil
+}
+
+func TestLogRequest(t *testing.T) {
+ mapper := &testResponseMapper{}
+ tests := []struct {
+ name string
+ namespace string
+ flags *logsFlags
+ assertFile string
+ }{
+ {
+ name: "all logs",
+ flags: &logsFlags{
+ tail: -1,
+ allNamespaces: true,
+ },
+ assertFile: "testdata/logs/all-logs.txt",
+ },
+ {
+ name: "filter by namespace",
+ namespace: "default",
+ flags: &logsFlags{
+ tail: -1,
+ },
+ assertFile: "testdata/logs/namespace.txt",
+ },
+ {
+ name: "filter by kind and namespace",
+ flags: &logsFlags{
+ tail: -1,
+ kind: "Kustomization",
+ },
+ assertFile: "testdata/logs/kind.txt",
+ },
+ {
+ name: "filter by loglevel",
+ flags: &logsFlags{
+ tail: -1,
+ logLevel: "error",
+ allNamespaces: true,
+ },
+ assertFile: "testdata/logs/log-level.txt",
+ },
+ {
+ name: "filter by namespace, name, loglevel and kind",
+ namespace: "flux-system",
+ flags: &logsFlags{
+ tail: -1,
+ logLevel: "error",
+ kind: "Kustomization",
+ name: "podinfo",
+ },
+ assertFile: "testdata/logs/multiple-filters.txt",
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ g := NewWithT(t)
+
+ logsArgs = tt.flags
+ if tt.namespace != "" {
+ *kubeconfigArgs.Namespace = tt.namespace
+ }
+ w := bytes.NewBuffer([]byte{})
+ err := logRequest(context.Background(), mapper, w)
+ g.Expect(err).To(BeNil())
+
+ got := make([]byte, w.Len())
+ _, err = w.Read(got)
+ g.Expect(err).To(BeNil())
+
+ expected, err := os.ReadFile(tt.assertFile)
+ g.Expect(err).To(BeNil())
+
+ fmt.Printf("'%s'\n", got)
+ g.Expect(string(got)).To(Equal(string(expected)))
+
+ // reset flags to default
+ *kubeconfigArgs.Namespace = rootArgs.defaults.Namespace
+ logsArgs = &logsFlags{
+ tail: -1,
+ }
+ })
+ }
+}
diff --git a/cmd/flux/testdata/logs/all-logs.txt b/cmd/flux/testdata/logs/all-logs.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ca4d5f0fea6e572ba5f5f1977b4d22766b5ec179
--- /dev/null
+++ b/cmd/flux/testdata/logs/all-logs.txt
@@ -0,0 +1,6 @@
+2022-08-02T12:55:34.419Z info GitRepository/podinfo.default - no changes since last reconcilation: observed revision
+2022-08-02T12:56:04.679Z error GitRepository/flux-system.flux-system - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z error Kustomization/flux-system.flux-system - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z info Kustomization/podinfo.default - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z info GitRepository/podinfo.default - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z error Kustomization/podinfo.flux-system - no changes since last reconcilation: observed revision
diff --git a/cmd/flux/testdata/logs/kind.txt b/cmd/flux/testdata/logs/kind.txt
new file mode 100644
index 0000000000000000000000000000000000000000..77c3cdd6f00350d3c9d14c0c555ec4736d59b18d
--- /dev/null
+++ b/cmd/flux/testdata/logs/kind.txt
@@ -0,0 +1,2 @@
+2022-08-02T12:56:34.961Z error Kustomization/flux-system.flux-system - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z error Kustomization/podinfo.flux-system - no changes since last reconcilation: observed revision
diff --git a/cmd/flux/testdata/logs/log-level.txt b/cmd/flux/testdata/logs/log-level.txt
new file mode 100644
index 0000000000000000000000000000000000000000..070867ae4cbc54360aff9e48912e9cd997daec01
--- /dev/null
+++ b/cmd/flux/testdata/logs/log-level.txt
@@ -0,0 +1,3 @@
+2022-08-02T12:56:04.679Z error GitRepository/flux-system.flux-system - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z error Kustomization/flux-system.flux-system - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z error Kustomization/podinfo.flux-system - no changes since last reconcilation: observed revision
diff --git a/cmd/flux/testdata/logs/multiple-filters.txt b/cmd/flux/testdata/logs/multiple-filters.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c82cf09ccd4a6252b7f53d4250a75c855960b5fc
--- /dev/null
+++ b/cmd/flux/testdata/logs/multiple-filters.txt
@@ -0,0 +1 @@
+2022-08-02T12:56:34.961Z error Kustomization/podinfo.flux-system - no changes since last reconcilation: observed revision
diff --git a/cmd/flux/testdata/logs/namespace.txt b/cmd/flux/testdata/logs/namespace.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e5c4450fa239ceb8bb256f00ea4edc7f9e13337e
--- /dev/null
+++ b/cmd/flux/testdata/logs/namespace.txt
@@ -0,0 +1,3 @@
+2022-08-02T12:55:34.419Z info GitRepository/podinfo.default - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z info Kustomization/podinfo.default - no changes since last reconcilation: observed revision
+2022-08-02T12:56:34.961Z info GitRepository/podinfo.default - no changes since last reconcilation: observed revision
diff --git a/go.mod b/go.mod
index fce50c32cff30df75fa1bba8bd2e3b2382f0e669..190a5ba00680c8d4286c7db4b175206ee1c8f9a9 100644
--- a/go.mod
+++ b/go.mod
@@ -31,6 +31,7 @@ require (
github.com/manifoldco/promptui v0.9.0
github.com/mattn/go-shellwords v1.0.12
github.com/olekukonko/tablewriter v0.0.5
+ github.com/onsi/gomega v1.19.0
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/theckman/yacspin v0.13.12
@@ -131,7 +132,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
- github.com/onsi/gomega v1.19.0 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect