From ff789aa5fd49bdfcf8a34af364f5c91eaef066cb Mon Sep 17 00:00:00 2001 From: dvonthenen Date: Tue, 28 Nov 2023 18:02:00 -0800 Subject: [PATCH] Updates for Go Lint using golangci-lint --- pkg/api/live/v1/default.go | 4 +--- pkg/audio/microphone/microphone.go | 12 ++++++++---- pkg/audio/replay/replay.go | 2 -- pkg/client/live/client.go | 9 +++++---- pkg/client/rest/debug.go | 10 ++++++++-- pkg/client/rest/debug/file.go | 4 ++-- pkg/common/init.go | 16 +++++++++++++--- tests/prerecorded_test.go | 3 +-- 8 files changed, 38 insertions(+), 22 deletions(-) diff --git a/pkg/api/live/v1/default.go b/pkg/api/live/v1/default.go index f2745243..98f872be 100644 --- a/pkg/api/live/v1/default.go +++ b/pkg/api/live/v1/default.go @@ -18,9 +18,7 @@ import ( // DefaultCallbackHandler is a default callback handler for live transcription // Simply prints the transcript to stdout -type DefaultCallbackHandler struct { - sb strings.Builder -} +type DefaultCallbackHandler struct{} // NewDefaultCallbackHandler creates a new DefaultCallbackHandler func NewDefaultCallbackHandler() DefaultCallbackHandler { diff --git a/pkg/audio/microphone/microphone.go b/pkg/audio/microphone/microphone.go index be1d187d..419b13c2 100644 --- a/pkg/audio/microphone/microphone.go +++ b/pkg/audio/microphone/microphone.go @@ -17,12 +17,18 @@ import ( // Initialize inits the library func Initialize() { - portaudio.Initialize() + err := portaudio.Initialize() + if err != nil { + klog.V(1).Printf("portaudio.Initialize failed. Err: %v\n", err) + } } // Teardown cleans up the library func Teardown() { - portaudio.Terminate() + err := portaudio.Terminate() + if err != nil { + klog.V(1).Printf("portaudio.Terminate failed. Err: %v\n", err) + } } // New creates a new microphone using portaudio @@ -99,8 +105,6 @@ func (m *Microphone) Stream(w io.Writer) error { klog.V(7).Infof("io.Writer succeeded. Bytes written: %d\n", byteCount) } } - - return nil } // Mute silences the mic diff --git a/pkg/audio/replay/replay.go b/pkg/audio/replay/replay.go index c675c030..a3918af1 100644 --- a/pkg/audio/replay/replay.go +++ b/pkg/audio/replay/replay.go @@ -106,8 +106,6 @@ func (c *Client) Stream(w io.Writer) error { klog.V(7).Infof("io.Writer succeeded. Bytes written: %d\n", byteCount) } } - - return nil } // Mute silences the replay device diff --git a/pkg/client/live/client.go b/pkg/client/live/client.go index 45921653..25cd4968 100644 --- a/pkg/client/live/client.go +++ b/pkg/client/live/client.go @@ -239,7 +239,10 @@ func (c *Client) listen() { } if c.callback != nil { - c.router.Message(byMsg) + err := c.router.Message(byMsg) + if err != nil { + klog.V(1).Infof("WebSocketClient::listen: router.Message failed. Err: %v\n", err) + } } else { klog.V(7).Infof("WebSocketClient::listen: msg recv (type %d): %s\n", msgType, string(byMsg)) } @@ -415,9 +418,7 @@ func (c *Client) closeWs() { func (c *Client) ping() { klog.V(6).Infof("live.ping() ENTER\n") - var counter uint64 - counter = 0 - + counter := 0 ticker := time.NewTicker(pingPeriod) defer ticker.Stop() for { diff --git a/pkg/client/rest/debug.go b/pkg/client/rest/debug.go index 58c101fa..fd2daa97 100644 --- a/pkg/client/rest/debug.go +++ b/pkg/client/rest/debug.go @@ -70,7 +70,10 @@ func (d *debugRoundTrip) debugRequest(req *http.Request) string { // Capture headers var wc io.WriteCloser = d.newFile("req.headers") b, _ := httputil.DumpRequest(req, false) - wc.Write(b) + _, err := wc.Write(b) + if err != nil { + d.logf("Error writing request headers: %v", err) + } wc.Close() ext := d.ext(req.Header) @@ -94,7 +97,10 @@ func (d *debugRoundTrip) debugResponse(res *http.Response, ext string) { // Capture headers var wc io.WriteCloser = d.newFile("res.headers") b, _ := httputil.DumpResponse(res, false) - wc.Write(b) + _, err := wc.Write(b) + if err != nil { + d.logf("Error writing response headers: %v", err) + } wc.Close() // Capture body diff --git a/pkg/client/rest/debug/file.go b/pkg/client/rest/debug/file.go index 7dd5d897..780f7c0a 100644 --- a/pkg/client/rest/debug/file.go +++ b/pkg/client/rest/debug/file.go @@ -21,7 +21,7 @@ type FileProvider struct { files []*os.File } -func (fp FileProvider) NewFile(p string) io.WriteCloser { +func (fp *FileProvider) NewFile(p string) io.WriteCloser { f, err := os.Create(path.Join(fp.Path, p)) if err != nil { panic(err) @@ -34,7 +34,7 @@ func (fp FileProvider) NewFile(p string) io.WriteCloser { return NewFileWriterCloser(f, p) } -func (fp FileProvider) Flush() { +func (fp *FileProvider) Flush() { fp.mu.Lock() defer fp.mu.Unlock() for _, f := range fp.files { diff --git a/pkg/common/init.go b/pkg/common/init.go index 1cd10e40..60004c4b 100644 --- a/pkg/common/init.go +++ b/pkg/common/init.go @@ -9,6 +9,7 @@ package common import ( "flag" + "fmt" "strconv" klog "k8s.io/klog/v2" @@ -57,10 +58,19 @@ func Init(init InitLib) { } klog.InitFlags(nil) - flag.Set("v", strconv.FormatInt(int64(init.LogLevel), 10)) + err := flag.Set("v", strconv.FormatInt(int64(init.LogLevel), 10)) + if err != nil { + fmt.Printf("Error setting log level: %v", err) + } if init.DebugFilePath != "" { - flag.Set("logtostderr", "false") - flag.Set("log_file", init.DebugFilePath) + err = flag.Set("logtostderr", "false") + if err != nil { + fmt.Printf("Error setting logtostderr: %v", err) + } + err = flag.Set("log_file", init.DebugFilePath) + if err != nil { + fmt.Printf("Error setting log_file: %v", err) + } } flag.Parse() } diff --git a/tests/prerecorded_test.go b/tests/prerecorded_test.go index c769fd79..2da89d7e 100644 --- a/tests/prerecorded_test.go +++ b/tests/prerecorded_test.go @@ -24,7 +24,6 @@ func TestPrerecordedFromURL(t *testing.T) { const preRecordedEndPoint = "https://api.deepgram.com/v1/listen" const betaEndPoint = "https://beta.api.deepgram.com/v1/listen" - const betaHost = "beta.api.deepgram.com" // Specify query params that are acceptable. A nil means no check var acceptParams = map[string][]string{ @@ -107,7 +106,7 @@ func TestPrerecordedFromURL(t *testing.T) { } // Based on query parameters, send Mock responses - var resp = &http.Response{} + var resp *http.Response if options.Get("summarize") == "v2" { resp = httpmock.NewStringResponse(200, MockSummarizeV2Response) } else if options.Get("summarize") == "true" {