diff options
Diffstat (limited to 'internal')
-rw-r--r-- | internal/gitaly/service/remote/remotes.go | 39 | ||||
-rw-r--r-- | internal/gitaly/service/remote/remotes_test.go | 90 | ||||
-rw-r--r-- | internal/praefect/coordinator.go | 1 | ||||
-rw-r--r-- | internal/praefect/protoregistry/protoregistry_test.go | 1 |
4 files changed, 0 insertions, 131 deletions
diff --git a/internal/gitaly/service/remote/remotes.go b/internal/gitaly/service/remote/remotes.go index cc2392521..dce2dac09 100644 --- a/internal/gitaly/service/remote/remotes.go +++ b/internal/gitaly/service/remote/remotes.go @@ -62,37 +62,6 @@ func validateAddRemoteRequest(req *gitalypb.AddRemoteRequest) error { return nil } -// RemoveRemote removes the given remote -func (s *server) RemoveRemote(ctx context.Context, req *gitalypb.RemoveRemoteRequest) (*gitalypb.RemoveRemoteResponse, error) { - if err := validateRemoveRemoteRequest(req); err != nil { - return nil, status.Errorf(codes.InvalidArgument, "RemoveRemote: %v", err) - } - - remote := s.localrepo(req.GetRepository()).Remote() - - hasRemote, err := remote.Exists(ctx, req.Name) - if err != nil { - return nil, err - } - if !hasRemote { - return &gitalypb.RemoveRemoteResponse{Result: false}, nil - } - - if err := s.voteOnRemote(ctx, req.GetRepository(), req.GetName()); err != nil { - return nil, helper.ErrInternalf("preimage vote on remote: %v", err) - } - - if err := remote.Remove(ctx, req.Name); err != nil { - return nil, err - } - - if err := s.voteOnRemote(ctx, req.GetRepository(), req.GetName()); err != nil { - return nil, helper.ErrInternalf("postimage vote on remote: %v", err) - } - - return &gitalypb.RemoveRemoteResponse{Result: true}, nil -} - func (s *server) FindRemoteRepository(ctx context.Context, req *gitalypb.FindRemoteRepositoryRequest) (*gitalypb.FindRemoteRepositoryResponse, error) { if req.GetRemote() == "" { return nil, status.Error(codes.InvalidArgument, "FindRemoteRepository: empty remote can't be checked.") @@ -129,14 +98,6 @@ func (s *server) FindRemoteRepository(ctx context.Context, req *gitalypb.FindRem return &gitalypb.FindRemoteRepositoryResponse{Exists: match}, nil } -func validateRemoveRemoteRequest(req *gitalypb.RemoveRemoteRequest) error { - if req.GetName() == "" { - return fmt.Errorf("empty remote name") - } - - return nil -} - func (s *server) voteOnRemote(ctx context.Context, repo *gitalypb.Repository, remoteName string) error { return transaction.RunOnContext(ctx, func(tx txinfo.Transaction) error { localrepo := s.localrepo(repo) diff --git a/internal/gitaly/service/remote/remotes_test.go b/internal/gitaly/service/remote/remotes_test.go index 158692729..9a0a7dd2f 100644 --- a/internal/gitaly/service/remote/remotes_test.go +++ b/internal/gitaly/service/remote/remotes_test.go @@ -175,96 +175,6 @@ func TestFailedAddRemoteDueToValidation(t *testing.T) { } } -func TestSuccessfulRemoveRemote(t *testing.T) { - t.Parallel() - cfg, repo, repoPath, client := setupRemoteService(t) - - ctx, cancel := testhelper.Context() - defer cancel() - - gittest.Exec(t, cfg, "-C", repoPath, "remote", "add", "my-remote", "http://my-repo.git") - - testCases := []struct { - description string - remoteName string - result bool - }{ - { - description: "removes the remote", - remoteName: "my-remote", - result: true, - }, - { - description: "returns false if the remote doesn't exist", - remoteName: "not-a-real-remote", - result: false, - }, - } - - for _, tc := range testCases { - t.Run(tc.description, func(t *testing.T) { - request := &gitalypb.RemoveRemoteRequest{ - Repository: repo, - Name: tc.remoteName, - } - - r, err := client.RemoveRemote(ctx, request) - require.NoError(t, err) - require.Equal(t, tc.result, r.GetResult()) - - remotes := gittest.Exec(t, cfg, "-C", repoPath, "remote") - - require.NotContains(t, string(remotes), tc.remoteName) - }) - } -} - -func TestFailedRemoveRemoteDueToValidation(t *testing.T) { - t.Parallel() - _, repo, _, client := setupRemoteService(t) - - ctx, cancel := testhelper.Context() - defer cancel() - - request := &gitalypb.RemoveRemoteRequest{Repository: repo} // Remote name empty - - _, err := client.RemoveRemote(ctx, request) - testhelper.RequireGrpcError(t, err, codes.InvalidArgument) -} - -func TestRemoveRemoteTransactional(t *testing.T) { - t.Parallel() - var votes []voting.Vote - txManager := transaction.MockManager{ - VoteFn: func(_ context.Context, _ txinfo.Transaction, vote voting.Vote) error { - votes = append(votes, vote) - return nil - }, - } - - cfg, repo, repoPath, client := setupRemoteService(t, testserver.WithTransactionManager(&txManager)) - - ctx, cancel := testhelper.Context() - defer cancel() - ctx, err := txinfo.InjectTransaction(ctx, 1, "node", true) - require.NoError(t, err) - ctx = helper.IncomingToOutgoing(ctx) - - preimageURL := text.ChompBytes(gittest.Exec(t, cfg, "-C", repoPath, "remote", "get-url", "origin")) - - _, err = client.RemoveRemote(ctx, &gitalypb.RemoveRemoteRequest{ - Repository: repo, - Name: "origin", - }) - require.NoError(t, err) - - preimageVote := fmt.Sprintf("remote.origin.url\t%s\n", preimageURL) - require.Equal(t, []voting.Vote{ - voting.VoteFromData([]byte(preimageVote)), - voting.VoteFromData([]byte{}), - }, votes) -} - func TestFindRemoteRepository(t *testing.T) { t.Parallel() _, repo, _, client := setupRemoteService(t) diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go index d0c8bcad8..241d28259 100644 --- a/internal/praefect/coordinator.go +++ b/internal/praefect/coordinator.go @@ -64,7 +64,6 @@ var transactionRPCs = map[string]transactionsCondition{ "/gitaly.RefService/DeleteRefs": transactionsEnabled, "/gitaly.RemoteService/AddRemote": transactionsEnabled, "/gitaly.RemoteService/FetchInternalRemote": transactionsEnabled, - "/gitaly.RemoteService/RemoveRemote": transactionsEnabled, "/gitaly.RepositoryService/ApplyGitattributes": transactionsEnabled, "/gitaly.RepositoryService/CloneFromPool": transactionsEnabled, "/gitaly.RepositoryService/CloneFromPoolInternal": transactionsEnabled, diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go index 36c90db92..69562dbb4 100644 --- a/internal/praefect/protoregistry/protoregistry_test.go +++ b/internal/praefect/protoregistry/protoregistry_test.go @@ -102,7 +102,6 @@ func TestNewProtoRegistry(t *testing.T) { "RemoteService": map[string]protoregistry.OpType{ "AddRemote": protoregistry.OpMutator, "FetchInternalRemote": protoregistry.OpMutator, - "RemoveRemote": protoregistry.OpMutator, "UpdateRemoteMirror": protoregistry.OpAccessor, "FindRemoteRepository": protoregistry.OpAccessor, "FindRemoteRootRef": protoregistry.OpAccessor, |