Merge branch 'update-topology-service-gem' into 'master'

Updating Topology Service Client Gem to d88ee3c

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169326



Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Co-authored-by: Omar Qunsul <oqunsul@gitlab.com>

scripts/update-topology-service-gem.sh

@@ -45,7 +45,7 @@ else
   echo "$rev" > "$gem_target/REVISION"
   git add "$gem_target/REVISION"
   changelog=$(git -C "$tmp" log --no-merges --pretty="- %h: %s" "$prev_rev..$rev" -- clients/ruby/)
-  git commit -m "Updating Topology Service Client Gem to $short_rev" -m "$changelog" -m 'changelog: other'
+  git commit -m "Updating Topology Service Client Gem to $short_rev" -m "$changelog" -m 'Changelog: other'
 fi
 rm -rf "$tmp"

vendor/gems/gitlab-topology-service-client/REVISION

-722480422308f4bdba9e5ab874b6d4752667e51a
+d88ee3c1078fee452e03170cc74da0db5732c8a7

vendor/gems/gitlab-topology-service-client/lib/gitlab/cells/topology_service.rb

@@ -5,4 +5,4 @@
 require "proto/claim_service_services_pb"
 require "proto/classify_service_services_pb"
 require "proto/health_service_services_pb"
-require "proto/sequence_service_services_pb"
+require "proto/cell_service_services_pb"

vendor/gems/gitlab-topology-service-client/lib/proto/cell_info_pb.rb

@@ -5,16 +5,21 @@
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("proto/cell_info.proto", :syntax => :proto3) do
+    add_message "gitlab.cells.topology_service.SequenceRange" do
+      optional :minval, :int64, 1, json_name: "minval"
+      optional :maxval, :int64, 2, json_name: "maxval"
+    end
     add_message "gitlab.cells.topology_service.CellInfo" do
-      optional :id, :int64, 1
-      optional :name, :string, 2
-      optional :address, :string, 3
-      optional :session_prefix, :string, 4
+      optional :id, :int64, 1, json_name: "id"
+      optional :name, :string, 2, json_name: "name"
+      optional :address, :string, 3, json_name: "address"
+      optional :session_prefix, :string, 4, json_name: "sessionPrefix"
+      optional :sequence_range, :message, 5, "gitlab.cells.topology_service.SequenceRange", json_name: "sequenceRange"
     end
     add_message "gitlab.cells.topology_service.GetCellsRequest" do
     end
     add_message "gitlab.cells.topology_service.GetCellsResponse" do
-      repeated :cells, :message, 1, "gitlab.cells.topology_service.CellInfo"
+      repeated :cells, :message, 1, "gitlab.cells.topology_service.CellInfo", json_name: "cells"
     end
   end
 end
@@ -22,6 +27,7 @@
 module Gitlab
   module Cells
     module TopologyService
+      SequenceRange = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitlab.cells.topology_service.SequenceRange").msgclass
       CellInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitlab.cells.topology_service.CellInfo").msgclass
       GetCellsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitlab.cells.topology_service.GetCellsRequest").msgclass
       GetCellsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitlab.cells.topology_service.GetCellsResponse").msgclass

vendor/gems/gitlab-topology-service-client/lib/proto/cell_service_pb.rb

+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: proto/cell_service.proto
+
+require 'google/protobuf'
+
+require 'proto/cell_info_pb'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("proto/cell_service.proto", :syntax => :proto3) do
+    add_message "gitlab.cells.topology_service.GetCellRequest" do
+      optional :cell_name, :string, 1, json_name: "cellName"
+    end
+    add_message "gitlab.cells.topology_service.GetCellResponse" do
+      optional :cell_info, :message, 1, "gitlab.cells.topology_service.CellInfo", json_name: "cellInfo"
+    end
+  end
+end
+
+module Gitlab
+  module Cells
+    module TopologyService
+      GetCellRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitlab.cells.topology_service.GetCellRequest").msgclass
+      GetCellResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitlab.cells.topology_service.GetCellResponse").msgclass
+    end
+  end
+end

vendor/gems/gitlab-topology-service-client/lib/proto/cell_service_services_pb.rb

+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: proto/cell_service.proto for package 'Gitlab.Cells.TopologyService'
+
+require 'grpc'
+require 'proto/cell_service_pb'
+
+module Gitlab
+  module Cells
+    module TopologyService
+      module CellService
+        class Service
+
+          include ::GRPC::GenericService
+
+          self.marshal_class_method = :encode
+          self.unmarshal_class_method = :decode
+          self.service_name = 'gitlab.cells.topology_service.CellService'
+
+          rpc :GetCell, ::Gitlab::Cells::TopologyService::GetCellRequest, ::Gitlab::Cells::TopologyService::GetCellResponse
+        end
+
+        Stub = Service.rpc_stub_class
+      end
+    end
+  end
+end

vendor/gems/gitlab-topology-service-client/lib/proto/claim_service_pb.rb

@@ -4,49 +4,50 @@
 require 'google/protobuf'
 require 'proto/cell_info_pb'
+
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("proto/claim_service.proto", :syntax => :proto3) do
     add_message "gitlab.cells.topology_service.ClaimRecord" do
-      optional :bucket, :enum, 1, "gitlab.cells.topology_service.ClaimRecord.Bucket"
-      optional :value, :string, 2
+      optional :bucket, :enum, 1, "gitlab.cells.topology_service.ClaimRecord.Bucket", json_name: "bucket"
+      optional :value, :string, 2, json_name: "value"
     end
     add_enum "gitlab.cells.topology_service.ClaimRecord.Bucket" do
-      value :Unknown, 0
-      value :Routes, 1
+      value :UNSPECIFIED, 0
+      value :ROUTES, 1
     end
     add_message "gitlab.cells.topology_service.ParentRecord" do
-      optional :model, :enum, 1, "gitlab.cells.topology_service.ParentRecord.ApplicationModel"
-      optional :id, :int64, 2
+      optional :model, :enum, 1, "gitlab.cells.topology_service.ParentRecord.ApplicationModel", json_name: "model"
+      optional :id, :int64, 2, json_name: "id"
     end
     add_enum "gitlab.cells.topology_service.ParentRecord.ApplicationModel" do
-      value :Unknown, 0
-      value :Group, 1
-      value :Project, 2
-      value :UserNamespace, 3
+      value :UNSPECIFIED, 0
+      value :GROUP, 1
+      value :PROJECT, 2
+      value :USER_NAMESPACE, 3
     end
     add_message "gitlab.cells.topology_service.OwnerRecord" do
-      optional :table, :enum, 1, "gitlab.cells.topology_service.OwnerRecord.Table"
-      optional :id, :int64, 2
+      optional :table, :enum, 1, "gitlab.cells.topology_service.OwnerRecord.Table", json_name: "table"
+      optional :id, :int64, 2, json_name: "id"
     end
     add_enum "gitlab.cells.topology_service.OwnerRecord.Table" do
-      value :Unknown, 0
-      value :routes, 1
+      value :UNSPECIFIED, 0
+      value :ROUTES, 1
     end
     add_message "gitlab.cells.topology_service.ClaimDetails" do
-      optional :claim, :message, 1, "gitlab.cells.topology_service.ClaimRecord"
-      optional :parent, :message, 2, "gitlab.cells.topology_service.ParentRecord"
-      optional :owner, :message, 3, "gitlab.cells.topology_service.OwnerRecord"
+      optional :claim, :message, 1, "gitlab.cells.topology_service.ClaimRecord", json_name: "claim"
+      optional :parent, :message, 2, "gitlab.cells.topology_service.ParentRecord", json_name: "parent"
+      optional :owner, :message, 3, "gitlab.cells.topology_service.OwnerRecord", json_name: "owner"
     end
     add_message "gitlab.cells.topology_service.ClaimInfo" do
-      optional :id, :int64, 1
-      optional :details, :message, 2, "gitlab.cells.topology_service.ClaimDetails"
-      proto3_optional :cell_info, :message, 3, "gitlab.cells.topology_service.CellInfo"
+      optional :id, :int64, 1, json_name: "id"
+      optional :details, :message, 2, "gitlab.cells.topology_service.ClaimDetails", json_name: "details"
+      proto3_optional :cell_info, :message, 3, "gitlab.cells.topology_service.CellInfo", json_name: "cellInfo"
     end
     add_message "gitlab.cells.topology_service.CreateClaimRequest" do
-      optional :details, :message, 1, "gitlab.cells.topology_service.ClaimDetails"
+      optional :details, :message, 1, "gitlab.cells.topology_service.ClaimDetails", json_name: "details"
     end
     add_message "gitlab.cells.topology_service.CreateClaimResponse" do
-      optional :claim, :message, 1, "gitlab.cells.topology_service.ClaimInfo"
+      optional :claim, :message, 1, "gitlab.cells.topology_service.ClaimInfo", json_name: "claim"
     end
   end
 end

vendor/gems/gitlab-topology-service-client/lib/proto/claim_service_services_pb.rb

@@ -11,14 +11,14 @@ module ClaimService
         # Restricted read-write service to claim global uniqueness on resources
         class Service
-          include GRPC::GenericService
+          include ::GRPC::GenericService
           self.marshal_class_method = :encode
           self.unmarshal_class_method = :decode
           self.service_name = 'gitlab.cells.topology_service.ClaimService'
-          rpc :GetCells, Gitlab::Cells::TopologyService::GetCellsRequest, Gitlab::Cells::TopologyService::GetCellsResponse
-          rpc :CreateClaim, Gitlab::Cells::TopologyService::CreateClaimRequest, Gitlab::Cells::TopologyService::CreateClaimResponse
+          rpc :GetCells, ::Gitlab::Cells::TopologyService::GetCellsRequest, ::Gitlab::Cells::TopologyService::GetCellsResponse
+          rpc :CreateClaim, ::Gitlab::Cells::TopologyService::CreateClaimRequest, ::Gitlab::Cells::TopologyService::CreateClaimResponse
         end
         Stub = Service.rpc_stub_class

vendor/gems/gitlab-topology-service-client/lib/proto/classify_service_pb.rb

@@ -3,29 +3,30 @@
 require 'google/protobuf'
-require 'proto/cell_info_pb'
 require 'google/api/annotations_pb'
+require 'proto/cell_info_pb'
+
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("proto/classify_service.proto", :syntax => :proto3) do
     add_message "gitlab.cells.topology_service.ClassifyRequest" do
-      optional :type, :enum, 2, "gitlab.cells.topology_service.ClassifyType"
-      optional :value, :string, 3
+      optional :type, :enum, 2, "gitlab.cells.topology_service.ClassifyType", json_name: "type"
+      optional :value, :string, 3, json_name: "value"
     end
     add_message "gitlab.cells.topology_service.ProxyInfo" do
-      optional :address, :string, 1
+      optional :address, :string, 1, json_name: "address"
     end
     add_message "gitlab.cells.topology_service.ClassifyResponse" do
-      optional :action, :enum, 1, "gitlab.cells.topology_service.ClassifyAction"
-      optional :proxy, :message, 2, "gitlab.cells.topology_service.ProxyInfo"
+      optional :action, :enum, 1, "gitlab.cells.topology_service.ClassifyAction", json_name: "action"
+      optional :proxy, :message, 2, "gitlab.cells.topology_service.ProxyInfo", json_name: "proxy"
     end
     add_enum "gitlab.cells.topology_service.ClassifyType" do
-      value :UnknownType, 0
-      value :FirstCell, 1
-      value :SessionPrefix, 2
+      value :UNSPECIFIED, 0
+      value :FIRST_CELL, 1
+      value :SESSION_PREFIX, 2
     end
     add_enum "gitlab.cells.topology_service.ClassifyAction" do
-      value :UnknownAction, 0
-      value :Proxy, 1
+      value :ACTION_UNSPECIFIED, 0
+      value :PROXY, 1
     end
   end
 end

vendor/gems/gitlab-topology-service-client/lib/proto/classify_service_services_pb.rb

@@ -11,14 +11,14 @@ module ClassifyService
         # Public read-only service used by various Routing Services
         class Service
-          include GRPC::GenericService
+          include ::GRPC::GenericService
           self.marshal_class_method = :encode
           self.unmarshal_class_method = :decode
           self.service_name = 'gitlab.cells.topology_service.ClassifyService'
-          rpc :GetCells, Gitlab::Cells::TopologyService::GetCellsRequest, Gitlab::Cells::TopologyService::GetCellsResponse
-          rpc :Classify, Gitlab::Cells::TopologyService::ClassifyRequest, Gitlab::Cells::TopologyService::ClassifyResponse
+          rpc :GetCells, ::Gitlab::Cells::TopologyService::GetCellsRequest, ::Gitlab::Cells::TopologyService::GetCellsResponse
+          rpc :Classify, ::Gitlab::Cells::TopologyService::ClassifyRequest, ::Gitlab::Cells::TopologyService::ClassifyResponse
         end
         Stub = Service.rpc_stub_class

vendor/gems/gitlab-topology-service-client/lib/proto/health_service_pb.rb

@@ -4,6 +4,7 @@
 require 'google/protobuf'
 require 'google/api/annotations_pb'
+
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("proto/health_service.proto", :syntax => :proto3) do
     add_message "gitlab.cells.topology_service.ReadinessProbeRequest" do

vendor/gems/gitlab-topology-service-client/lib/proto/health_service_services_pb.rb

@@ -11,16 +11,16 @@ module HealthService
         # Public read-only service
         class Service
-          include GRPC::GenericService
+          include ::GRPC::GenericService
           self.marshal_class_method = :encode
           self.unmarshal_class_method = :decode
           self.service_name = 'gitlab.cells.topology_service.HealthService'
           # (Lightweight) Used for checking if application is ready to accept requests
-          rpc :ReadinessProbe, Gitlab::Cells::TopologyService::ReadinessProbeRequest, Gitlab::Cells::TopologyService::ReadinessProbeResponse
+          rpc :ReadinessProbe, ::Gitlab::Cells::TopologyService::ReadinessProbeRequest, ::Gitlab::Cells::TopologyService::ReadinessProbeResponse
           # (Lightweight) Used for checking if application is alive, or whether it should be restarted
-          rpc :LivenessProbe, Gitlab::Cells::TopologyService::LivenessProbeRequest, Gitlab::Cells::TopologyService::LivenessProbeResponse
+          rpc :LivenessProbe, ::Gitlab::Cells::TopologyService::LivenessProbeRequest, ::Gitlab::Cells::TopologyService::LivenessProbeResponse
         end
         Stub = Service.rpc_stub_class

vendor/gems/gitlab-topology-service-client/lib/proto/sequence_service_pb.rb

-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: proto/sequence_service.proto
-
-require 'google/protobuf'
-
-require 'proto/cell_info_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("proto/sequence_service.proto", :syntax => :proto3) do
-  end
-end
-
-module Gitlab
-  module Cells
-    module TopologyService
-    end
-  end
-end

vendor/gems/gitlab-topology-service-client/lib/proto/sequence_service_services_pb.rb

-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# Source: proto/sequence_service.proto for package 'Gitlab.Cells.TopologyService'
-
-require 'grpc'
-require 'proto/sequence_service_pb'
-
-module Gitlab
-  module Cells
-    module TopologyService
-      module SequenceService
-        # Restricted read-write service to provide cluster-wide primary key uniqueness
-        class Service
-
-          include GRPC::GenericService
-
-          self.marshal_class_method = :encode
-          self.unmarshal_class_method = :decode
-          self.service_name = 'gitlab.cells.topology_service.SequenceService'
-
-          rpc :GetCells, Gitlab::Cells::TopologyService::GetCellsRequest, Gitlab::Cells::TopologyService::GetCellsResponse
-        end
-
-        Stub = Service.rpc_stub_class
-      end
-    end
-  end
-end