escape reachability search attribute

common/worker_versioning/worker_versioning.go

@@ -51,9 +51,24 @@ const (
 	UnversionedSearchAttribute = buildIdSearchAttributePrefixUnversioned
 )
 
-// ReachabilityBuildIdSearchAttribute returns the search attribute value for the currently assigned build ID
+// escapeBuildIdSearchAttributeDelimiter is a helper which escapes the BuildIdSearchAttributeDelimiter character in the input string
+func escapeBuildIdSearchAttributeDelimiter(s string) string {
+	s = strings.Replace(s, BuildIdSearchAttributeDelimiter, `|`+BuildIdSearchAttributeDelimiter, -1)
+	return s
+}
+
+// ReachabilityBuildIdSearchAttribute returns the search attribute value for the currently assigned build ID in the form
+// 'reachability:<behavior>:<deployment_series_name>:<deployment_build_id>'
 func ReachabilityBuildIdSearchAttribute(behavior enumspb.VersioningBehavior, deployment *deploymentpb.Deployment) string {
-	return fmt.Sprintf("%s:%s:%s", buildIdSearchAttributePrefixReachability, behavior.String(), DeploymentToString(deployment))
+	return sqlparser.String(sqlparser.NewStrVal([]byte(fmt.Sprintf("%s%s%s%s%s%s%s",
+		buildIdSearchAttributePrefixReachability,
+		BuildIdSearchAttributeDelimiter,
+		escapeBuildIdSearchAttributeDelimiter(behavior.String()),
+		BuildIdSearchAttributeDelimiter,
+		escapeBuildIdSearchAttributeDelimiter(deployment.GetSeriesName()),
+		BuildIdSearchAttributeDelimiter,
+		escapeBuildIdSearchAttributeDelimiter(deployment.GetBuildId()),
+	))))
 }
 
 // AssignedBuildIdSearchAttribute returns the search attribute value for the currently assigned build ID

service/worker/deployment/deployment_reachability.go

@@ -27,7 +27,6 @@ package deployment
 import (
 	"context"
 	"fmt"
-	"github.com/temporalio/sqlparser"
 	deploymentpb "go.temporal.io/api/deployment/v1"
 	enumspb "go.temporal.io/api/enums/v1"
 	"go.temporal.io/server/common/cache"
@@ -92,12 +91,10 @@ func makeCountRequest(
 
 func makeDeploymentQuery(seriesName, buildID string, open bool) string {
 	var statusFilter string
-	deploymentFilter := "= " + sqlparser.String(sqlparser.NewStrVal([]byte(
-		worker_versioning.ReachabilityBuildIdSearchAttribute(enumspb.VERSIONING_BEHAVIOR_PINNED, &deploymentpb.Deployment{
-			SeriesName: seriesName,
-			BuildId:    buildID,
-		}),
-	)))
+	deploymentFilter := "= " + worker_versioning.ReachabilityBuildIdSearchAttribute(enumspb.VERSIONING_BEHAVIOR_PINNED, &deploymentpb.Deployment{
+		SeriesName: seriesName,
+		BuildId:    buildID,
+	})
 	if open {
 		statusFilter = "= 'Running'"
 	} else {