refactor: clean up code by adding missing line breaks and comments for clarity

Author: juicycleff

gateway/client.go

@@ -165,6 +165,7 @@ func (c *Client) WatchServices(ctx context.Context, serviceName string, onChange
 					// Route table unchanged — update cache but skip remounting
 					c.manifestCache[event.Manifest.InstanceID] = event.Manifest
 					c.mu.Unlock()
+
 					return
 				}
 			}
@@ -196,8 +197,10 @@ func (c *Client) WatchServices(ctx context.Context, serviceName string, onChange
 		if newHash == c.currentRoutesHash {
 			// Routes unchanged — skip remounting
 			c.mu.Unlock()
+
 			return
 		}
+
 		c.currentRoutesHash = newHash
 		c.mu.Unlock()
 
@@ -229,6 +232,7 @@ func (c *Client) WatchServicesAtomic(ctx context.Context, serviceName string, ha
 
 	if err := handler.CommitRoutes(); err != nil {
 		_ = handler.RollbackRoutes()
+
 		return fmt.Errorf("failed to commit initial routes: %w", err)
 	}
 
@@ -248,6 +252,7 @@ func (c *Client) WatchServicesAtomic(ctx context.Context, serviceName string, ha
 					old.RoutesChecksum == event.Manifest.RoutesChecksum {
 					c.manifestCache[event.Manifest.InstanceID] = event.Manifest
 					c.mu.Unlock()
+
 					return
 				}
 			}
@@ -275,8 +280,10 @@ func (c *Client) WatchServicesAtomic(ctx context.Context, serviceName string, ha
 		c.mu.Lock()
 		if newHash == c.currentRoutesHash {
 			c.mu.Unlock()
+
 			return
 		}
+
 		c.currentRoutesHash = newHash
 		c.mu.Unlock()
 
@@ -302,6 +309,7 @@ func (c *Client) convertToRouteDescriptors(manifests []*farp.SchemaManifest) []f
 		// Prefer pre-computed route table if available
 		if len(manifest.RouteTable) > 0 {
 			routes = append(routes, manifest.RouteTable...)
+
 			continue
 		}
 
@@ -339,7 +347,7 @@ func computeRouteTableHash(routes []ServiceRoute) string {
 		return entries[i].Path < entries[j].Path
 	})
 
-	data, _ := json.Marshal(entries)
+	data, _ := json.Marshal(entries) //nolint:errchkjson // simple struct cannot fail to marshal
 	hash := sha256.Sum256(data)
 
 	return hex.EncodeToString(hash[:])
@@ -365,10 +373,11 @@ func computeRouteDescriptorHash(routes []farp.RouteDescriptor) string {
 		if entries[i].Path != entries[j].Path {
 			return entries[i].Path < entries[j].Path
 		}
+
 		return entries[i].Protocol < entries[j].Protocol
 	})
 
-	data, _ := json.Marshal(entries)
+	data, _ := json.Marshal(entries) //nolint:errchkjson // simple struct cannot fail to marshal
 	hash := sha256.Sum256(data)
 
 	return hex.EncodeToString(hash[:])
@@ -479,7 +488,7 @@ func (c *Client) fetchSchema(ctx context.Context, descriptor *farp.SchemaDescrip
 		}
 
 		// Execute request
-		resp, err := c.httpClient.Do(req)
+		resp, err := c.httpClient.Do(req) //nolint:gosec // URL comes from service manifest, not user input
 		if err != nil {
 			return nil, fmt.Errorf("failed to fetch schema from URL %s: %w", descriptor.Location.URL, err)
 		}
@@ -849,7 +858,7 @@ func computeManifestsHash(cache map[string]*farp.SchemaManifest) string {
 		return entries[i].ID < entries[j].ID
 	})
 
-	data, _ := json.Marshal(entries)
+	data, _ := json.Marshal(entries) //nolint:errchkjson // simple struct cannot fail to marshal
 	hash := sha256.Sum256(data)
 
 	return hex.EncodeToString(hash[:])

gateway/client_test.go

@@ -1233,6 +1233,7 @@ func TestClient_MultiSchemaManifest(t *testing.T) {
 		switch schemaType {
 		case "openapi":
 			hasREST = true
+
 			if route.Path != "/api/users" {
 				t.Errorf("REST route path = %v, want /api/users", route.Path)
 			}
@@ -1242,6 +1243,7 @@ func TestClient_MultiSchemaManifest(t *testing.T) {
 			}
 		case "asyncapi":
 			hasWebSocket = true
+
 			if route.Path != "/ws/events" {
 				t.Errorf("WebSocket route path = %v, want /ws/events", route.Path)
 			}

gateway/federated.go

@@ -90,10 +90,13 @@ func (h *FederatedSchemaHandler) ensureFresh(r *http.Request) error {
 	currentHash := h.client.GetManifestsHash()
 
 	h.cache.mu.RLock()
+
 	if h.cache.manifestsHash == currentHash && h.cache.result != nil {
 		h.cache.mu.RUnlock()
+
 		return nil
 	}
+
 	h.cache.mu.RUnlock()
 
 	// Re-merge needed
@@ -151,6 +154,7 @@ func (h *FederatedSchemaHandler) ensureFresh(r *http.Request) error {
 func (h *FederatedSchemaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodGet {
 		http.Error(w, `{"error":"method not allowed"}`, http.StatusMethodNotAllowed)
+
 		return
 	}
 
@@ -171,8 +175,8 @@ func (h *FederatedSchemaHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusInternalServerError)
 
-		errResp, _ := json.Marshal(map[string]string{"error": err.Error()})
-		w.Write(errResp)
+		errResp, _ := json.Marshal(map[string]string{"error": err.Error()}) //nolint:errchkjson // error response marshaling cannot fail
+		_, _ = w.Write(errResp)
 
 		return
 	}
@@ -207,13 +211,13 @@ func (h *FederatedSchemaHandler) serveJSON(w http.ResponseWriter, data []byte) {
 
 	if len(data) == 0 {
 		w.WriteHeader(http.StatusNotFound)
-		w.Write([]byte(`{"error":"no schemas available for this protocol"}`))
+		_, _ = w.Write([]byte(`{"error":"no schemas available for this protocol"}`))
 
 		return
 	}
 
 	w.WriteHeader(http.StatusOK)
-	w.Write(data)
+	_, _ = w.Write(data)
 }
 
 // federatedSummary is the JSON structure for the /summary endpoint.
@@ -257,7 +261,7 @@ func (h *FederatedSchemaHandler) serveSummary(w http.ResponseWriter) {
 	w.Header().Set("X-Farp-Federated", "true")
 	w.WriteHeader(http.StatusOK)
 
-	json.NewEncoder(w).Encode(summary)
+	_ = json.NewEncoder(w).Encode(summary) //nolint:errchkjson // best-effort HTTP response write
 }
 
 // Invalidate forces the next request to rebuild the federated schemas.

gateway/federated_test.go

@@ -121,6 +121,7 @@ func TestFederatedHandler_OpenAPIEndpoint(t *testing.T) {
 
 	// Verify it's valid OpenAPI JSON
 	body, _ := io.ReadAll(resp.Body)
+
 	var spec merger.OpenAPISpec
 	if err := json.Unmarshal(body, &spec); err != nil {
 		t.Fatalf("Failed to unmarshal OpenAPI JSON: %v", err)

manifest.go

@@ -378,6 +378,7 @@ func CalculateRoutesChecksum(manifest *SchemaManifest) (string, error) {
 		if sortedRoutes[i].Path != sortedRoutes[j].Path {
 			return sortedRoutes[i].Path < sortedRoutes[j].Path
 		}
+
 		return sortedRoutes[i].Protocol < sortedRoutes[j].Protocol
 	})
 

merger/merger.go

@@ -486,10 +486,12 @@ func rewritePathItemRefs(item PathItem, prefix string) PathItem {
 		if schema == nil {
 			return nil
 		}
+
 		rewritten := RewriteRefs(schema, prefix)
 		if m, ok := rewritten.(map[string]any); ok {
 			return m
 		}
+
 		return schema
 	}
 
@@ -504,14 +506,17 @@ func rewritePathItemRefs(item PathItem, prefix string) PathItem {
 		if op == nil {
 			return
 		}
+
 		for code, resp := range op.Responses {
 			rewriteMediaTypes(resp.Content)
 			op.Responses[code] = resp
 		}
+
 		for i, param := range op.Parameters {
 			param.Schema = rewriteSchema(param.Schema)
 			op.Parameters[i] = param
 		}
+
 		if op.RequestBody != nil {
 			rewriteMediaTypes(op.RequestBody.Content)
 		}

merger/merger_test.go

@@ -511,6 +511,7 @@ func TestMerger_Merge_CollapseServiceTags(t *testing.T) {
 	// Should have exactly 1 tag: "TwinOS"
 	if len(result.Spec.Tags) != 1 {
 		t.Errorf("expected 1 collapsed tag, got %d", len(result.Spec.Tags))
+
 		for _, tag := range result.Spec.Tags {
 			t.Logf("  tag: %s", tag.Name)
 		}
@@ -527,6 +528,7 @@ func TestMerger_Merge_CollapseServiceTags(t *testing.T) {
 			if op == nil {
 				continue
 			}
+
 			if len(op.Tags) != 1 || op.Tags[0] != "TwinOS" {
 				t.Errorf("operation at %s should have tags [TwinOS], got %v", path, op.Tags)
 			}
@@ -575,6 +577,7 @@ func TestMerger_Merge_CollapseServiceTags_MultipleServices(t *testing.T) {
 	// Should have exactly 2 tags: "TwinOS" and "Portal"
 	if len(result.Spec.Tags) != 2 {
 		t.Errorf("expected 2 collapsed tags, got %d", len(result.Spec.Tags))
+
 		for _, tag := range result.Spec.Tags {
 			t.Logf("  tag: %s", tag.Name)
 		}
@@ -588,6 +591,7 @@ func TestMerger_Merge_CollapseServiceTags_MultipleServices(t *testing.T) {
 	if !tagNames["TwinOS"] {
 		t.Error("expected 'TwinOS' tag")
 	}
+
 	if !tagNames["Portal"] {
 		t.Error("expected 'Portal' tag")
 	}