Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-09 19:55:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

move struct definition

Browse Source 
Signed-off-by: Somtochi Onyekwere <somtochionyekwere@gmail.com>
This commit is contained in:
Somtochi Onyekwere
2022-08-02 19:46:19 +01:00
parent 96afee996a
commit 0cfdc5d674
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/flux/logs.go
View File

@@ -277,7 +277,6 @@ func logRequest(ctx context.Context, request rest.ResponseWrapper, w io.Writer)
} }
func filterPrintLog(t *template.Template, l *ControllerLogEntry, w io.Writer) { func filterPrintLog(t *template.Template, l *ControllerLogEntry, w io.Writer) {
//fmt.
if (logsArgs.logLevel == "" || logsArgs.logLevel == l.Level) && if (logsArgs.logLevel == "" || logsArgs.logLevel == l.Level) &&
(logsArgs.kind == "" || strings.EqualFold(logsArgs.kind, l.Kind)) && (logsArgs.kind == "" || strings.EqualFold(logsArgs.kind, l.Kind)) &&
(logsArgs.name == "" || strings.EqualFold(logsArgs.name, l.Name)) && (logsArgs.name == "" || strings.EqualFold(logsArgs.name, l.Name)) &&

22
cmd/flux/logs_test.go
View File

@@ -94,17 +94,6 @@ var testPodLogs = `{"level":"info","ts":"2022-08-02T12:55:34.419Z","logger":"con
{"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":"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"}` {"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) { func TestLogRequest(t *testing.T) {
mapper := &testResponseMapper{} mapper := &testResponseMapper{}
tests := []struct { tests := []struct {
@@ -189,3 +178,14 @@ func TestLogRequest(t *testing.T) {
}) })
} }
} }
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
}