Make versioning overrides structure nicer

Author: Sushisource

temporalio/lib/temporalio/versioning_override.rb

@@ -6,69 +6,50 @@ module Temporalio
   # Base class for version overrides that can be provided in start workflow options.
   # Used to control the versioning behavior of workflows started with this override.
   #
-  # Use factory methods {.auto_upgrade} or {.pinned} to create instances.
-  #
   # WARNING: Experimental API.
   class VersioningOverride
-    # Creates an auto-upgrade versioning override
-    # The workflow will auto-upgrade to the current deployment version on the next workflow task.
-    #
-    # @return [AutoUpgradeVersioningOverride] An auto-upgrade versioning override
-    def self.auto_upgrade
-      AutoUpgradeVersioningOverride.new
-    end
-
-    # Creates a pinned versioning override
-    # The workflow will be pinned to a specific deployment version.
-    #
-    # @param version [WorkerDeploymentVersion] The worker deployment version to pin the workflow to
-    # @return [PinnedVersioningOverride] A pinned versioning override
-    def self.pinned(version)
-      PinnedVersioningOverride.new(version)
-    end
-
     # @!visibility private
     def _to_proto
       raise NotImplementedError, 'Subclasses must implement this method'
     end
-  end
-
-  # Represents a versioning override to pin a workflow to a specific version
-  class PinnedVersioningOverride < VersioningOverride
-    # The worker deployment version to pin to
-    # @return [WorkerDeploymentVersion]
-    attr_reader :version
-
-    # Create a new pinned versioning override
-    #
-    # @param version [WorkerDeploymentVersion] The worker deployment version to pin to
-    def initialize(version)
-      @version = version
-      super()
-    end
-
-    # TODO: Remove deprecated field setting once removed from server
 
-    # @!visibility private
-    def _to_proto
-      Temporalio::Api::Workflow::V1::VersioningOverride.new(
-        behavior: Temporalio::Api::Enums::V1::VersioningBehavior::VERSIONING_BEHAVIOR_PINNED,
-        pinned_version: @version.to_canonical_string,
-        pinned: Temporalio::Api::Workflow::V1::VersioningOverride::PinnedOverride.new(
-          version: @version._to_proto
+    # Represents a versioning override to pin a workflow to a specific version
+    class Pinned < VersioningOverride
+      # The worker deployment version to pin to
+      # @return [WorkerDeploymentVersion]
+      attr_reader :version
+
+      # Create a new pinned versioning override
+      #
+      # @param version [WorkerDeploymentVersion] The worker deployment version to pin to
+      def initialize(version)
+        @version = version
+        super()
+      end
+
+      # TODO: Remove deprecated field setting once removed from server
+
+      # @!visibility private
+      def _to_proto
+        Temporalio::Api::Workflow::V1::VersioningOverride.new(
+          behavior: Temporalio::Api::Enums::V1::VersioningBehavior::VERSIONING_BEHAVIOR_PINNED,
+          pinned_version: @version.to_canonical_string,
+          pinned: Temporalio::Api::Workflow::V1::VersioningOverride::PinnedOverride.new(
+            version: @version._to_proto
+          )
         )
-      )
+      end
     end
-  end
 
-  # Represents a versioning override to auto-upgrade a workflow
-  class AutoUpgradeVersioningOverride < VersioningOverride
-    # @!visibility private
-    def _to_proto
-      Temporalio::Api::Workflow::V1::VersioningOverride.new(
-        behavior: Temporalio::Api::Enums::V1::VersioningBehavior::VERSIONING_BEHAVIOR_AUTO_UPGRADE,
-        auto_upgrade: true
-      )
+    # Represents a versioning override to auto-upgrade a workflow
+    class AutoUpgrade < VersioningOverride
+      # @!visibility private
+      def _to_proto
+        Temporalio::Api::Workflow::V1::VersioningOverride.new(
+          behavior: Temporalio::Api::Enums::V1::VersioningBehavior::VERSIONING_BEHAVIOR_AUTO_UPGRADE,
+          auto_upgrade: true
+        )
+      end
     end
   end
 end

temporalio/sig/temporalio/versioning_override.rbs

@@ -1,19 +1,16 @@
 module Temporalio
   class VersioningOverride
-    def self.auto_upgrade: -> AutoUpgradeVersioningOverride
-    def self.pinned: (WorkerDeploymentVersion version) -> PinnedVersioningOverride
-
     def _to_proto: -> untyped
   end
 
-  class PinnedVersioningOverride < VersioningOverride
+  class Pinned < VersioningOverride
     attr_reader version: WorkerDeploymentVersion
 
     def initialize: (WorkerDeploymentVersion version) -> void
     def _to_proto: -> untyped
   end
 
-  class AutoUpgradeVersioningOverride < VersioningOverride
+  class AutoUpgrade < VersioningOverride
     def initialize: -> void
     def _to_proto: -> untyped
   end

temporalio/test/worker_workflow_versioning_test.rb

@@ -552,7 +552,7 @@ def test_workflows_can_use_versioning_override
         DeploymentVersioningWorkflowV1AutoUpgrade,
         id: "override-versioning-#{SecureRandom.uuid}",
         task_queue: task_queue,
-        versioning_override: Temporalio::VersioningOverride.pinned(worker_v1)
+        versioning_override: Temporalio::VersioningOverride::Pinned.new(worker_v1)
       )
 
       # Send signal to finish