diff options
author | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-10-19 08:58:02 +0300 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-10-27 11:14:20 +0300 |
commit | 9aafd67bb602d29d0de3e83461fbf39f207deaaa (patch) | |
tree | 0ad8f1fcbd1c79e81bf2eb7ad89cfc3da4832fd1 /ruby/proto | |
parent | 86e3c5c6c1b238b81e7097acb7a1e45bda9975b0 (diff) |
Remove Wiki-related code paths in Ruby sidecar
In a prior MR, all Wiki-related RPCs are removed from Gitaly,
all the corresponding code paths in Ruby are redundant. This
commit targets removing Wiki handlers inside ruby sidecar, Wiki
protobuf definition, and gollum gems. The rugged gem is
intentionally left out for the next MR to reduce the change size.
Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/4513
Changelog: removed
Diffstat (limited to 'ruby/proto')
-rw-r--r-- | ruby/proto/gitaly.rb | 2 | ||||
-rw-r--r-- | ruby/proto/gitaly/wiki_pb.rb | 109 | ||||
-rw-r--r-- | ruby/proto/gitaly/wiki_services_pb.rb | 34 |
3 files changed, 0 insertions, 145 deletions
diff --git a/ruby/proto/gitaly.rb b/ruby/proto/gitaly.rb index 5ea7a9d04..234ad7ffb 100644 --- a/ruby/proto/gitaly.rb +++ b/ruby/proto/gitaly.rb @@ -39,5 +39,3 @@ require 'gitaly/ssh_services_pb' require 'gitaly/transaction_services_pb' -require 'gitaly/wiki_services_pb' - diff --git a/ruby/proto/gitaly/wiki_pb.rb b/ruby/proto/gitaly/wiki_pb.rb deleted file mode 100644 index a046da613..000000000 --- a/ruby/proto/gitaly/wiki_pb.rb +++ /dev/null @@ -1,109 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: wiki.proto - -require 'lint_pb' -require 'shared_pb' -require 'google/protobuf' - -Google::Protobuf::DescriptorPool.generated_pool.build do - add_file("wiki.proto", :syntax => :proto3) do - add_message "gitaly.WikiCommitDetails" do - optional :name, :bytes, 1 - optional :email, :bytes, 2 - optional :message, :bytes, 3 - optional :user_id, :int32, 4 - optional :user_name, :bytes, 5 - end - add_message "gitaly.WikiPageVersion" do - optional :commit, :message, 1, "gitaly.GitCommit" - optional :format, :string, 2 - end - add_message "gitaly.WikiPage" do - optional :version, :message, 1, "gitaly.WikiPageVersion" - optional :format, :string, 2 - optional :title, :bytes, 3 - optional :url_path, :string, 4 - optional :path, :bytes, 5 - optional :name, :bytes, 6 - optional :historical, :bool, 7 - optional :raw_data, :bytes, 8 - end - add_message "gitaly.WikiWritePageRequest" do - optional :repository, :message, 1, "gitaly.Repository" - optional :name, :bytes, 2 - optional :format, :string, 3 - optional :commit_details, :message, 4, "gitaly.WikiCommitDetails" - optional :content, :bytes, 5 - end - add_message "gitaly.WikiWritePageResponse" do - optional :duplicate_error, :bytes, 1 - end - add_message "gitaly.WikiUpdatePageRequest" do - optional :repository, :message, 1, "gitaly.Repository" - optional :page_path, :bytes, 2 - optional :title, :bytes, 3 - optional :format, :string, 4 - optional :commit_details, :message, 5, "gitaly.WikiCommitDetails" - optional :content, :bytes, 6 - end - add_message "gitaly.WikiUpdatePageResponse" do - optional :error, :bytes, 1 - end - add_message "gitaly.WikiFindPageRequest" do - optional :repository, :message, 1, "gitaly.Repository" - optional :title, :bytes, 2 - optional :revision, :bytes, 3 - optional :directory, :bytes, 4 - optional :skip_content, :bool, 5 - end - add_message "gitaly.WikiFindPageResponse" do - optional :page, :message, 1, "gitaly.WikiPage" - end - add_message "gitaly.WikiGetAllPagesRequest" do - optional :repository, :message, 1, "gitaly.Repository" - optional :limit, :uint32, 2 - optional :direction_desc, :bool, 3 - optional :sort, :enum, 4, "gitaly.WikiGetAllPagesRequest.SortBy" - end - add_enum "gitaly.WikiGetAllPagesRequest.SortBy" do - value :TITLE, 0 - value :CREATED_AT, 1 - end - add_message "gitaly.WikiGetAllPagesResponse" do - optional :page, :message, 1, "gitaly.WikiPage" - optional :end_of_page, :bool, 2 - end - add_message "gitaly.WikiListPagesRequest" do - optional :repository, :message, 1, "gitaly.Repository" - optional :limit, :uint32, 2 - optional :direction_desc, :bool, 3 - optional :sort, :enum, 4, "gitaly.WikiListPagesRequest.SortBy" - optional :offset, :uint32, 5 - end - add_enum "gitaly.WikiListPagesRequest.SortBy" do - value :TITLE, 0 - value :CREATED_AT, 1 - end - add_message "gitaly.WikiListPagesResponse" do - optional :page, :message, 1, "gitaly.WikiPage" - end - end -end - -module Gitaly - WikiCommitDetails = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiCommitDetails").msgclass - WikiPageVersion = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiPageVersion").msgclass - WikiPage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiPage").msgclass - WikiWritePageRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiWritePageRequest").msgclass - WikiWritePageResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiWritePageResponse").msgclass - WikiUpdatePageRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiUpdatePageRequest").msgclass - WikiUpdatePageResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiUpdatePageResponse").msgclass - WikiFindPageRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiFindPageRequest").msgclass - WikiFindPageResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiFindPageResponse").msgclass - WikiGetAllPagesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiGetAllPagesRequest").msgclass - WikiGetAllPagesRequest::SortBy = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiGetAllPagesRequest.SortBy").enummodule - WikiGetAllPagesResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiGetAllPagesResponse").msgclass - WikiListPagesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiListPagesRequest").msgclass - WikiListPagesRequest::SortBy = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiListPagesRequest.SortBy").enummodule - WikiListPagesResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiListPagesResponse").msgclass -end diff --git a/ruby/proto/gitaly/wiki_services_pb.rb b/ruby/proto/gitaly/wiki_services_pb.rb deleted file mode 100644 index 16ccdd1cb..000000000 --- a/ruby/proto/gitaly/wiki_services_pb.rb +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# Source: wiki.proto for package 'gitaly' - -require 'grpc' -require 'wiki_pb' - -module Gitaly - module WikiService - # WikiService is a service that provides Wiki-related functionality. This - # service is deprecated and should not be used anymore. Instead, all - # functionality to implement Wikis should use Git-based RPCS. - class Service - - include ::GRPC::GenericService - - self.marshal_class_method = :encode - self.unmarshal_class_method = :decode - self.service_name = 'gitaly.WikiService' - - # This comment is left unintentionally blank. - rpc :WikiWritePage, stream(::Gitaly::WikiWritePageRequest), ::Gitaly::WikiWritePageResponse - # This comment is left unintentionally blank. - rpc :WikiUpdatePage, stream(::Gitaly::WikiUpdatePageRequest), ::Gitaly::WikiUpdatePageResponse - # WikiFindPage returns a stream because the page's raw_data field may be arbitrarily large. - rpc :WikiFindPage, ::Gitaly::WikiFindPageRequest, stream(::Gitaly::WikiFindPageResponse) - # This comment is left unintentionally blank. - rpc :WikiGetAllPages, ::Gitaly::WikiGetAllPagesRequest, stream(::Gitaly::WikiGetAllPagesResponse) - # This comment is left unintentionally blank. - rpc :WikiListPages, ::Gitaly::WikiListPagesRequest, stream(::Gitaly::WikiListPagesResponse) - end - - Stub = Service.rpc_stub_class - end -end |