Address bugs-level lints from golangci-lint

.github/workflows/tests.yml

@@ -19,9 +19,6 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Go Vet
-        run: go vet ./...
-
       - name: Go Test
         run: |
           go run main.go --version

.golangci.yml

@@ -0,0 +1,3 @@
+linters:
+  presets:
+    - bugs

cmd/createbookmark.go

@@ -118,8 +118,12 @@ func CreateBookmark(signals chan os.Signal, ready chan bool) int {
 		}).Info("created bookmark excluded item")
 	}
 
-	b, _ := json.MarshalIndent(response.Msg.Bookmark.Properties, "", "  ")
-	log.Info(string(b))
+	b, err := json.MarshalIndent(response.Msg.Bookmark.Properties, "", "  ")
+	if err != nil {
+		log.Infof("Error rendering bookmark: %v", err)
+	} else {
+		log.Info(string(b))
+	}
 
 	return 0
 }

cmd/getbookmark.go

@@ -101,8 +101,12 @@ func GetBookmark(signals chan os.Signal, ready chan bool) int {
 		}).Info("found bookmark excluded item")
 	}
 
-	b, _ := json.MarshalIndent(response.Msg.Bookmark.Properties, "", "  ")
-	log.Info(string(b))
+	b, err := json.MarshalIndent(response.Msg.Bookmark.Properties, "", "  ")
+	if err != nil {
+		log.Infof("Error rendering bookmark: %v", err)
+	} else {
+		log.Info(string(b))
+	}
 
 	return 0
 }

cmd/getchange.go

@@ -97,8 +97,13 @@ func GetChange(signals chan os.Signal, ready chan bool) int {
 
 	switch viper.GetString("format") {
 	case "json":
-		b, _ := json.MarshalIndent(response.Msg.Change, "", "  ")
-		fmt.Println(string(b))
+		b, err := json.MarshalIndent(response.Msg.Change, "", "  ")
+		if err != nil {
+			log.Errorf("Error rendering bookmark: %v", err)
+			return 1
+		} else {
+			fmt.Println(string(b))
+		}
 	case "markdown":
 		changeUrl := fmt.Sprintf("%v/changes/%v", viper.GetString("frontend"), changeUuid.String())
 		if response.Msg.Change.Metadata.NumAffectedApps != 0 || response.Msg.Change.Metadata.NumAffectedItems != 0 {

cmd/request.go

@@ -88,6 +88,7 @@ func Request(signals chan os.Signal, ready chan bool) int {
 		HTTPClient: NewAuthenticatedClient(ctx, otelhttp.DefaultClient),
 	}
 
+	// nolint: bodyclose // nhooyr.io/websocket reads the body internally
 	c, _, err := websocket.Dial(ctx, gatewayUrl, options)
 	if err != nil {
 		log.WithContext(ctx).WithFields(lf).WithError(err).Error("Failed to connect to overmind API")
@@ -197,6 +198,8 @@ responses:
 				statusFields["query"] = queryUuid
 
 				switch status.Status {
+				case sdp.QueryStatus_UNSPECIFIED:
+					statusFields["unexpected_status"] = true
 				case sdp.QueryStatus_STARTED:
 					activeQueries[*queryUuid] = true
 				case sdp.QueryStatus_FINISHED:

cmd/root.go

@@ -152,7 +152,7 @@ func ensureToken(ctx context.Context, requiredScopes []string, signals chan os.S
 
 		// Start the webserver
 		log.WithContext(ctx).Trace("Starting webserver to listen for callback, press Ctrl+C to cancel")
-		srv := &http.Server{Addr: ":7837"}
+		srv := &http.Server{Addr: ":7837", ReadHeaderTimeout: 30 * time.Second}
 		http.HandleFunc("/oauth/callback", handler)
 
 		go func() {
@@ -192,18 +192,18 @@ func getChangeUuid(ctx context.Context, expectedStatus sdp.ChangeStatus, errNotF
 	if viper.GetString("uuid") != "" {
 		changeUuid, err = uuid.Parse(viper.GetString("uuid"))
 		if err != nil {
-			return uuid.Nil, fmt.Errorf("invalid --uuid value '%v', error: %v", viper.GetString("uuid"), err)
+			return uuid.Nil, fmt.Errorf("invalid --uuid value '%v', error: %w", viper.GetString("uuid"), err)
 		}
 	}
 
 	if viper.GetString("change") != "" {
 		changeUrl, err := url.ParseRequestURI(viper.GetString("change"))
 		if err != nil {
-			return uuid.Nil, fmt.Errorf("invalid --change value '%v', error: %v", viper.GetString("change"), err)
+			return uuid.Nil, fmt.Errorf("invalid --change value '%v', error: %w", viper.GetString("change"), err)
 		}
 		changeUuid, err = uuid.Parse(path.Base(changeUrl.Path))
 		if err != nil {
-			return uuid.Nil, fmt.Errorf("invalid --change value '%v', couldn't parse: %v", viper.GetString("change"), err)
+			return uuid.Nil, fmt.Errorf("invalid --change value '%v', couldn't parse: %w", viper.GetString("change"), err)
 		}
 	}
 

cmd/submitplan.go

@@ -276,6 +276,7 @@ func SubmitPlan(signals chan os.Signal, ready chan bool) int {
 		}
 
 		log.WithContext(ctx).WithFields(lf).WithField("item_count", len(queries)).Info("identifying items")
+		// nolint: bodyclose // nhooyr.io/websocket reads the body internally
 		c, _, err := websocket.Dial(ctx, viper.GetString("gateway-url"), options)
 		if err != nil {
 			log.WithContext(ctx).WithFields(lf).WithError(err).Error("Failed to connect to overmind API")
@@ -399,6 +400,8 @@ func SubmitPlan(signals chan os.Signal, ready chan bool) int {
 					statusFields["query"] = queryUuid
 
 					switch status.Status {
+					case sdp.QueryStatus_UNSPECIFIED:
+						statusFields["unexpected_status"] = true
 					case sdp.QueryStatus_STARTED:
 						activeQueries[*queryUuid] = true
 					case sdp.QueryStatus_FINISHED:

tracing/main.go

@@ -147,6 +147,7 @@ func InitTracer(opts ...otlptracehttp.Option) error {
 	return nil
 }
 
+// nolint: contextcheck // deliberate use of local context to avoid getting tangled up in any existing timeouts or cancels
 func ShutdownTracer() {
 	// Flush buffered events before the program terminates.
 	defer sentry.Flush(5 * time.Second)