Move build eraseable API to proper API context

2 files changed, 22 insertions, 19 deletions

diff --git a/lib/api/builds.rb b/lib/api/builds.rb
index a8bd3842ce4..06ec03fc4e0 100644
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
@@ -115,13 +115,33 @@ module API
         authorize_update_builds!
 
         build = get_build(params[:build_id])
-        return forbidden!('Build is not retryable') unless build && build.retryable?
+        return not_found!(build) unless build
+        return forbidden!('Build is not retryable') unless build.retryable?
 
         build = Ci::Build.retry(build)
 
         present build, with: Entities::Build,
                        user_can_download_artifacts: can?(current_user, :read_build, user_project)
       end
+
+      # Erase build (remove artifacts and build trace)
+      #
+      # Parameters:
+      #   id (required) - the id of a project
+      #   build_id (required) - the id of a build
+      # example Request:
+      #  delete  /projects/:id/build/:build_id/content
+      delete ':id/builds/:build_id/content' do
+        authorize_manage_builds!
+
+        build = get_build(params[:build_id])
+        return not_found!(build) unless build
+        return forbidden!('Build is not eraseable!') unless build.eraseable?
+
+        build.erase!
+        present build, with: Entities::Build,
+                       user_can_download_artifacts: can?(current_user, :download_build_artifacts, user_project)
+      end
     end
 
     helpers do
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index f37a96da93c..2e9a5d311f9 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -146,7 +146,7 @@ module Ci
           present_file!(artifacts_file.path, artifacts_file.filename)
         end
 
-        # Remove the artifacts file from build
+        # Remove the artifacts file from build - Runners only
         #
         # Parameters:
         #   id (required) - The ID of a build
@@ -163,23 +163,6 @@ module Ci
           build.remove_artifacts_file!
           build.remove_artifacts_metadata!
         end
-
-        # Erase build (remove artifacts and build trace)
-        #
-        # Parameters:
-        #   id (required) - The ID of a build
-        #   token (required) - The build authorization token
-        # Headers:
-        #   BUILD-TOKEN (required) - The build authorization token, the same as token
-        # Example Request:
-        #   DELETE /builds/:id/content
-        delete ':id/content' do
-          build = Ci::Build.find_by_id(params[:id])
-          not_found! unless build
-          authenticate_build_token!(build)
-
-          build.erase!
-        end
       end
     end
   end