Move Entities::JobRequest under Ci namespace

Move `Entities::JobRequest` under `Entities::Ci::JobRequest`

app/services/ci/register_job_service.rb

@@ -209,7 +209,7 @@ module Ci
       # We need to use the presenter here because Gitaly calls in the presenter
       # may fail, and we need to ensure the response has been generated.
       presented_build = ::Ci::BuildRunnerPresenter.new(build) # rubocop:disable CodeReuse/Presenter
-      build_json = ::API::Entities::JobRequest::Response.new(presented_build).to_json
+      build_json = ::API::Entities::Ci::JobRequest::Response.new(presented_build).to_json
       Result.new(build, build_json, true)
     end
 

ee/lib/ee/api/entities/job_request/response.rb → ee/lib/ee/api/entities/ci/job_request/response.rb

@@ -3,6 +3,7 @@
 module EE
   module API
     module Entities
+      module Ci
         module JobRequest
           module Response
             extend ActiveSupport::Concern
@@ -14,4 +15,5 @@ module EE
         end
       end
     end
+  end
 end

ee/lib/ee/api/jobs.rb

@@ -22,7 +22,7 @@ module EE
 
             {
               allowed_agents: ::API::Entities::Clusters::Agent.represent(allowed_agents),
-              job: ::API::Entities::JobRequest::JobInfo.represent(current_authenticated_job),
+              job: ::API::Entities::Ci::JobRequest::JobInfo.represent(current_authenticated_job),
               pipeline: ::API::Entities::Ci::PipelineBasic.represent(pipeline),
               project: ::API::Entities::ProjectIdentity.represent(project),
               user: ::API::Entities::UserBasic.represent(current_user)

lib/api/ci/runner.rb

@@ -82,7 +82,7 @@ module API
         before { set_application_context }
 
         desc 'Request a job' do
-          success Entities::JobRequest::Response
+          success Entities::Ci::JobRequest::Response
           http_codes [[201, 'Job was scheduled'],
                       [204, 'No job for Runner'],
                       [403, 'Forbidden']]
@@ -267,7 +267,7 @@ module API
         end
 
         desc 'Upload artifacts for job' do
-          success Entities::JobRequest::Response
+          success Entities::Ci::JobRequest::Response
           http_codes [[201, 'Artifact uploaded'],
                       [400, 'Bad request'],
                       [403, 'Forbidden'],

lib/api/entities/ci/job_request/artifacts.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ci
+      module JobRequest
+        class Artifacts < Grape::Entity
+          expose :name
+          expose :untracked
+          expose :paths
+          expose :exclude, expose_nil: false
+          expose :when
+          expose :expire_in
+          expose :artifact_type
+          expose :artifact_format
+        end
+      end
+    end
+  end
+end

lib/api/entities/job_request/cache.rb → lib/api/entities/ci/job_request/cache.rb

@@ -2,10 +2,12 @@
 
 module API
   module Entities
+    module Ci
       module JobRequest
         class Cache < Grape::Entity
           expose :key, :untracked, :paths, :policy, :when
         end
       end
     end
+  end
 end

lib/api/entities/job_request/credentials.rb → lib/api/entities/ci/job_request/credentials.rb

@@ -2,10 +2,12 @@
 
 module API
   module Entities
+    module Ci
       module JobRequest
         class Credentials < Grape::Entity
           expose :type, :url, :username, :password
         end
       end
     end
+  end
 end

lib/api/entities/ci/job_request/dependency.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ci
+      module JobRequest
+        class Dependency < Grape::Entity
+          expose :id, :name, :token
+          expose :artifacts_file, using: Entities::Ci::JobArtifactFile, if: ->(job, _) { job.artifacts? }
+        end
+      end
+    end
+  end
+end

lib/api/entities/ci/job_request/git_info.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ci
+      module JobRequest
+        class GitInfo < Grape::Entity
+          expose :repo_url, :ref, :sha, :before_sha
+          expose :ref_type
+          expose :refspecs
+          expose :git_depth, as: :depth
+        end
+      end
+    end
+  end
+end

lib/api/entities/job_request/image.rb → lib/api/entities/ci/job_request/image.rb

@@ -2,10 +2,12 @@
 
 module API
   module Entities
+    module Ci
       module JobRequest
         class Image < Grape::Entity
           expose :name, :entrypoint
-        expose :ports, using: Entities::JobRequest::Port
+          expose :ports, using: Entities::Ci::JobRequest::Port
+        end
       end
     end
   end

lib/api/entities/job_request/job_info.rb → lib/api/entities/ci/job_request/job_info.rb

@@ -2,6 +2,7 @@
 
 module API
   module Entities
+    module Ci
       module JobRequest
         class JobInfo < Grape::Entity
           expose :id, :name, :stage
@@ -9,4 +10,5 @@ module API
         end
       end
     end
+  end
 end

lib/api/entities/job_request/port.rb → lib/api/entities/ci/job_request/port.rb

@@ -2,10 +2,12 @@
 
 module API
   module Entities
+    module Ci
       module JobRequest
         class Port < Grape::Entity
           expose :number, :protocol, :name
         end
       end
     end
+  end
 end

lib/api/entities/ci/job_request/response.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ci
+      module JobRequest
+        class Response < Grape::Entity
+          expose :id
+          expose :token
+          expose :allow_git_fetch
+
+          expose :job_info, using: Entities::Ci::JobRequest::JobInfo do |model|
+            model
+          end
+
+          expose :git_info, using: Entities::Ci::JobRequest::GitInfo do |model|
+            model
+          end
+
+          expose :runner_info, using: Entities::Ci::JobRequest::RunnerInfo do |model|
+            model
+          end
+
+          expose :runner_variables, as: :variables
+          expose :steps, using: Entities::Ci::JobRequest::Step
+          expose :image, using: Entities::Ci::JobRequest::Image
+          expose :services, using: Entities::Ci::JobRequest::Service
+          expose :artifacts, using: Entities::Ci::JobRequest::Artifacts
+          expose :cache, using: Entities::Ci::JobRequest::Cache
+          expose :credentials, using: Entities::Ci::JobRequest::Credentials
+          expose :all_dependencies, as: :dependencies, using: Entities::Ci::JobRequest::Dependency
+          expose :features
+        end
+      end
+    end
+  end
+end
+
+API::Entities::Ci::JobRequest::Response.prepend_mod_with('API::Entities::Ci::JobRequest::Response')

lib/api/entities/job_request/runner_info.rb → lib/api/entities/ci/job_request/runner_info.rb

@@ -2,6 +2,7 @@
 
 module API
   module Entities
+    module Ci
       module JobRequest
         class RunnerInfo < Grape::Entity
           expose :metadata_timeout, as: :timeout
@@ -9,4 +10,5 @@ module API
         end
       end
     end
+  end
 end

lib/api/entities/job_request/service.rb → lib/api/entities/ci/job_request/service.rb

@@ -2,10 +2,12 @@
 
 module API
   module Entities
+    module Ci
       module JobRequest
-      class Service < Entities::JobRequest::Image
+        class Service < Entities::Ci::JobRequest::Image
           expose :alias, :command
         end
       end
     end
+  end
 end

lib/api/entities/job_request/step.rb → lib/api/entities/ci/job_request/step.rb

@@ -2,10 +2,12 @@
 
 module API
   module Entities
+    module Ci
       module JobRequest
         class Step < Grape::Entity
           expose :name, :script, :timeout, :when, :allow_failure
         end
       end
     end
+  end
 end

lib/api/entities/job_request/artifacts.rb

-# frozen_string_literal: true
-
-module API
-  module Entities
-    module JobRequest
-      class Artifacts < Grape::Entity
-        expose :name
-        expose :untracked
-        expose :paths
-        expose :exclude, expose_nil: false
-        expose :when
-        expose :expire_in
-        expose :artifact_type
-        expose :artifact_format
-      end
-    end
-  end
-end

lib/api/entities/job_request/dependency.rb

-# frozen_string_literal: true
-
-module API
-  module Entities
-    module JobRequest
-      class Dependency < Grape::Entity
-        expose :id, :name, :token
-        expose :artifacts_file, using: Entities::Ci::JobArtifactFile, if: ->(job, _) { job.artifacts? }
-      end
-    end
-  end
-end

lib/api/entities/job_request/git_info.rb

-# frozen_string_literal: true
-
-module API
-  module Entities
-    module JobRequest
-      class GitInfo < Grape::Entity
-        expose :repo_url, :ref, :sha, :before_sha
-        expose :ref_type
-        expose :refspecs
-        expose :git_depth, as: :depth
-      end
-    end
-  end
-end

lib/api/entities/job_request/response.rb

-# frozen_string_literal: true
-
-module API
-  module Entities
-    module JobRequest
-      class Response < Grape::Entity
-        expose :id
-        expose :token
-        expose :allow_git_fetch
-
-        expose :job_info, using: Entities::JobRequest::JobInfo do |model|
-          model
-        end
-
-        expose :git_info, using: Entities::JobRequest::GitInfo do |model|
-          model
-        end
-
-        expose :runner_info, using: Entities::JobRequest::RunnerInfo do |model|
-          model
-        end
-
-        expose :runner_variables, as: :variables
-        expose :steps, using: Entities::JobRequest::Step
-        expose :image, using: Entities::JobRequest::Image
-        expose :services, using: Entities::JobRequest::Service
-        expose :artifacts, using: Entities::JobRequest::Artifacts
-        expose :cache, using: Entities::JobRequest::Cache
-        expose :credentials, using: Entities::JobRequest::Credentials
-        expose :all_dependencies, as: :dependencies, using: Entities::JobRequest::Dependency
-        expose :features
-      end
-    end
-  end
-end
-
-API::Entities::JobRequest::Response.prepend_mod_with('API::Entities::JobRequest::Response')

spec/lib/api/entities/job_request/image_spec.rb → spec/lib/api/entities/ci/job_request/image_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Entities::JobRequest::Image do
+RSpec.describe API::Entities::Ci::JobRequest::Image do
   let(:ports) { [{ number: 80, protocol: 'http', name: 'name' }]}
   let(:image) { double(name: 'image_name', entrypoint: ['foo'], ports: ports)}
   let(:entity) { described_class.new(image) }

spec/lib/api/entities/job_request/port_spec.rb → spec/lib/api/entities/ci/job_request/port_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::API::Entities::JobRequest::Port do
+RSpec.describe ::API::Entities::Ci::JobRequest::Port do
   let(:port) { double(number: 80, protocol: 'http', name: 'name')}
   let(:entity) { described_class.new(port) }