Use new versioning fields

common/testing/testvars/test_vars.go

@@ -41,6 +41,7 @@ import (
 	persistencespb "go.temporal.io/server/api/persistence/v1"
 	"go.temporal.io/server/common/namespace"
 	"go.temporal.io/server/common/primitives/timestamp"
+	"go.temporal.io/server/common/worker_versioning"
 	"google.golang.org/protobuf/types/known/durationpb"
 )
 
@@ -255,9 +256,9 @@ func (tv *TestVars) Deployment() *deploymentpb.Deployment {
 	}
 }
 
-func (tv *TestVars) DeploymentTransition() *workflowpb.DeploymentTransition {
-	return &workflowpb.DeploymentTransition{
-		Deployment: tv.Deployment(),
+func (tv *TestVars) DeploymentVersionTransition() *workflowpb.DeploymentVersionTransition {
+	return &workflowpb.DeploymentVersionTransition{
+		DeploymentVersion: worker_versioning.DeploymentVersionFromDeployment(tv.Deployment()),
 	}
 }
 
@@ -396,3 +397,15 @@ func (tv *TestVars) Any() Any {
 func (tv *TestVars) Global() Global {
 	return newGlobal()
 }
+
+func (tv *TestVars) WorkerDeploymentOptions(versioned bool) *deploymentpb.WorkerDeploymentOptions {
+	m := enumspb.WORKFLOW_VERSIONING_MODE_UNVERSIONED
+	if versioned {
+		m = enumspb.WORKFLOW_VERSIONING_MODE_VERSIONING_BEHAVIORS
+	}
+	return &deploymentpb.WorkerDeploymentOptions{
+		Version:                tv.BuildID(),
+		Name:                   tv.DeploymentSeries(),
+		WorkflowVersioningMode: m,
+	}
+}

common/worker_versioning/worker_versioning.go

@@ -159,7 +159,16 @@ func BuildIdIfUsingVersioning(stamp *commonpb.WorkerVersionStamp) string {
 }
 
 // DeploymentFromCapabilities returns the deployment if it is using versioning V3, otherwise nil.
-func DeploymentFromCapabilities(capabilities *commonpb.WorkerVersionCapabilities) *deploymentpb.Deployment {
+// It returns the deployment from the `options` if present, otherwise, from `capabilities`,
+func DeploymentFromCapabilities(capabilities *commonpb.WorkerVersionCapabilities, options *deploymentpb.WorkerDeploymentOptions) *deploymentpb.Deployment {
+	if options.GetWorkflowVersioningMode() != enumspb.WORKFLOW_VERSIONING_MODE_UNVERSIONED &&
+		options.GetName() != "" &&
+		options.GetVersion() != "" {
+		return &deploymentpb.Deployment{
+			SeriesName: options.GetName(),
+			BuildId:    options.GetVersion(),
+		}
+	}
 	if capabilities.GetUseVersioning() && capabilities.GetDeploymentSeriesName() != "" && capabilities.GetBuildId() != "" {
 		return &deploymentpb.Deployment{
 			SeriesName: capabilities.GetDeploymentSeriesName(),
@@ -169,6 +178,23 @@ func DeploymentFromCapabilities(capabilities *commonpb.WorkerVersionCapabilities
 	return nil
 }
 
+// DeploymentOrVersion Temporary helper function to return a Deployment based on passed Deployment
+// or WorkerDeploymentVersion objects, if `v` is not nil, it'll take precedence.
+func DeploymentOrVersion(d *deploymentpb.Deployment, v *deploymentpb.WorkerDeploymentVersion) *deploymentpb.Deployment {
+	if v != nil {
+		return DeploymentIfValid(DeploymentFromDeploymentVersion(v))
+	}
+	return DeploymentIfValid(d)
+}
+
+// DeploymentIfValid returns the deployment back if is both of its fields have value.
+func DeploymentIfValid(d *deploymentpb.Deployment) *deploymentpb.Deployment {
+	if d.GetSeriesName() != "" && d.GetBuildId() != "" {
+		return d
+	}
+	return nil
+}
+
 // DeploymentToString is intended to be used for logs and metrics only. Theoretically, it can map
 // different deployments to the string.
 // DO NOT USE IN SERVER LOGIC.
@@ -195,7 +221,10 @@ func MakeDirectiveForWorkflowTask(
 	deployment *deploymentpb.Deployment,
 ) *taskqueuespb.TaskVersionDirective {
 	if behavior != enumspb.VERSIONING_BEHAVIOR_UNSPECIFIED {
-		return &taskqueuespb.TaskVersionDirective{Behavior: behavior, Deployment: deployment}
+		return &taskqueuespb.TaskVersionDirective{
+			Behavior:          behavior,
+			DeploymentVersion: DeploymentVersionFromDeployment(deployment),
+		}
 	}
 	if id := BuildIdIfUsingVersioning(stamp); id != "" && assignedBuildId == "" {
 		// TODO: old versioning only [cleanup-old-wv]
@@ -211,6 +240,30 @@ func MakeDirectiveForWorkflowTask(
 	return nil
 }
 
+// DeploymentVersionFromDeployment Temporary helper function to convert Deployment to
+// WorkerDeploymentVersion proto until we update code to use the new proto in all places.
+func DeploymentVersionFromDeployment(deployment *deploymentpb.Deployment) *deploymentpb.WorkerDeploymentVersion {
+	if deployment == nil {
+		return nil
+	}
+	return &deploymentpb.WorkerDeploymentVersion{
+		Version:        deployment.GetBuildId(),
+		DeploymentName: deployment.GetSeriesName(),
+	}
+}
+
+// DeploymentFromDeploymentVersion Temporary helper function to convert WorkerDeploymentVersion to
+// Deployment proto until we update code to use the new proto in all places.
+func DeploymentFromDeploymentVersion(dv *deploymentpb.WorkerDeploymentVersion) *deploymentpb.Deployment {
+	if dv == nil {
+		return nil
+	}
+	return &deploymentpb.Deployment{
+		BuildId:    dv.GetVersion(),
+		SeriesName: dv.GetDeploymentName(),
+	}
+}
+
 func MakeUseAssignmentRulesDirective() *taskqueuespb.TaskVersionDirective {
 	return &taskqueuespb.TaskVersionDirective{BuildId: &taskqueuespb.TaskVersionDirective_UseAssignmentRules{UseAssignmentRules: &emptypb.Empty{}}}
 }
@@ -252,6 +305,21 @@ func ValidateDeployment(deployment *deploymentpb.Deployment) error {
 	return nil
 }
 
+// ValidateDeploymentVersion returns error if the deployment version is nil or it has empty version
+// or deployment name.
+func ValidateDeploymentVersion(version *deploymentpb.WorkerDeploymentVersion) error {
+	if version == nil {
+		return serviceerror.NewInvalidArgument("deployment cannot be nil")
+	}
+	if version.GetDeploymentName() == "" {
+		return serviceerror.NewInvalidArgument("deployment name name cannot be empty")
+	}
+	if version.GetVersion() == "" {
+		return serviceerror.NewInvalidArgument("version cannot be empty")
+	}
+	return nil
+}
+
 func ValidateVersioningOverride(override *workflowpb.VersioningOverride) error {
 	if override == nil {
 		return nil
@@ -260,13 +328,18 @@ func ValidateVersioningOverride(override *workflowpb.VersioningOverride) error {
 	case enumspb.VERSIONING_BEHAVIOR_PINNED:
 		if override.GetDeployment() != nil {
 			return ValidateDeployment(override.GetDeployment())
+		} else if override.GetPinnedVersion() != nil {
+			return ValidateDeploymentVersion(override.GetPinnedVersion())
 		} else {
 			return serviceerror.NewInvalidArgument("must provide deployment if behavior is 'PINNED'")
 		}
 	case enumspb.VERSIONING_BEHAVIOR_AUTO_UPGRADE:
 		if override.GetDeployment() != nil {
 			return serviceerror.NewInvalidArgument("only provide deployment if behavior is 'PINNED'")
 		}
+		if override.GetPinnedVersion() != nil {
+			return serviceerror.NewInvalidArgument("only provide pinned version if behavior is 'PINNED'")
+		}
 	case enumspb.VERSIONING_BEHAVIOR_UNSPECIFIED:
 		return serviceerror.NewInvalidArgument("override behavior is required")
 	default:
@@ -307,7 +380,7 @@ func ValidateTaskVersionDirective(
 			directiveBehavior, wfBehavior))
 	}
 
-	directiveDeployment := directive.GetDeployment()
+	directiveDeployment := DirectiveDeployment(directive)
 	if directiveDeployment == nil {
 		// TODO: remove this once the ScheduledDeployment field is removed from proto
 		directiveDeployment = scheduledDeployment
@@ -321,3 +394,11 @@ func ValidateTaskVersionDirective(
 	}
 	return nil
 }
+
+// DirectiveDeployment Temporary function until Directive proto is removed.
+func DirectiveDeployment(directive *taskqueuespb.TaskVersionDirective) *deploymentpb.Deployment {
+	if dv := directive.GetDeploymentVersion(); dv != nil {
+		return DeploymentFromDeploymentVersion(dv)
+	}
+	return directive.GetDeployment()
+}

go.mod

@@ -7,7 +7,7 @@ retract (
 	v1.26.0 // Published accidentally.
 )
 
-replace go.temporal.io/api => go.temporal.io/api v1.43.2-0.20250116180204-00f5e1d8a293
+replace go.temporal.io/api => go.temporal.io/api v1.43.2-0.20250117224308-f070b00264f6
 
 require (
 	cloud.google.com/go/storage v1.41.0
@@ -58,7 +58,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.31.0
 	go.opentelemetry.io/otel/sdk/metric v1.31.0
 	go.opentelemetry.io/otel/trace v1.31.0
-	go.temporal.io/api v1.43.2-0.20250114194029-61f369a5f511
+	go.temporal.io/api v1.43.2-0.20250117001709-252998cf2351
 	go.temporal.io/sdk v1.31.0
 	go.temporal.io/version v0.3.0
 	go.uber.org/automaxprocs v1.5.3