diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-05-21 13:20:00 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-05-21 13:20:00 +0300 |
commit | f934f696aab92c2af2e8ff1c3a1ce2124ccf498c (patch) | |
tree | 0698ec64595503bd80f8b2876e14a31b3a74609f | |
parent | c202c0760cecf7b29ddb9ec46a794e208f4da82b (diff) |
UserUpdateSubmodule: Remove dead Ruby code
Since a827d8b77 (operations: Remove update submodule feature flag, 2021-05-06)
the Ruby code was no longer in operation. Thus a release later, now the
Ruby code can be removed.
-rw-r--r-- | ruby/lib/gitaly_server/operations_service.rb | 20 | ||||
-rw-r--r-- | ruby/lib/gitlab/git/submodule.rb | 37 | ||||
-rw-r--r-- | ruby/spec/lib/gitlab/git/submodule_spec.rb | 91 |
3 files changed, 0 insertions, 148 deletions
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb index f8f9b2e24..463fb0de0 100644 --- a/ruby/lib/gitaly_server/operations_service.rb +++ b/ruby/lib/gitaly_server/operations_service.rb @@ -139,26 +139,6 @@ module GitalyServer Gitaly::UserApplyPatchResponse.new(branch_update: branch_update_result(branch_update)) end - def user_update_submodule(request, call) - user = Gitlab::Git::User.from_gitaly(request.user) - - branch_update = Gitlab::Git::Repository.from_gitaly_with_block(request.repository, call) do |repo| - begin - Gitlab::Git::Submodule - .new(user, repo, request.submodule, request.branch) - .update(request.commit_sha, request.commit_message.dup, request.timestamp) - rescue ArgumentError => e - raise GRPC::InvalidArgument.new(e.to_s) - end - end - - Gitaly::UserUpdateSubmoduleResponse.new(branch_update: branch_update_result(branch_update)) - rescue Gitlab::Git::CommitError => e - Gitaly::UserUpdateSubmoduleResponse.new(commit_error: set_utf8!(e.message)) - rescue Gitlab::Git::PreReceiveError => e - Gitaly::UserUpdateSubmoduleResponse.new(pre_receive_error: set_utf8!(e.message)) - end - private def branch_update_result(gitlab_update_result) diff --git a/ruby/lib/gitlab/git/submodule.rb b/ruby/lib/gitlab/git/submodule.rb deleted file mode 100644 index 7dd829b6b..000000000 --- a/ruby/lib/gitlab/git/submodule.rb +++ /dev/null @@ -1,37 +0,0 @@ -module Gitlab - module Git - class Submodule - attr_reader :user, :repository, :submodule_path, :branch_name - - def initialize(user, repository, submodule_path, branch_name) - @user = user - @repository = repository - @branch_name = branch_name - - begin - @submodule_path = Gitlab::Git::PathHelper.normalize_path!(submodule_path.dup) - rescue Gitlab::Git::PathHelper::InvalidPath => e - raise ArgumentError, e.message - end - end - - def update(commit_sha, message, timestamp = nil) - validate! - - OperationService.new(user, repository).with_branch(branch_name, start_branch_name: branch_name) do - committer = repository.user_to_committer(user, timestamp) - - repository.update_submodule(submodule_path, commit_sha, branch_name, committer, message) - end - end - - private - - def validate! - raise ArgumentError, 'User cannot be empty' unless user - raise ArgumentError, 'Submodule can not be empty' unless submodule_path.present? - raise CommitError, 'Repository is empty' if repository.empty? - end - end - end -end diff --git a/ruby/spec/lib/gitlab/git/submodule_spec.rb b/ruby/spec/lib/gitlab/git/submodule_spec.rb deleted file mode 100644 index 1b3d1f84c..000000000 --- a/ruby/spec/lib/gitlab/git/submodule_spec.rb +++ /dev/null @@ -1,91 +0,0 @@ -require 'spec_helper' - -describe Gitlab::Git::Submodule do - include TestRepo - - let(:repository) { gitlab_git_from_gitaly(new_mutable_test_repo) } - let(:user) { Gitlab::Git::User.new('johndone', 'John Doe', 'johndoe@mail.com', 'user-1') } - let(:message) { 'Updating submodule' } - let(:branch) { 'master' } - let(:new_oid) { 'db97db76ecd478eb361f439807438f82d97b29a5' } - let(:submodule_path) { 'gitlab-grack' } - - subject do - described_class.new(user, repository, submodule_path, branch).update(new_oid, message) - end - - describe '#validate!' do - context 'with repository' do - let(:repository) { gitlab_git_from_gitaly(new_empty_test_repo) } - - it 'raises error if empty' do - expect { subject }.to raise_error(Gitlab::Git::CommitError, 'Repository is empty') - end - end - - context 'with user' do - let(:user) { nil } - - it 'raises error if not present' do - expect { subject }.to raise_error(ArgumentError, 'User cannot be empty') - end - end - - context 'with submodule' do - context 'when is not present' do - let(:submodule_path) { '' } - - it 'raises error' do - expect { subject }.to raise_error(ArgumentError, 'Submodule can not be empty') - end - end - - context 'when it has path traversal' do - let(:submodule_path) { '../gitlab-grack' } - - it 'raises error' do - expect { subject }.to raise_error(ArgumentError, 'Path cannot include directory traversal') - end - end - end - end - - describe '#update' do - it 'updates the submodule oid' do - update_commit = subject - - blob = repository.blob_at(update_commit.newrev, submodule_path) - - expect(repository.commit.id).to eq update_commit.newrev - expect(blob.id).to eq new_oid - end - - context 'when branch is not master' do - let(:branch) { 'csv' } - - it 'updates submodule oid' do - update_commit = subject - - blob = repository.blob_at(update_commit.newrev, submodule_path) - - expect(repository.commit(branch).id).to eq update_commit.newrev - expect(blob.id).to eq new_oid - end - end - - context 'when submodule inside folder' do - let(:branch) { 'submodule_inside_folder' } - let(:submodule_path) { 'test_inside_folder/another_folder/six' } - let(:new_oid) { 'e25eda1fece24ac7a03624ed1320f82396f35bd8' } - - it 'updates submodule oid' do - update_commit = subject - - blob = repository.blob_at(update_commit.newrev, submodule_path) - - expect(repository.commit(branch).id).to eq update_commit.newrev - expect(blob.id).to eq new_oid - end - end - end -end |