gitaly 15.11.0.pre.rc1 → 16.1.0.pre.rc2

data/ruby/proto/gitaly/service_config_pb.rb

@@ -1,46 +1,39 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: service_config.proto
 
+require 'google/protobuf'
+
 require 'google/protobuf/duration_pb'
 require 'google/protobuf/wrappers_pb'
-require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("service_config.proto", :syntax => :proto3) do
-    add_message "gitaly.ServiceConfig" do
-      repeated :load_balancing_config, :message, 1, "gitaly.LoadBalancingConfig"
-      repeated :method_config, :message, 2, "gitaly.MethodConfig"
-    end
-    add_message "gitaly.LoadBalancingConfig" do
-      oneof :policy do
-        optional :pick_first, :message, 1, "gitaly.PickFirstConfig", json_name: "pick_first"
-        optional :round_robin, :message, 2, "gitaly.RoundRobinConfig", json_name: "round_robin"
-      end
-    end
-    add_message "gitaly.PickFirstConfig" do
-    end
-    add_message "gitaly.RoundRobinConfig" do
-    end
-    add_message "gitaly.MethodConfig" do
-      repeated :name, :message, 1, "gitaly.MethodConfig.Name"
-      optional :wait_for_ready, :message, 2, "google.protobuf.BoolValue"
-      optional :timeout, :message, 3, "google.protobuf.Duration"
-      optional :max_request_message_bytes, :message, 4, "google.protobuf.UInt32Value"
-      optional :max_response_message_bytes, :message, 5, "google.protobuf.UInt32Value"
-      optional :retry_policy, :message, 6, "gitaly.MethodConfig.RetryPolicy"
-    end
-    add_message "gitaly.MethodConfig.Name" do
-      optional :service, :string, 1
-      optional :method, :string, 2
-    end
-    add_message "gitaly.MethodConfig.RetryPolicy" do
-      optional :max_attempts, :uint32, 1
-      optional :initial_backoff, :message, 2, "google.protobuf.Duration"
-      optional :max_backoff, :message, 3, "google.protobuf.Duration"
-      optional :backoff_multiplier, :float, 4
-      repeated :retryable_status_codes, :string, 5
+
+descriptor_data = "\n\x14service_config.proto\x12\x06gitaly\x1a\x1egoogle/protobuf/duration.proto\x1a\x1egoogle/protobuf/wrappers.proto\"x\n\rServiceConfig\x12:\n\x15load_balancing_config\x18\x01 \x03(\x0b\x32\x1b.gitaly.LoadBalancingConfig\x12+\n\rmethod_config\x18\x02 \x03(\x0b\x32\x14.gitaly.MethodConfig\"\x98\x01\n\x13LoadBalancingConfig\x12\x39\n\npick_first\x18\x01 \x01(\x0b\x32\x17.gitaly.PickFirstConfigH\x00R\npick_first\x12<\n\x0bround_robin\x18\x02 \x01(\x0b\x32\x18.gitaly.RoundRobinConfigH\x00R\x0bround_robinB\x08\n\x06policy\"\x11\n\x0fPickFirstConfig\"\x12\n\x10RoundRobinConfig\"\xc1\x04\n\x0cMethodConfig\x12\'\n\x04name\x18\x01 \x03(\x0b\x32\x19.gitaly.MethodConfig.Name\x12\x32\n\x0ewait_for_ready\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12*\n\x07timeout\x18\x03 \x01(\x0b\x32\x19.google.protobuf.Duration\x12?\n\x19max_request_message_bytes\x18\x04 \x01(\x0b\x32\x1c.google.protobuf.UInt32Value\x12@\n\x1amax_response_message_bytes\x18\x05 \x01(\x0b\x32\x1c.google.protobuf.UInt32Value\x12\x36\n\x0cretry_policy\x18\x06 \x01(\x0b\x32 .gitaly.MethodConfig.RetryPolicy\x1a\'\n\x04Name\x12\x0f\n\x07service\x18\x01 \x01(\t\x12\x0e\n\x06method\x18\x02 \x01(\t\x1a\xc3\x01\n\x0bRetryPolicy\x12\x14\n\x0cmax_attempts\x18\x01 \x01(\r\x12\x32\n\x0finitial_backoff\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\x12.\n\x0bmax_backoff\x18\x03 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12\x62\x61\x63koff_multiplier\x18\x04 \x01(\x02\x12\x1e\n\x16retryable_status_codes\x18\x05 \x03(\tB4Z2gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypbb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["google.protobuf.BoolValue", "google/protobuf/wrappers.proto"],
+    ["google.protobuf.Duration", "google/protobuf/duration.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Gitaly

data/ruby/proto/gitaly/shared_pb.rb

@@ -1,109 +1,38 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: shared.proto
 
+require 'google/protobuf'
+
 require 'google/protobuf/timestamp_pb'
 require 'lint_pb'
-require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("shared.proto", :syntax => :proto3) do
-    add_message "gitaly.Repository" do
-      optional :storage_name, :string, 2
-      optional :relative_path, :string, 3
-      optional :git_object_directory, :string, 4
-      repeated :git_alternate_object_directories, :string, 5
-      optional :gl_repository, :string, 6
-      optional :gl_project_path, :string, 8
-    end
-    add_message "gitaly.CommitTrailer" do
-      optional :key, :bytes, 1
-      optional :value, :bytes, 2
-    end
-    add_message "gitaly.CommitStatInfo" do
-      optional :additions, :int32, 1
-      optional :deletions, :int32, 2
-      optional :changed_files, :int32, 3
-    end
-    add_message "gitaly.GitCommit" do
-      optional :id, :string, 1
-      optional :subject, :bytes, 2
-      optional :body, :bytes, 3
-      optional :author, :message, 4, "gitaly.CommitAuthor"
-      optional :committer, :message, 5, "gitaly.CommitAuthor"
-      repeated :parent_ids, :string, 6
-      optional :body_size, :int64, 7
-      optional :signature_type, :enum, 8, "gitaly.SignatureType"
-      optional :tree_id, :string, 9
-      repeated :trailers, :message, 10, "gitaly.CommitTrailer"
-      optional :short_stats, :message, 11, "gitaly.CommitStatInfo"
-      repeated :referenced_by, :bytes, 12
-      optional :encoding, :string, 13
-    end
-    add_message "gitaly.CommitAuthor" do
-      optional :name, :bytes, 1
-      optional :email, :bytes, 2
-      optional :date, :message, 3, "google.protobuf.Timestamp"
-      optional :timezone, :bytes, 4
-    end
-    add_message "gitaly.ExitStatus" do
-      optional :value, :int32, 1
-    end
-    add_message "gitaly.Branch" do
-      optional :name, :bytes, 1
-      optional :target_commit, :message, 2, "gitaly.GitCommit"
-    end
-    add_message "gitaly.Tag" do
-      optional :name, :bytes, 1
-      optional :id, :string, 2
-      optional :target_commit, :message, 3, "gitaly.GitCommit"
-      optional :message, :bytes, 4
-      optional :message_size, :int64, 5
-      optional :tagger, :message, 6, "gitaly.CommitAuthor"
-      optional :signature_type, :enum, 7, "gitaly.SignatureType"
-    end
-    add_message "gitaly.User" do
-      optional :gl_id, :string, 1
-      optional :name, :bytes, 2
-      optional :email, :bytes, 3
-      optional :gl_username, :string, 4
-      optional :timezone, :string, 5
-    end
-    add_message "gitaly.ObjectPool" do
-      optional :repository, :message, 1, "gitaly.Repository"
-    end
-    add_message "gitaly.PaginationParameter" do
-      optional :page_token, :string, 1
-      optional :limit, :int32, 2
-    end
-    add_message "gitaly.PaginationCursor" do
-      optional :next_cursor, :string, 1
-    end
-    add_message "gitaly.GlobalOptions" do
-      optional :literal_pathspecs, :bool, 1
-    end
-    add_enum "gitaly.ObjectType" do
-      value :UNKNOWN, 0
-      value :COMMIT, 1
-      value :BLOB, 2
-      value :TREE, 3
-      value :TAG, 4
-    end
-    add_enum "gitaly.ObjectFormat" do
-      value :OBJECT_FORMAT_UNSPECIFIED, 0
-      value :OBJECT_FORMAT_SHA1, 1
-      value :OBJECT_FORMAT_SHA256, 2
-    end
-    add_enum "gitaly.SignatureType" do
-      value :NONE, 0
-      value :PGP, 1
-      value :X509, 2
-      value :SSH, 3
-    end
-    add_enum "gitaly.SortDirection" do
-      value :ASCENDING, 0
-      value :DESCENDING, 1
+
+descriptor_data = "\n\x0cshared.proto\x12\x06gitaly\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\nlint.proto\"\xc3\x01\n\nRepository\x12\x14\n\x0cstorage_name\x18\x02 \x01(\t\x12\x15\n\rrelative_path\x18\x03 \x01(\t\x12\x1c\n\x14git_object_directory\x18\x04 \x01(\t\x12(\n git_alternate_object_directories\x18\x05 \x03(\t\x12\x15\n\rgl_repository\x18\x06 \x01(\t\x12\x17\n\x0fgl_project_path\x18\x08 \x01(\tJ\x04\x08\x01\x10\x02J\x04\x08\x07\x10\x08R\x04path\"+\n\rCommitTrailer\x12\x0b\n\x03key\x18\x01 \x01(\x0c\x12\r\n\x05value\x18\x02 \x01(\x0c\"M\n\x0e\x43ommitStatInfo\x12\x11\n\tadditions\x18\x01 \x01(\x05\x12\x11\n\tdeletions\x18\x02 \x01(\x05\x12\x15\n\rchanged_files\x18\x03 \x01(\x05\"\xeb\x02\n\tGitCommit\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07subject\x18\x02 \x01(\x0c\x12\x0c\n\x04\x62ody\x18\x03 \x01(\x0c\x12$\n\x06\x61uthor\x18\x04 \x01(\x0b\x32\x14.gitaly.CommitAuthor\x12\'\n\tcommitter\x18\x05 \x01(\x0b\x32\x14.gitaly.CommitAuthor\x12\x12\n\nparent_ids\x18\x06 \x03(\t\x12\x11\n\tbody_size\x18\x07 \x01(\x03\x12-\n\x0esignature_type\x18\x08 \x01(\x0e\x32\x15.gitaly.SignatureType\x12\x0f\n\x07tree_id\x18\t \x01(\t\x12\'\n\x08trailers\x18\n \x03(\x0b\x32\x15.gitaly.CommitTrailer\x12+\n\x0bshort_stats\x18\x0b \x01(\x0b\x32\x16.gitaly.CommitStatInfo\x12\x15\n\rreferenced_by\x18\x0c \x03(\x0c\x12\x10\n\x08\x65ncoding\x18\r \x01(\t\"g\n\x0c\x43ommitAuthor\x12\x0c\n\x04name\x18\x01 \x01(\x0c\x12\r\n\x05\x65mail\x18\x02 \x01(\x0c\x12(\n\x04\x64\x61te\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x10\n\x08timezone\x18\x04 \x01(\x0c\"\x1b\n\nExitStatus\x12\r\n\x05value\x18\x01 \x01(\x05\"@\n\x06\x42ranch\x12\x0c\n\x04name\x18\x01 \x01(\x0c\x12(\n\rtarget_commit\x18\x02 \x01(\x0b\x32\x11.gitaly.GitCommit\"\xc5\x01\n\x03Tag\x12\x0c\n\x04name\x18\x01 \x01(\x0c\x12\n\n\x02id\x18\x02 \x01(\t\x12(\n\rtarget_commit\x18\x03 \x01(\x0b\x32\x11.gitaly.GitCommit\x12\x0f\n\x07message\x18\x04 \x01(\x0c\x12\x14\n\x0cmessage_size\x18\x05 \x01(\x03\x12$\n\x06tagger\x18\x06 \x01(\x0b\x32\x14.gitaly.CommitAuthor\x12-\n\x0esignature_type\x18\x07 \x01(\x0e\x32\x15.gitaly.SignatureType\"Y\n\x04User\x12\r\n\x05gl_id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\x0c\x12\r\n\x05\x65mail\x18\x03 \x01(\x0c\x12\x13\n\x0bgl_username\x18\x04 \x01(\t\x12\x10\n\x08timezone\x18\x05 \x01(\t\":\n\nObjectPool\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x90\xc6,\x01\"8\n\x13PaginationParameter\x12\x12\n\npage_token\x18\x01 \x01(\t\x12\r\n\x05limit\x18\x02 \x01(\x05\"\'\n\x10PaginationCursor\x12\x13\n\x0bnext_cursor\x18\x01 \x01(\t\"*\n\rGlobalOptions\x12\x19\n\x11literal_pathspecs\x18\x01 \x01(\x08*B\n\nObjectType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\n\n\x06\x43OMMIT\x10\x01\x12\x08\n\x04\x42LOB\x10\x02\x12\x08\n\x04TREE\x10\x03\x12\x07\n\x03TAG\x10\x04*_\n\x0cObjectFormat\x12\x1d\n\x19OBJECT_FORMAT_UNSPECIFIED\x10\x00\x12\x16\n\x12OBJECT_FORMAT_SHA1\x10\x01\x12\x18\n\x14OBJECT_FORMAT_SHA256\x10\x02*5\n\rSignatureType\x12\x08\n\x04NONE\x10\x00\x12\x07\n\x03PGP\x10\x01\x12\x08\n\x04X509\x10\x02\x12\x07\n\x03SSH\x10\x03*.\n\rSortDirection\x12\r\n\tASCENDING\x10\x00\x12\x0e\n\nDESCENDING\x10\x01\x42\x34Z2gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypbb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["google.protobuf.Timestamp", "google/protobuf/timestamp.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Gitaly

data/ruby/proto/gitaly/smarthttp_pb.rb

@@ -1,40 +1,38 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: smarthttp.proto
 
+require 'google/protobuf'
+
 require 'lint_pb'
 require 'shared_pb'
-require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("smarthttp.proto", :syntax => :proto3) do
-    add_message "gitaly.InfoRefsRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      repeated :git_config_options, :string, 2
-      optional :git_protocol, :string, 3
-    end
-    add_message "gitaly.InfoRefsResponse" do
-      optional :data, :bytes, 1
-    end
-    add_message "gitaly.PostUploadPackWithSidechannelRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      repeated :git_config_options, :string, 2
-      optional :git_protocol, :string, 3
-    end
-    add_message "gitaly.PostUploadPackWithSidechannelResponse" do
-    end
-    add_message "gitaly.PostReceivePackRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :data, :bytes, 2
-      optional :gl_id, :string, 3
-      optional :gl_repository, :string, 4
-      optional :gl_username, :string, 5
-      optional :git_protocol, :string, 6
-      repeated :git_config_options, :string, 7
-    end
-    add_message "gitaly.PostReceivePackResponse" do
-      optional :data, :bytes, 1
+
+descriptor_data = "\n\x0fsmarthttp.proto\x12\x06gitaly\x1a\nlint.proto\x1a\x0cshared.proto\"q\n\x0fInfoRefsRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x1a\n\x12git_config_options\x18\x02 \x03(\t\x12\x14\n\x0cgit_protocol\x18\x03 \x01(\t\" \n\x10InfoRefsResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"\x86\x01\n$PostUploadPackWithSidechannelRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x1a\n\x12git_config_options\x18\x02 \x03(\t\x12\x14\n\x0cgit_protocol\x18\x03 \x01(\t\"\'\n%PostUploadPackWithSidechannelResponse\"\xc1\x01\n\x16PostReceivePackRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\x12\r\n\x05gl_id\x18\x03 \x01(\t\x12\x15\n\rgl_repository\x18\x04 \x01(\t\x12\x13\n\x0bgl_username\x18\x05 \x01(\t\x12\x14\n\x0cgit_protocol\x18\x06 \x01(\t\x12\x1a\n\x12git_config_options\x18\x07 \x03(\t\"\'\n\x17PostReceivePackResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\x32\xa0\x03\n\x10SmartHTTPService\x12Q\n\x12InfoRefsUploadPack\x12\x17.gitaly.InfoRefsRequest\x1a\x18.gitaly.InfoRefsResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12R\n\x13InfoRefsReceivePack\x12\x17.gitaly.InfoRefsRequest\x1a\x18.gitaly.InfoRefsResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12\x84\x01\n\x1dPostUploadPackWithSidechannel\x12,.gitaly.PostUploadPackWithSidechannelRequest\x1a-.gitaly.PostUploadPackWithSidechannelResponse\"\x06\xfa\x97(\x02\x08\x02\x12^\n\x0fPostReceivePack\x12\x1e.gitaly.PostReceivePackRequest\x1a\x1f.gitaly.PostReceivePackResponse\"\x06\xfa\x97(\x02\x08\x01(\x01\x30\x01\x42\x34Z2gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypbb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["gitaly.Repository", "shared.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Gitaly

data/ruby/proto/gitaly/smarthttp_services_pb.rb

@@ -16,17 +16,26 @@ module Gitaly
       self.unmarshal_class_method = :decode
       self.service_name = 'gitaly.SmartHTTPService'
 
-      # The response body for GET /info/refs?service=git-upload-pack
-      # Will be invoked when the user executes a `git fetch`, meaning the server
-      # will upload the packs to that user. The user doesn't upload new objects.
+      # InfoRefsUploadPack provides the response for GET /info/refs?service=git-upload-pack.
+      # It is invoked when the client fetches packs from the server, meaning the server will
+      # upload the packs to that client. The client doesn't upload new objects. This is used
+      # to advertise the references available on the server to the client via
+      # git-upload-pack(1)'s `--advertise-refs` option.
       rpc :InfoRefsUploadPack, ::Gitaly::InfoRefsRequest, stream(::Gitaly::InfoRefsResponse)
-      # The response body for GET /info/refs?service=git-receive-pack
-      # Will be invoked when the user executes a `git push`, but only advertises
-      # references to the user.
+      # InfoRefsReceivePack provides the response for GET /info/refs?service=git-receive-pack.
+      # It is invoked when the client pushes packs to the server, meaning the server
+      # will fetch the packs from the client. This is used to advertise the references
+      # available on the server to the client via git-receive-pack(1)'s `--advertise-refs`
+      # option.
       rpc :InfoRefsReceivePack, ::Gitaly::InfoRefsRequest, stream(::Gitaly::InfoRefsResponse)
-      # Request and response body for POST /upload-pack using sidechannel protocol
+      # PostUploadPackWithSidechannel provides the response for POST /upload-pack. It
+      # used to transfer pack files from the server to the client via sidechannels. This
+      # is invoked when the client executes `git fetch`.
+      #
+      # More info on sidechannels: https://gitlab.com/gitlab-org/gitaly/-/blob/master/doc/sidechannel.md
       rpc :PostUploadPackWithSidechannel, ::Gitaly::PostUploadPackWithSidechannelRequest, ::Gitaly::PostUploadPackWithSidechannelResponse
-      # Request and response body for POST /receive-pack
+      # PostReceivePack provides the response for POST /receive-pack. It used to transfer
+      # pack files from the client to the server. This is invoked when the client executes `git push`.
       rpc :PostReceivePack, stream(::Gitaly::PostReceivePackRequest), stream(::Gitaly::PostReceivePackResponse)
     end
 

data/ruby/proto/gitaly/ssh_pb.rb

@@ -1,54 +1,38 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: ssh.proto
 
+require 'google/protobuf'
+
 require 'lint_pb'
 require 'shared_pb'
-require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("ssh.proto", :syntax => :proto3) do
-    add_message "gitaly.SSHUploadPackRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :stdin, :bytes, 2
-      repeated :git_config_options, :string, 4
-      optional :git_protocol, :string, 5
-    end
-    add_message "gitaly.SSHUploadPackResponse" do
-      optional :stdout, :bytes, 1
-      optional :stderr, :bytes, 2
-      optional :exit_status, :message, 3, "gitaly.ExitStatus"
-    end
-    add_message "gitaly.SSHUploadPackWithSidechannelRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      repeated :git_config_options, :string, 2
-      optional :git_protocol, :string, 3
-    end
-    add_message "gitaly.SSHUploadPackWithSidechannelResponse" do
-    end
-    add_message "gitaly.SSHReceivePackRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :stdin, :bytes, 2
-      optional :gl_id, :string, 3
-      optional :gl_repository, :string, 4
-      optional :gl_username, :string, 5
-      optional :git_protocol, :string, 6
-      repeated :git_config_options, :string, 7
-    end
-    add_message "gitaly.SSHReceivePackResponse" do
-      optional :stdout, :bytes, 1
-      optional :stderr, :bytes, 2
-      optional :exit_status, :message, 3, "gitaly.ExitStatus"
-    end
-    add_message "gitaly.SSHUploadArchiveRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :stdin, :bytes, 2
-    end
-    add_message "gitaly.SSHUploadArchiveResponse" do
-      optional :stdout, :bytes, 1
-      optional :stderr, :bytes, 2
-      optional :exit_status, :message, 3, "gitaly.ExitStatus"
+
+descriptor_data = "\n\tssh.proto\x12\x06gitaly\x1a\nlint.proto\x1a\x0cshared.proto\"\xa2\x01\n\x14SSHUploadPackRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\r\n\x05stdin\x18\x02 \x01(\x0c\x12\x1a\n\x12git_config_options\x18\x04 \x03(\t\x12\x14\n\x0cgit_protocol\x18\x05 \x01(\tJ\x04\x08\x03\x10\x04R\x15git_config_parameters\"`\n\x15SSHUploadPackResponse\x12\x0e\n\x06stdout\x18\x01 \x01(\x0c\x12\x0e\n\x06stderr\x18\x02 \x01(\x0c\x12\'\n\x0b\x65xit_status\x18\x03 \x01(\x0b\x32\x12.gitaly.ExitStatus\"\x85\x01\n#SSHUploadPackWithSidechannelRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x1a\n\x12git_config_options\x18\x02 \x03(\t\x12\x14\n\x0cgit_protocol\x18\x03 \x01(\t\"&\n$SSHUploadPackWithSidechannelResponse\"\xc1\x01\n\x15SSHReceivePackRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\r\n\x05stdin\x18\x02 \x01(\x0c\x12\r\n\x05gl_id\x18\x03 \x01(\t\x12\x15\n\rgl_repository\x18\x04 \x01(\t\x12\x13\n\x0bgl_username\x18\x05 \x01(\t\x12\x14\n\x0cgit_protocol\x18\x06 \x01(\t\x12\x1a\n\x12git_config_options\x18\x07 \x03(\t\"a\n\x16SSHReceivePackResponse\x12\x0e\n\x06stdout\x18\x01 \x01(\x0c\x12\x0e\n\x06stderr\x18\x02 \x01(\x0c\x12\'\n\x0b\x65xit_status\x18\x03 \x01(\x0b\x32\x12.gitaly.ExitStatus\"V\n\x17SSHUploadArchiveRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\r\n\x05stdin\x18\x02 \x01(\x0c\"c\n\x18SSHUploadArchiveResponse\x12\x0e\n\x06stdout\x18\x01 \x01(\x0c\x12\x0e\n\x06stderr\x18\x02 \x01(\x0c\x12\'\n\x0b\x65xit_status\x18\x03 \x01(\x0b\x32\x12.gitaly.ExitStatus2\xaa\x03\n\nSSHService\x12X\n\rSSHUploadPack\x12\x1c.gitaly.SSHUploadPackRequest\x1a\x1d.gitaly.SSHUploadPackResponse\"\x06\xfa\x97(\x02\x08\x02(\x01\x30\x01\x12\x81\x01\n\x1cSSHUploadPackWithSidechannel\x12+.gitaly.SSHUploadPackWithSidechannelRequest\x1a,.gitaly.SSHUploadPackWithSidechannelResponse\"\x06\xfa\x97(\x02\x08\x02\x12[\n\x0eSSHReceivePack\x12\x1d.gitaly.SSHReceivePackRequest\x1a\x1e.gitaly.SSHReceivePackResponse\"\x06\xfa\x97(\x02\x08\x01(\x01\x30\x01\x12\x61\n\x10SSHUploadArchive\x12\x1f.gitaly.SSHUploadArchiveRequest\x1a .gitaly.SSHUploadArchiveResponse\"\x06\xfa\x97(\x02\x08\x02(\x01\x30\x01\x42\x34Z2gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypbb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["gitaly.Repository", "shared.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Gitaly

data/ruby/proto/gitaly/transaction_pb.rb

@@ -1,39 +1,38 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: transaction.proto
 
+require 'google/protobuf'
+
 require 'lint_pb'
 require 'shared_pb'
-require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("transaction.proto", :syntax => :proto3) do
-    add_message "gitaly.VoteTransactionRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :transaction_id, :uint64, 2
-      optional :node, :string, 3
-      optional :reference_updates_hash, :bytes, 4
-      optional :phase, :enum, 5, "gitaly.VoteTransactionRequest.Phase"
-    end
-    add_enum "gitaly.VoteTransactionRequest.Phase" do
-      value :UNKNOWN_PHASE, 0
-      value :PREPARED_PHASE, 1
-      value :COMMITTED_PHASE, 2
-    end
-    add_message "gitaly.VoteTransactionResponse" do
-      optional :state, :enum, 1, "gitaly.VoteTransactionResponse.TransactionState"
-    end
-    add_enum "gitaly.VoteTransactionResponse.TransactionState" do
-      value :COMMIT, 0
-      value :ABORT, 1
-      value :STOP, 2
-    end
-    add_message "gitaly.StopTransactionRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :transaction_id, :uint64, 2
-    end
-    add_message "gitaly.StopTransactionResponse" do
+
+descriptor_data = "\n\x11transaction.proto\x12\x06gitaly\x1a\nlint.proto\x1a\x0cshared.proto\"\x86\x02\n\x16VoteTransactionRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0etransaction_id\x18\x02 \x01(\x04\x12\x0c\n\x04node\x18\x03 \x01(\t\x12\x1e\n\x16reference_updates_hash\x18\x04 \x01(\x0c\x12\x33\n\x05phase\x18\x05 \x01(\x0e\x32$.gitaly.VoteTransactionRequest.Phase\"C\n\x05Phase\x12\x11\n\rUNKNOWN_PHASE\x10\x00\x12\x12\n\x0ePREPARED_PHASE\x10\x01\x12\x13\n\x0f\x43OMMITTED_PHASE\x10\x02\"\x8f\x01\n\x17VoteTransactionResponse\x12?\n\x05state\x18\x01 \x01(\x0e\x32\x30.gitaly.VoteTransactionResponse.TransactionState\"3\n\x10TransactionState\x12\n\n\x06\x43OMMIT\x10\x00\x12\t\n\x05\x41\x42ORT\x10\x01\x12\x08\n\x04STOP\x10\x02\"^\n\x16StopTransactionRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0etransaction_id\x18\x02 \x01(\x04\"\x19\n\x17StopTransactionResponse2\xbe\x01\n\x0eRefTransaction\x12R\n\x0fVoteTransaction\x12\x1e.gitaly.VoteTransactionRequest\x1a\x1f.gitaly.VoteTransactionResponse\x12R\n\x0fStopTransaction\x12\x1e.gitaly.StopTransactionRequest\x1a\x1f.gitaly.StopTransactionResponse\x1a\x04\xf0\x97(\x01\x42\x34Z2gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypbb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["gitaly.Repository", "shared.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Gitaly

data/ruby/proto/gitaly/version.rb

@@ -1,4 +1,4 @@
 # This file is generated by build-proto-gem. Do not edit.
 module Gitaly
-  VERSION = '15.11.0-rc1'
+  VERSION = '16.1.0-rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitaly
 version: !ruby/object:Gem::Version
-  version: 15.11.0.pre.rc1
+  version: 16.1.0.pre.rc2
 platform: ruby
 authors:
 - Jacob Vosmaer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -78,7 +78,7 @@ homepage: https://gitlab.com/gitlab-org/gitaly
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - ruby/proto
@@ -93,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Auto-generated gRPC client for gitaly
 test_files: []