fix failure scenario

Author: josephbarnett

pkg/diagnostic/cz/check.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"fmt"
 	net "net/http"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 
@@ -38,14 +39,17 @@ func (c *checker) Check(ctx context.Context, client *net.Client, accessor status
 	_, err := http.Do(
 		ctx, client, net.MethodGet,
 		map[string]string{
-			http.HeaderAuthorization:  fmt.Sprintf("Bearer %s", c.cfg.Cloudzero.Credential),
+			http.HeaderAuthorization:  strings.TrimSpace(c.cfg.Cloudzero.Credential),
 			http.HeaderAcceptEncoding: http.ContentTypeJSON,
 		},
-		map[string]string{
-			http.QueryParamAccountID:   c.cfg.Deployment.AccountID,
-			http.QueryParamRegion:      c.cfg.Deployment.Region,
-			http.QueryParamClusterName: c.cfg.Deployment.ClusterName,
-		}, url, nil,
+		nil,
+		// TODO: Add HEAD endpoint for container-metrics/status and pass these to check the API key
+		// map[string]string{
+		// 	http.QueryParamAccountID:   c.cfg.Deployment.AccountID,
+		// 	http.QueryParamRegion:      c.cfg.Deployment.Region,
+		// 	http.QueryParamClusterName: c.cfg.Deployment.ClusterName,
+		// },
+		url, nil,
 	)
 	if err == nil {
 		accessor.AddCheck(&status.StatusCheck{Name: DiagnosticAPIKey, Passing: true})

pkg/diagnostic/runner/runner.go

@@ -125,19 +125,29 @@ func (r *runner) Run(ctx context.Context) (status.Accessor, error) {
 	}
 
 	// check the results (and set correct end code)
+	processFailures(ctx, recorder, r)()
+
+	return recorder, nil
+}
+
+// this function returns a function which will set an error code if necessary
+func processFailures(ctx context.Context, recorder status.Accessor, r *runner) func() {
+	var handleFailure func() = func() {}
 	recorder.ReadFromReport(func(cs *status.ClusterStatus) {
 		if r.stage != config.ContextStageInit {
 			return
 		}
 		for _, c := range cs.Checks {
 			if !c.Passing {
 				if chkr := r.reg.Get(config.DiagnosticInternalInitFailed); len(chkr) > 0 {
-					_ = chkr[0].Check(ctx, r.client, recorder)
+					// set to read handler since we already hold the lock
+					handleFailure = func() {
+						_ = chkr[0].Check(ctx, r.client, recorder)
+					}
 				}
 				break
 			}
 		}
 	})
-
-	return recorder, nil
+	return handleFailure
 }

pkg/http/http.go

@@ -60,7 +60,7 @@ func Do(
 			return http.StatusInternalServerError, errors.Wrap(err, fmt.Sprintf("network error: %s", req.URL.String()))
 		}
 		logrus.WithError(err).Error("Failed to make request")
-		return http.StatusInternalServerError, ErrStatusInternalServerError
+		return http.StatusInternalServerError, err
 	}
 	return resp.StatusCode, ToError(resp.StatusCode)
 }