fix(connector): read liveness node id directly, drop type-switch helper

The annotation still carries the full connectionDetails so the data is
available for future connection types without a schema change. But the
extension server reads the only field it uses today — the PublicKey node
id — directly, rather than behind a type-switch helper. Pre-abstracting
node-id extraction before we know what future connection types need is
premature, so the ConnectorConnectionDetails.TunnelNodeID() helper is
removed in favour of a direct, nil-guarded field read.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: scotwells

api/v1alpha1/connector_types.go

@@ -212,30 +212,13 @@ type ConnectorLiveness struct {
 	Ready bool `json:"ready"`
 
 	// ConnectionDetails is the upstream Connector's full
-	// Status.ConnectionDetails, copied verbatim so the extension server can
-	// extract the tunnel node ID in a type-aware way (see TunnelNodeID). Nil
+	// Status.ConnectionDetails, copied verbatim. Carrying the complete structure
+	// keeps the data available for future connection types without an
+	// annotation-schema change; consumers read the field they need directly. Nil
 	// when the upstream connector has not yet published connection details.
 	ConnectionDetails *ConnectorConnectionDetails `json:"connectionDetails,omitempty"`
 }
 
-// TunnelNodeID returns the data-plane tunnel endpoint_id for these connection
-// details, dispatching on the connection Type so new connection types can be
-// added by extending the switch rather than by assuming PublicKey. It returns
-// an empty string for nil details or any type that does not (yet) advertise a
-// node ID.
-func (d *ConnectorConnectionDetails) TunnelNodeID() string {
-	if d == nil {
-		return ""
-	}
-	switch d.Type {
-	case PublicKeyConnectorConnectionType:
-		if d.PublicKey != nil {
-			return d.PublicKey.Id
-		}
-	}
-	return ""
-}
-
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:selectablefield:JSONPath=".status.connectionDetails.publicKey.id"

internal/extensionserver/cache/index.go

@@ -181,10 +181,15 @@ func connectorLiveness(connector *networkingv1alpha1.Connector) (online bool, no
 	if raw, ok := connector.Annotations[networkingv1alpha1.ConnectorLivenessAnnotation]; ok {
 		var liveness networkingv1alpha1.ConnectorLiveness
 		if err := json.Unmarshal([]byte(raw), &liveness); err == nil {
-			// TunnelNodeID dispatches on the connection type, so a new
-			// connection type is supported by extending that switch rather than
-			// by changing the annotation schema here.
-			return liveness.Ready, liveness.ConnectionDetails.TunnelNodeID()
+			// The annotation carries the full connectionDetails so the data is
+			// available for future connection types, but today we read the only
+			// field we use — the PublicKey node id — directly.
+			if details := liveness.ConnectionDetails; details != nil &&
+				details.Type == networkingv1alpha1.PublicKeyConnectorConnectionType &&
+				details.PublicKey != nil {
+				nodeID = details.PublicKey.Id
+			}
+			return liveness.Ready, nodeID
 		}
 		// Unparseable annotation: fall through to status-based classification.
 	}
@@ -194,7 +199,11 @@ func connectorLiveness(connector *networkingv1alpha1.Connector) (online bool, no
 		networkingv1alpha1.ConnectorConditionReady,
 	)
 	if online {
-		nodeID = connector.Status.ConnectionDetails.TunnelNodeID()
+		if details := connector.Status.ConnectionDetails; details != nil &&
+			details.Type == networkingv1alpha1.PublicKeyConnectorConnectionType &&
+			details.PublicKey != nil {
+			nodeID = details.PublicKey.Id
+		}
 	}
 	return online, nodeID
 }