Skip to content

Agent Mesh

node: move parseRequiredLabels next to the label gate

Tomas Tormo226740b24e99
diff --git a/internal/node/labels_gate.go b/internal/node/labels_gate.go
index 33d78478..6adcbe92 100644
--- a/internal/node/labels_gate.go
+++ b/internal/node/labels_gate.go
@@ -19,6 +19,7 @@ import (
"crypto/ed25519"
"fmt"
"sort"
+ "strings"
"time"
"github.com/google/sam/api"
@@ -28,6 +29,41 @@ import (
"google.golang.org/protobuf/proto"
)
+// parseRequiredLabels splits the X-Sam-Required-Labels header value
+// (comma-separated "key=value" pairs) into a label map; any malformed entry
+// rejects the whole request.
+func parseRequiredLabels(h string) (map[string]string, error) {
+ if h == "" {
+ return nil, nil
+ }
+ var out map[string]string
+ for _, part := range strings.Split(h, ",") {
+ part = strings.TrimSpace(part)
+ if part == "" {
+ continue
+ }
+ k, v, ok := strings.Cut(part, "=")
+ if !ok {
+ return nil, fmt.Errorf("invalid label %q: expected key=value", part)
+ }
+ k, v = strings.TrimSpace(k), strings.TrimSpace(v)
+ if err := api.ValidateLabelKey(k); err != nil {
+ return nil, err
+ }
+ if err := api.ValidateLabelValue(v); err != nil {
+ return nil, err
+ }
+ if out == nil {
+ out = make(map[string]string)
+ }
+ if _, exists := out[k]; exists {
+ return nil, fmt.Errorf("duplicate label key %q", k)
+ }
+ out[k] = v
+ }
+ return out, nil
+}
+
// The label gate is the consumer-side enforcement point for label
// requirements: gossip labels only rank providers, this gate verifies the
// provider's control-plane-attested label() facts (api.FactLabel) before
diff --git a/internal/node/openai_scorer.go b/internal/node/openai_scorer.go
index 5fd33cea..b7a34561 100644
--- a/internal/node/openai_scorer.go
+++ b/internal/node/openai_scorer.go
@@ -15,13 +15,9 @@
package node
import (
- "fmt"
"net/http"
"sort"
- "strings"
"time"
-
- "github.com/google/sam/api"
)
// providerBackoff is how long a provider is skipped after a retryable failure.
@@ -37,41 +33,6 @@ const (
reasonAttemptsExceeded = "attempts_exceeded"
)
-// parseRequiredLabels splits the X-Sam-Required-Labels header value
-// (comma-separated "key=value" pairs) into a label map; any malformed entry
-// rejects the whole request.
-func parseRequiredLabels(h string) (map[string]string, error) {
- if h == "" {
- return nil, nil
- }
- var out map[string]string
- for _, part := range strings.Split(h, ",") {
- part = strings.TrimSpace(part)
- if part == "" {
- continue
- }
- k, v, ok := strings.Cut(part, "=")
- if !ok {
- return nil, fmt.Errorf("invalid label %q: expected key=value", part)
- }
- k, v = strings.TrimSpace(k), strings.TrimSpace(v)
- if err := api.ValidateLabelKey(k); err != nil {
- return nil, err
- }
- if err := api.ValidateLabelValue(v); err != nil {
- return nil, err
- }
- if out == nil {
- out = make(map[string]string)
- }
- if _, exists := out[k]; exists {
- return nil, fmt.Errorf("duplicate label key %q", k)
- }
- out[k] = v
- }
- return out, nil
-}
-
// labelsAllowed reports whether a provider's claimed labels satisfy any
// required key=value pair (exact match).
func labelsAllowed(required, claimed map[string]string) bool {