Commit 43981250 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Use controllers to redirect

parent 876acc7e
class Projects::BuildArtifactsController < Projects::ApplicationController
include ExtractsPath
include RendersBlob
before_action :extract_ref_name_and_path
def download
redirect_to download_namespace_project_job_artifacts_path(project.namespace, project, job)
end
def browse
redirect_to browse_namespace_project_job_artifacts_path(project.namespace, project, job, path: params[:path])
end
def file
redirect_to file_namespace_project_job_artifacts_path(project.namespace, project, job, path: params[:path])
end
def raw
redirect_to raw_namespace_project_job_artifacts_path(project.namespace, project, job, path: params[:path])
end
def latest_succeeded
redirect_to latest_succeeded_namespace_project_artifacts_path(project.namespace, project, job, ref_name_and_path: params[:ref_name_and_path], job: params[:job])
end
private
def extract_ref_name_and_path
return unless params[:ref_name_and_path]
@ref_name, @path = extract_ref(params[:ref_name_and_path])
end
def job
@job ||= job_from_id || job_from_ref
end
def job_from_id
project.builds.find_by(id: params[:build_id]) if params[:build_id]
end
def job_from_ref
return unless @ref_name
jobs = project.latest_successful_builds_for(@ref_name)
jobs.find_by(name: params[:job])
end
end
class Projects::BuildsController < Projects::ApplicationController
def index
redirect_to namespace_project_jobs_path(project.namespace, project)
end
def show
redirect_to namespace_project_job_path(project.namespace, project, job)
end
def trace
redirect_to trace_namespace_project_job_path(project.namespace, project, job, format: params[:format])
end
def status
redirect_to status_namespace_project_job_path(project.namespace, project, job, format: params[:format])
end
def raw
redirect_to raw_namespace_project_job_path(project.namespace, project, job)
end
private
def job
@job ||= project.builds.find(params[:id])
end
end
module Gitlab module Gitlab
module Routes module Routes
class LegacyBuilds class LegacyBuilds
...@@ -10,51 +9,32 @@ module Gitlab ...@@ -10,51 +9,32 @@ module Gitlab
end end
def draw def draw
redirect_artifacts = @map.redirect(&method(:redirect_artifacts)) @map.instance_eval do
redirect_builds = @map.redirect(&method(:redirect_builds)) resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do
collection do
@map.get '/builds(/:id)/artifacts/*action', to: redirect_artifacts, resources :artifacts, only: [], controller: 'build_artifacts' do
as: 'legacy_artifacts', collection do
format: false get :latest_succeeded,
path: '*ref_name_and_path',
@map.get '/builds(/:id(/*action))', to: redirect_builds,
as: 'legacy_builds',
format: false format: false
end end
private
def redirect_artifacts(params, req)
if params[:id]
project = fake_project(*params.values_at(:namespace_id, :project_id))
artifacts_action_path(params[:action], project, params[:id])
else
latest_succeeded_namespace_project_artifacts_path(params[:namespace_id], params[:project_id], params[:action], job: req.GET[:job])
end end
end end
def redirect_builds(params, req) member do
args = params.values_at(:namespace_id, :project_id, :id).compact get :status
get :trace, defaults: { format: 'json' }
get :raw
end
if params[:id] resource :artifacts, only: [], controller: 'build_artifacts' do
case params[:action] get :download
when 'status' get :browse, path: 'browse(/*path)', format: false
status_namespace_project_job_path(*args, format: params[:format]) get :file, path: 'file/*path', format: false
when 'trace' get :raw, path: 'raw/*path', format: false
trace_namespace_project_job_path(*args, format: params[:format])
when 'raw'
raw_namespace_project_job_path(*args)
else # show
namespace_project_job_path(*args)
end end
else # index
namespace_project_jobs_path(*args)
end end
end end
def fake_project(namespace_id, project_id)
Struct.new(:namespace, :to_param).new(namespace_id, project_id)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment