VOL-2624 - fix SCA issues
Change-Id: I3a5e0aafc5b6bd6c6e865675a3481db289a7d772
diff --git a/pkg/probe/probe.go b/pkg/probe/probe.go
index 9f00953..932c287 100644
--- a/pkg/probe/probe.go
+++ b/pkg/probe/probe.go
@@ -231,15 +231,26 @@
p.mutex.RLock()
defer p.mutex.RUnlock()
w.Header().Set("Content-Type", "application/json")
- w.Write([]byte("{"))
+ if _, err := w.Write([]byte("{")); err != nil {
+ log.Errorw("write-response", log.Fields{"error": err})
+ w.WriteHeader(http.StatusInternalServerError)
+ return
+ }
comma := ""
for c, s := range p.status {
- w.Write([]byte(fmt.Sprintf("%s\"%s\": \"%s\"", comma, c, s.String())))
+ if _, err := w.Write([]byte(fmt.Sprintf("%s\"%s\": \"%s\"", comma, c, s.String()))); err != nil {
+ log.Errorw("write-response", log.Fields{"error": err})
+ w.WriteHeader(http.StatusInternalServerError)
+ return
+ }
comma = ", "
}
- w.Write([]byte("}"))
+ if _, err := w.Write([]byte("}")); err != nil {
+ log.Errorw("write-response", log.Fields{"error": err})
+ w.WriteHeader(http.StatusInternalServerError)
+ return
+ }
w.WriteHeader(http.StatusOK)
-
}
// ListenAndServe implements 3 HTTP endpoints on the given port for healthz, readz, and detailz. Returns only on error
diff --git a/pkg/probe/probe_test.go b/pkg/probe/probe_test.go
index 9edc561..93f9a03 100644
--- a/pkg/probe/probe_test.go
+++ b/pkg/probe/probe_test.go
@@ -29,7 +29,9 @@
)
func init() {
- log.AddPackage(log.JSON, log.WarnLevel, nil)
+ if _, err := log.AddPackage(log.JSON, log.WarnLevel, nil); err != nil {
+ log.Fatalw("adding-log-package", log.Fields{"error": err})
+ }
}
func TestServiceStatusString(t *testing.T) {
@@ -366,6 +368,7 @@
func TestUpdateStatusFromNilContext(t *testing.T) {
p := &Probe{}
p.RegisterService("one")
+ // nolint: staticcheck
UpdateStatusFromContext(nil, "one", ServiceStatusRunning)
assert.Equal(t, 1, len(p.status), "wrong number of services")