Add latest changes from gitlab-org/gitlab@master

2 files changed, 35 insertions, 1 deletions

diff --git a/app/services/ci/runners/unregister_runner_manager_service.rb b/app/services/ci/runners/unregister_runner_manager_service.rb
new file mode 100644
index 00000000000..ecf6aba09c7
--- /dev/null
+++ b/app/services/ci/runners/unregister_runner_manager_service.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Ci
+  module Runners
+    class UnregisterRunnerManagerService
+      attr_reader :runner, :author, :system_id
+
+      # @param [Ci::Runner] runner the runner to unregister/destroy
+      # @param [User, authentication token String] author the user or the authentication token authorizing the removal
+      # @param [String] system_id ID of the system being unregistered
+      def initialize(runner, author, system_id:)
+        @runner = runner
+        @author = author
+        @system_id = system_id
+      end
+
+      def execute
+        return system_id_missing_error if system_id.blank?
+
+        runner_manager = runner.runner_managers.find_by_system_xid!(system_id)
+        runner_manager.destroy!
+
+        ServiceResponse.success
+      end
+
+      private
+
+      def system_id_missing_error
+        ServiceResponse.error(message: '`system_id` needs to be specified for runners created in the UI.')
+      end
+    end
+  end
+end
diff --git a/app/services/ci/runners/unregister_runner_service.rb b/app/services/ci/runners/unregister_runner_service.rb
index 742b21f77df..d186bd421d5 100644
--- a/app/services/ci/runners/unregister_runner_service.rb
+++ b/app/services/ci/runners/unregister_runner_service.rb
@@ -13,7 +13,8 @@ module Ci
       end
 
       def execute
-        @runner&.destroy
+        runner.destroy!
+
         ServiceResponse.success
       end
     end