synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tolerate non-json lines in provisionerd logs (#5006)

Browse Source 
Co-authored-by: Dean Sheather <dean@deansheather.com>
This commit is contained in:
Colin Adler
2022-11-10 13:26:57 -06:00
committed by GitHub
parent a25deb939b
commit 8c8344ca13
3 changed files with 81 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
provisioner/terraform/executor_internal_test.go
View File

@ -4,25 +4,24 @@ import (
"testing"
"github.com/stretchr/testify/require"
"golang.org/x/xerrors"
"github.com/coder/coder/provisionersdk/proto"
)
type mockLogger struct {
logs []*proto.Log
retVal error
logs []*proto.Log
}
func (m *mockLogger) Log(l *proto.Log) error {
var _ logSink = &mockLogger{}
func (m *mockLogger) Log(l *proto.Log) {
m.logs = append(m.logs, l)
return m.retVal
}
func TestLogWriter_Mainline(t *testing.T) {
t.Parallel()
logr := &mockLogger{retVal: nil}
logr := &mockLogger{}
writer, doneLogging := logWriter(logr, proto.LogLevel_INFO)
_, err := writer.Write([]byte(`Sitting in an English garden
@ -40,23 +39,5 @@ From standing in the English rain`))
{Level: proto.LogLevel_INFO, Output: "If the sun don't come you get a tan"},
{Level: proto.LogLevel_INFO, Output: "From standing in the English rain"},
}
require.Equal(t, logr.logs, expected)
}
func TestLogWriter_SendError(t *testing.T) {
t.Parallel()
logr := &mockLogger{retVal: xerrors.New("Goo goo g'joob")}
writer, doneLogging := logWriter(logr, proto.LogLevel_INFO)
_, err := writer.Write([]byte(`Sitting in an English garden
Waiting for the sun
If the sun don't come you get a tan
From standing in the English rain`))
require.NoError(t, err)
err = writer.Close()
require.NoError(t, err)
<-doneLogging
expected := []*proto.Log{{Level: proto.LogLevel_INFO, Output: "Sitting in an English garden"}}
require.Equal(t, logr.logs, expected)
require.Equal(t, expected, logr.logs)
}