Merge branch '232811-remove-deprecated-repo-archive-routes' into 'master'

Remove deprecated repository archive routes

See merge request gitlab-org/gitlab!57236

changelogs/unreleased/232811-remove-deprecated-repo-archive-routes.yml

+---
+title: Remove deprecated repository archive routes
+merge_request: 57236
+author:
+type: removed

config/routes/repository.rb

@@ -2,15 +2,7 @@
 
 # All routing related to repository browsing
 
-resource :repository, only: [:create] do
-  member do
-    # deprecated since GitLab 9.5
-    get 'archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex }, as: 'archive_alternative', defaults: { append_sha: true }
-
-    # deprecated since GitLab 10.7
-    get ':id/archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+/ }, action: 'archive', as: 'archive_deprecated', defaults: { append_sha: true }
-  end
-end
+resource :repository, only: [:create]
 
 resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do
   member do

spec/controllers/projects/repositories_controller_spec.rb

@@ -56,28 +56,6 @@ RSpec.describe Projects::RepositoriesController do
         expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-archive:")
       end
 
-      it 'handles legacy queries with no ref' do
-        get :archive, params: { namespace_id: project.namespace, project_id: project }, format: "zip"
-
-        expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-archive:")
-      end
-
-      it 'handles legacy queries with the ref specified as ref in params' do
-        get :archive, params: { namespace_id: project.namespace, project_id: project, ref: 'feature' }, format: 'zip'
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(assigns(:ref)).to eq('feature')
-        expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-archive:")
-      end
-
-      it 'handles legacy queries with the ref specified as id in params' do
-        get :archive, params: { namespace_id: project.namespace, project_id: project, id: 'feature' }, format: 'zip'
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(assigns(:ref)).to eq('feature')
-        expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-archive:")
-      end
-
       it 'prioritizes the id param over the ref param when both are specified' do
         get :archive, params: { namespace_id: project.namespace, project_id: project, id: 'feature', ref: 'feature_conflict' }, format: 'zip'
 

spec/routing/project_routing_spec.rb

@@ -126,26 +126,6 @@ RSpec.describe 'project routing' do
     it 'to #archive with "/" in route' do
       expect(get('/gitlab/gitlabhq/-/archive/improve/awesome/gitlabhq-improve-awesome.tar.gz')).to route_to('projects/repositories#archive', namespace_id: 'gitlab', project_id: 'gitlabhq', format: 'tar.gz', id: 'improve/awesome/gitlabhq-improve-awesome')
     end
-
-    it 'to #archive_alternative' do
-      expect(get('/gitlab/gitlabhq/-/repository/archive')).to route_to('projects/repositories#archive', namespace_id: 'gitlab', project_id: 'gitlabhq', append_sha: true)
-    end
-
-    it 'to #archive_deprecated' do
-      expect(get('/gitlab/gitlabhq/-/repository/master/archive')).to route_to('projects/repositories#archive', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'master', append_sha: true)
-    end
-
-    it 'to #archive_deprecated format:zip' do
-      expect(get('/gitlab/gitlabhq/-/repository/master/archive.zip')).to route_to('projects/repositories#archive', namespace_id: 'gitlab', project_id: 'gitlabhq', format: 'zip', id: 'master', append_sha: true)
-    end
-
-    it 'to #archive_deprecated format:tar.bz2' do
-      expect(get('/gitlab/gitlabhq/-/repository/master/archive.tar.bz2')).to route_to('projects/repositories#archive', namespace_id: 'gitlab', project_id: 'gitlabhq', format: 'tar.bz2', id: 'master', append_sha: true)
-    end
-
-    it 'to #archive_deprecated with "/" in route' do
-      expect(get('/gitlab/gitlabhq/-/repository/improve/awesome/archive')).to route_to('projects/repositories#archive', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'improve/awesome', append_sha: true)
-    end
   end
 
   describe Projects::BranchesController, 'routing' do