diff options
author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-21 14:43:04 +0300 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-22 09:00:16 +0300 |
commit | d3c675691d366b9c751f0f17d1eb61c87b509ab6 (patch) | |
tree | e0a8d729fb24986797df0a4242110f6d3ddaaf58 /ruby/proto | |
parent | 942d8298610eded70b5204863048617ee1c136cd (diff) |
proto: Introduce structured UserCreateTagErrorpks-user-create-tag-error-proto
Introduce a structured UserCreateTagError that can be returned by the
UserCreateTag RPC. This will eventually replace error conditions where
we're currently failing to create the tag, but return successfully
anyway.
In order to demonstrate that this structured error covers all cases we
care about this commit also adds comments to all current sites where we
return success under an error condition.
Changelog: added
Diffstat (limited to 'ruby/proto')
-rw-r--r-- | ruby/proto/gitaly/errors_pb.rb | 5 | ||||
-rw-r--r-- | ruby/proto/gitaly/operations_pb.rb | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ruby/proto/gitaly/errors_pb.rb b/ruby/proto/gitaly/errors_pb.rb index 42bf8b20e..620b645e5 100644 --- a/ruby/proto/gitaly/errors_pb.rb +++ b/ruby/proto/gitaly/errors_pb.rb @@ -27,6 +27,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end add_message "gitaly.ReferencesLockedError" do end + add_message "gitaly.ReferenceExistsError" do + optional :reference_name, :bytes, 1 + optional :oid, :string, 2 + end add_message "gitaly.ReferenceUpdateError" do optional :reference_name, :bytes, 1 optional :old_oid, :string, 2 @@ -60,6 +64,7 @@ module Gitaly ChangesAlreadyAppliedError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ChangesAlreadyAppliedError").msgclass MergeConflictError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.MergeConflictError").msgclass ReferencesLockedError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ReferencesLockedError").msgclass + ReferenceExistsError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ReferenceExistsError").msgclass ReferenceUpdateError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ReferenceUpdateError").msgclass ResolveRevisionError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ResolveRevisionError").msgclass LimitError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.LimitError").msgclass diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb index e5954d7c4..e29ad9932 100644 --- a/ruby/proto/gitaly/operations_pb.rb +++ b/ruby/proto/gitaly/operations_pb.rb @@ -65,6 +65,14 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :exists, :bool, 2 optional :pre_receive_error, :string, 3 end + add_message "gitaly.UserCreateTagError" do + oneof :error do + optional :access_check, :message, 1, "gitaly.AccessCheckError" + optional :reference_update, :message, 2, "gitaly.ReferenceUpdateError" + optional :custom_hook, :message, 3, "gitaly.CustomHookError" + optional :reference_exists, :message, 4, "gitaly.ReferenceExistsError" + end + end add_message "gitaly.UserMergeBranchRequest" do optional :repository, :message, 1, "gitaly.Repository" optional :user, :message, 2, "gitaly.User" @@ -308,6 +316,7 @@ module Gitaly UserDeleteTagResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserDeleteTagResponse").msgclass UserCreateTagRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCreateTagRequest").msgclass UserCreateTagResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCreateTagResponse").msgclass + UserCreateTagError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCreateTagError").msgclass UserMergeBranchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserMergeBranchRequest").msgclass UserMergeBranchResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserMergeBranchResponse").msgclass UserMergeBranchError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserMergeBranchError").msgclass |