@@ -2561,7 +2561,7 @@ func (ms *MutableStateImpl) ApplyWorkflowExecutionStartedEvent(
25612561 if event .ParentPinnedWorkerDeploymentVersion != "" || event .ParentPinnedDeploymentVersion != nil {
25622562 parentPinned := event .ParentPinnedDeploymentVersion
25632563 if parentPinned == nil {
2564- parentPinned = worker_versioning .WorkerDeploymentVersionFromString (event .ParentPinnedWorkerDeploymentVersion ) //nolint:staticcheck // SA1019: worker versioning v0.31
2564+ parentPinned = worker_versioning .ExternalWorkerDeploymentVersionFromString (event .ParentPinnedWorkerDeploymentVersion ) //nolint:staticcheck // SA1019: worker versioning v0.31
25652565 }
25662566 ms .executionInfo .VersioningInfo = & workflowpb.WorkflowExecutionVersioningInfo {
25672567 Behavior : enumspb .VERSIONING_BEHAVIOR_PINNED ,
@@ -2636,7 +2636,7 @@ func (ms *MutableStateImpl) ApplyWorkflowExecutionStartedEvent(
26362636 ms .executionInfo .VersioningInfo .VersioningOverride .Override = & workflowpb.VersioningOverride_Pinned {
26372637 Pinned : & workflowpb.VersioningOverride_PinnedOverride {
26382638 Behavior : workflowpb .VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED ,
2639- Version : worker_versioning .WorkerDeploymentVersionFromDeployment (d ),
2639+ Version : worker_versioning .ExternalWorkerDeploymentVersionFromDeployment (d ),
26402640 },
26412641 }
26422642 ms .executionInfo .VersioningInfo .VersioningOverride .Deployment = nil
@@ -2648,7 +2648,7 @@ func (ms *MutableStateImpl) ApplyWorkflowExecutionStartedEvent(
26482648 ms .executionInfo .VersioningInfo .VersioningOverride .Override = & workflowpb.VersioningOverride_Pinned {
26492649 Pinned : & workflowpb.VersioningOverride_PinnedOverride {
26502650 Behavior : workflowpb .VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED ,
2651- Version : worker_versioning .WorkerDeploymentVersionFromString (vs ),
2651+ Version : worker_versioning .ExternalWorkerDeploymentVersionFromString (vs ),
26522652 },
26532653 }
26542654 //nolint:staticcheck // SA1019: worker versioning v0.31
@@ -3530,7 +3530,7 @@ func (ms *MutableStateImpl) AddActivityTaskStartedEvent(
35303530
35313531 if deployment != nil {
35323532 ai .LastWorkerDeploymentVersion = worker_versioning .WorkerDeploymentVersionToString (worker_versioning .DeploymentVersionFromDeployment (deployment ))
3533- ai .LastDeploymentVersion = worker_versioning .WorkerDeploymentVersionFromDeployment (deployment )
3533+ ai .LastDeploymentVersion = worker_versioning .ExternalWorkerDeploymentVersionFromDeployment (deployment )
35343534 }
35353535
35363536 if ! ai .HasRetryPolicy {
@@ -4884,7 +4884,7 @@ func (ms *MutableStateImpl) updateVersioningOverride(
48844884 ms .GetExecutionInfo ().VersioningInfo .VersioningOverride .Override = & workflowpb.VersioningOverride_Pinned {
48854885 Pinned : & workflowpb.VersioningOverride_PinnedOverride {
48864886 //nolint:staticcheck // SA1019: worker versioning v0.31
4887- Version : worker_versioning .WorkerDeploymentVersionFromString (override .GetPinnedVersion ()),
4887+ Version : worker_versioning .ExternalWorkerDeploymentVersionFromString (override .GetPinnedVersion ()),
48884888 Behavior : workflowpb .VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED ,
48894889 },
48904890 }
@@ -4905,7 +4905,7 @@ func (ms *MutableStateImpl) updateVersioningOverride(
49054905 ms .GetExecutionInfo ().VersioningInfo .VersioningOverride .Override = & workflowpb.VersioningOverride_Pinned {
49064906 Pinned : & workflowpb.VersioningOverride_PinnedOverride {
49074907 Behavior : workflowpb .VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED ,
4908- Version : worker_versioning .WorkerDeploymentVersionFromDeployment (d ),
4908+ Version : worker_versioning .ExternalWorkerDeploymentVersionFromDeployment (d ),
49094909 },
49104910 }
49114911 }
@@ -4916,7 +4916,7 @@ func (ms *MutableStateImpl) updateVersioningOverride(
49164916 ms .GetExecutionInfo ().VersioningInfo .VersioningOverride .Override = & workflowpb.VersioningOverride_Pinned {
49174917 Pinned : & workflowpb.VersioningOverride_PinnedOverride {
49184918 Behavior : workflowpb .VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED ,
4919- Version : worker_versioning .WorkerDeploymentVersionFromString (vs ),
4919+ Version : worker_versioning .ExternalWorkerDeploymentVersionFromString (vs ),
49204920 },
49214921 }
49224922 }
@@ -8029,7 +8029,7 @@ func (ms *MutableStateImpl) GetWorkerDeploymentSA() string {
80298029 }
80308030 //nolint:staticcheck // SA1019: worker versioning v0.31
80318031 if vs := override .GetPinnedVersion (); vs != "" {
8032- v := worker_versioning .WorkerDeploymentVersionFromString (vs )
8032+ v , _ := worker_versioning .WorkerDeploymentVersionFromString (vs )
80338033 return v .GetDeploymentName ()
80348034 }
80358035 //nolint:staticcheck // SA1019: worker versioning v0.30
@@ -8043,7 +8043,7 @@ func (ms *MutableStateImpl) GetWorkerDeploymentVersionSA() string {
80438043 if override := versioningInfo .GetVersioningOverride (); override != nil &&
80448044 worker_versioning .OverrideIsPinned (override ) {
80458045 if v := override .GetPinned ().GetVersion (); v != nil {
8046- return worker_versioning .WorkerDeploymentVersionToString (v )
8046+ return worker_versioning .ExternalWorkerDeploymentVersionToString (v )
80478047 }
80488048 //nolint:staticcheck // SA1019: worker versioning v0.31
80498049 if vs := override .GetPinnedVersion (); vs != "" {
@@ -8053,7 +8053,7 @@ func (ms *MutableStateImpl) GetWorkerDeploymentVersionSA() string {
80538053 return worker_versioning .DeploymentToString (override .GetDeployment ())
80548054 }
80558055 if v := versioningInfo .GetDeploymentVersion (); v != nil {
8056- return worker_versioning .WorkerDeploymentVersionToString (v )
8056+ return worker_versioning .ExternalWorkerDeploymentVersionToString (v )
80578057 }
80588058 //nolint:staticcheck // SA1019: worker versioning v0.31
80598059 return versioningInfo .GetVersion ()
@@ -8078,10 +8078,10 @@ func (ms *MutableStateImpl) GetDeploymentTransition() *workflowpb.DeploymentTran
80788078 //nolint:staticcheck // SA1019: worker versioning v0.30
80798079 ret := & workflowpb.DeploymentTransition {}
80808080 if dv := t .GetDeploymentVersion (); dv != nil {
8081- ret .Deployment = worker_versioning .DeploymentFromDeploymentVersion (dv )
8081+ ret .Deployment = worker_versioning .DeploymentFromExternalDeploymentVersion (dv )
80828082 } else {
80838083 //nolint:staticcheck // SA1019: worker versioning v0.31
8084- v := worker_versioning .WorkerDeploymentVersionFromString (t .GetVersion ())
8084+ v , _ := worker_versioning .WorkerDeploymentVersionFromString (t .GetVersion ())
80858085 ret .Deployment = worker_versioning .DeploymentFromDeploymentVersion (v )
80868086 }
80878087 return ret
@@ -8134,7 +8134,7 @@ func (ms *MutableStateImpl) StartDeploymentTransition(deployment *deploymentpb.D
81348134 versioningInfo .DeploymentTransition = nil
81358135 versioningInfo .VersionTransition = & workflowpb.DeploymentVersionTransition {
81368136 // [cleanup-wv-3.1]
8137- DeploymentVersion : worker_versioning .WorkerDeploymentVersionFromDeployment (deployment ),
8137+ DeploymentVersion : worker_versioning .ExternalWorkerDeploymentVersionFromDeployment (deployment ),
81388138 }
81398139
81408140 // Because deployment is changed, we clear sticky queue to make sure the next wf task does not
@@ -8167,8 +8167,8 @@ func (ms *MutableStateImpl) StartDeploymentTransition(deployment *deploymentpb.D
81678167 metrics .StartDeploymentTransitionCounter .With (
81688168 ms .metricsHandler .WithTags (
81698169 metrics .NamespaceTag (ms .namespaceEntry .Name ().String ()),
8170- metrics .FromUnversionedTag (worker_versioning .WorkerDeploymentVersionToString (worker_versioning .WorkerDeploymentVersionFromDeployment (preTransitionEffectiveDeployment ))),
8171- metrics .ToUnversionedTag (worker_versioning .WorkerDeploymentVersionToString (worker_versioning .WorkerDeploymentVersionFromDeployment (deployment ))),
8170+ metrics .FromUnversionedTag (worker_versioning .ExternalWorkerDeploymentVersionToString (worker_versioning .ExternalWorkerDeploymentVersionFromDeployment (preTransitionEffectiveDeployment ))),
8171+ metrics .ToUnversionedTag (worker_versioning .ExternalWorkerDeploymentVersionToString (worker_versioning .ExternalWorkerDeploymentVersionFromDeployment (deployment ))),
81728172 ),
81738173 ).Record (1 )
81748174
0 commit comments