1 files changed, 41 insertions, 5 deletions

diff --git a/app/graphql/mutations/ci/runner/update.rb b/app/graphql/mutations/ci/runner/update.rb
index 1c6cf6989bf..f98138646be 100644
--- a/app/graphql/mutations/ci/runner/update.rb
+++ b/app/graphql/mutations/ci/runner/update.rb
@@ -48,8 +48,13 @@ module Mutations
                  description: 'Indicates the runner is able to run untagged jobs.'
 
         argument :tag_list, [GraphQL::Types::String],
-                  required: false,
-                  description: 'Tags associated with the runner.'
+                 required: false,
+                 description: 'Tags associated with the runner.'
+
+        argument :associated_projects, [::Types::GlobalIDType[::Project]],
+                 required: false,
+                 description: 'Projects associated with the runner. Available only for project runners.',
+                 prepare: -> (global_ids, ctx) { global_ids&.filter_map { |gid| gid.model_id.to_i } }
 
         field :runner,
               Types::Ci::RunnerType,
@@ -59,16 +64,47 @@ module Mutations
         def resolve(id:, **runner_attrs)
           runner = authorized_find!(id)
 
-          unless ::Ci::Runners::UpdateRunnerService.new(runner).update(runner_attrs)
-            return { runner: nil, errors: runner.errors.full_messages }
+          associated_projects_ids = runner_attrs.delete(:associated_projects)
+
+          response = { runner: runner, errors: [] }
+          ::Ci::Runner.transaction do
+            associate_runner_projects(response, runner, associated_projects_ids) if associated_projects_ids.present?
+            update_runner(response, runner, runner_attrs)
           end
 
-          { runner: runner, errors: [] }
+          response
         end
 
         def find_object(id)
           GitlabSchema.find_by_gid(id)
         end
+
+        private
+
+        def associate_runner_projects(response, runner, associated_project_ids)
+          unless runner.project_type?
+            raise Gitlab::Graphql::Errors::ArgumentError,
+                  "associatedProjects must not be specified for '#{runner.runner_type}' scope"
+          end
+
+          result = ::Ci::Runners::SetRunnerAssociatedProjectsService.new(
+            runner: runner,
+            current_user: current_user,
+            project_ids: associated_project_ids
+          ).execute
+          return if result.success?
+
+          response[:errors] = result.errors
+          raise ActiveRecord::Rollback
+        end
+
+        def update_runner(response, runner, attrs)
+          result = ::Ci::Runners::UpdateRunnerService.new(runner).execute(attrs)
+          return if result.success?
+
+          response[:errors] = result.errors
+          raise ActiveRecord::Rollback
+        end
       end
     end
   end