Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

2 files changed, 46 insertions, 16 deletions

diff --git a/spec/services/import/gitlab_projects/create_project_from_remote_file_service_spec.rb b/spec/services/import/gitlab_projects/create_project_from_remote_file_service_spec.rb
index 3c461c91ff0..92c46cf7052 100644
--- a/spec/services/import/gitlab_projects/create_project_from_remote_file_service_spec.rb
+++ b/spec/services/import/gitlab_projects/create_project_from_remote_file_service_spec.rb
@@ -18,24 +18,29 @@ RSpec.describe ::Import::GitlabProjects::CreateProjectFromRemoteFileService do
 
   subject { described_class.new(user, params) }
 
-  it 'creates a project and returns a successful response' do
-    stub_headers_for(remote_url, {
-      'content-type' => 'application/gzip',
-      'content-length' => '10'
-    })
-
-    response = nil
-    expect { response = subject.execute }
-      .to change(Project, :count).by(1)
+  shared_examples 'successfully import' do |content_type|
+    it 'creates a project and returns a successful response' do
+      stub_headers_for(remote_url, {
+        'content-type' => content_type,
+        'content-length' => '10'
+      })
 
-    expect(response).to be_success
-    expect(response.http_status).to eq(:ok)
-    expect(response.payload).to be_instance_of(Project)
-    expect(response.payload.name).to eq('name')
-    expect(response.payload.path).to eq('path')
-    expect(response.payload.namespace).to eq(user.namespace)
+      response = nil
+      expect { response = subject.execute }
+        .to change(Project, :count).by(1)
+
+      expect(response).to be_success
+      expect(response.http_status).to eq(:ok)
+      expect(response.payload).to be_instance_of(Project)
+      expect(response.payload.name).to eq('name')
+      expect(response.payload.path).to eq('path')
+      expect(response.payload.namespace).to eq(user.namespace)
+    end
   end
 
+  it_behaves_like 'successfully import', 'application/gzip'
+  it_behaves_like 'successfully import', 'application/x-tar'
+
   context 'when the file url is invalid' do
     it 'returns an erred response with the reason of the failure' do
       stub_application_setting(allow_local_requests_from_web_hooks_and_services: false)
@@ -79,7 +84,7 @@ RSpec.describe ::Import::GitlabProjects::CreateProjectFromRemoteFileService do
       expect(response).not_to be_success
       expect(response.http_status).to eq(:bad_request)
       expect(response.message)
-        .to eq("Remote file content type 'application/js' not allowed. (Allowed content types: application/gzip)")
+        .to eq("Remote file content type 'application/js' not allowed. (Allowed content types: application/gzip, application/x-tar)")
     end
   end
 
@@ -130,6 +135,20 @@ RSpec.describe ::Import::GitlabProjects::CreateProjectFromRemoteFileService do
     end
   end
 
+  it 'does not validate content-type or content-length when the file is stored in AWS-S3' do
+    stub_headers_for(remote_url, {
+      'Server' => 'AmazonS3',
+      'x-amz-request-id' => 'Something'
+    })
+
+    response = nil
+    expect { response = subject.execute }
+      .to change(Project, :count)
+
+    expect(response).to be_success
+    expect(response.http_status).to eq(:ok)
+  end
+
   context 'when required parameters are not provided' do
     let(:params) { {} }
 
diff --git a/spec/services/import/validate_remote_git_endpoint_service_spec.rb b/spec/services/import/validate_remote_git_endpoint_service_spec.rb
index fbd8a3cb323..9dc862b6ca3 100644
--- a/spec/services/import/validate_remote_git_endpoint_service_spec.rb
+++ b/spec/services/import/validate_remote_git_endpoint_service_spec.rb
@@ -24,6 +24,17 @@ RSpec.describe Import::ValidateRemoteGitEndpointService do
       expect(Gitlab::HTTP).to have_received(:get).with(endpoint_url, basic_auth: nil, stream_body: true, follow_redirects: false)
     end
 
+    context 'when uri is using git:// protocol' do
+      subject { described_class.new(url: 'git://demo.host/repo')}
+
+      it 'returns success' do
+        result = subject.execute
+
+        expect(result).to be_a(ServiceResponse)
+        expect(result.success?).to be(true)
+      end
+    end
+
     context 'when receiving HTTP response' do
       subject { described_class.new(url: base_url) }