4 files changed, 26 insertions, 9 deletions
diff --git a/lib/api/entities/ci/job_request/hook.rb b/lib/api/entities/ci/job_request/hook.rb
new file mode 100644
index 00000000000..2d155bb1c45
--- /dev/null
+++ b/lib/api/entities/ci/job_request/hook.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ci
+      module JobRequest
+        class Hook < Grape::Entity
+          expose :name, :script
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/ci/job_request/response.rb b/lib/api/entities/ci/job_request/response.rb
index 9de415ebacb..cfdbeed79b6 100644
--- a/lib/api/entities/ci/job_request/response.rb
+++ b/lib/api/entities/ci/job_request/response.rb
@@ -23,6 +23,9 @@ module API
 
           expose :runner_variables, as: :variables
           expose :steps, using: Entities::Ci::JobRequest::Step
+          expose :runtime_hooks, as: :hooks,
+                                 using: Entities::Ci::JobRequest::Hook,
+                                 if: ->(job) { ::Feature.enabled?(:ci_hooks_pre_get_sources_script, job.project) }
           expose :image, using: Entities::Ci::JobRequest::Image
           expose :services, using: Entities::Ci::JobRequest::Service
           expose :artifacts, using: Entities::Ci::JobRequest::Artifacts
diff --git a/lib/api/entities/ci/runner_details.rb b/lib/api/entities/ci/runner_details.rb
index 9b1decca274..8aa134dc669 100644
--- a/lib/api/entities/ci/runner_details.rb
+++ b/lib/api/entities/ci/runner_details.rb
@@ -14,7 +14,7 @@ module API
 
         # rubocop: disable CodeReuse/ActiveRecord
         expose :projects, with: Entities::BasicProjectDetails do |runner, options|
-          if options[:current_user].admin? # rubocop: disable Cop/UserAdmin
+          if options[:current_user].can_read_all_resources?
             runner.projects
           else
             options[:current_user].authorized_projects.where(id: runner.runner_projects.pluck(:project_id))
@@ -23,7 +23,7 @@ module API
         # rubocop: enable CodeReuse/ActiveRecord
         # rubocop: disable CodeReuse/ActiveRecord
         expose :groups, with: Entities::BasicGroupDetails do |runner, options|
-          if options[:current_user].admin? # rubocop: disable Cop/UserAdmin
+          if options[:current_user].can_read_all_resources?
             runner.groups
           else
             options[:current_user].authorized_groups.where(id: runner.runner_namespaces.pluck(:namespace_id))
diff --git a/lib/api/entities/ci/secure_file.rb b/lib/api/entities/ci/secure_file.rb
index d957e4488fd..a234ada6f82 100644
--- a/lib/api/entities/ci/secure_file.rb
+++ b/lib/api/entities/ci/secure_file.rb
@@ -4,13 +4,14 @@ module API
   module Entities
     module Ci
       class SecureFile < Grape::Entity
-        expose :id
-        expose :name
-        expose :checksum
-        expose :checksum_algorithm
-        expose :created_at
-        expose :expires_at
-        expose :metadata
+        expose :id, documentation: { type: 'integer', example: 123 }
+        expose :name, documentation: { type: 'string', example: 'upload-keystore.jks' }
+        expose :checksum,
+documentation: { type: 'string', example: '16630b189ab34b2e3504f4758e1054d2e478deda510b2b08cc0ef38d12e80aac' }
+        expose :checksum_algorithm, documentation: { type: 'string', example: 'sha256' }
+        expose :created_at, documentation: { type: 'dateTime', example: '2022-02-22T22:22:22.222Z' }
+        expose :expires_at, documentation: { type: 'dateTime', example: '2022-09-21T14:56:00.000Z' }
+        expose :metadata, documentation: { type: 'Hash', example: { "id" => "75949910542696343243264405377658443914" } }
       end
     end
   end