From 944596771c293db7152a1c633fd20fe1393cacea Mon Sep 17 00:00:00 2001 From: Tim Emiola Date: Wed, 14 Jan 2015 10:14:56 -0800 Subject: [PATCH 1/5] Adds the service client code generated from the pubsub proto --- src/ruby/bin/google/pubsub/v2/pubsub.rb | 144 ++++++++++++++++++ .../bin/google/pubsub/v2/pubsub_services.rb | 73 +++++++++ 2 files changed, 217 insertions(+) create mode 100644 src/ruby/bin/google/pubsub/v2/pubsub.rb create mode 100644 src/ruby/bin/google/pubsub/v2/pubsub_services.rb diff --git a/src/ruby/bin/google/pubsub/v2/pubsub.rb b/src/ruby/bin/google/pubsub/v2/pubsub.rb new file mode 100644 index 00000000000..28b7143b662 --- /dev/null +++ b/src/ruby/bin/google/pubsub/v2/pubsub.rb @@ -0,0 +1,144 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: google/pubsub/v2/pubsub.proto + +require 'google/protobuf' + +require 'google/protobuf/empty' +Google::Protobuf::DescriptorPool.generated_pool.build do + add_message "google.pubsub.v2.Topic" do + optional :name, :string, 1 + optional :garbage_collect_seconds, :int64, 2 + end + add_message "google.pubsub.v2.PubsubMessage" do + optional :data, :string, 1 + repeated :labels, :message, 2, "google.pubsub.v2.PubsubMessage.LabelsEntry" + optional :message_id, :string, 3 + optional :data_truncated, :bool, 4 + end + add_message "google.pubsub.v2.PubsubMessage.LabelsEntry" do + optional :key, :string, 1 + optional :value, :string, 2 + end + add_message "google.pubsub.v2.GetTopicRequest" do + optional :topic, :string, 1 + end + add_message "google.pubsub.v2.PublishRequest" do + optional :topic, :string, 1 + repeated :messages, :message, 2, "google.pubsub.v2.PubsubMessage" + end + add_message "google.pubsub.v2.PublishResponse" do + repeated :message_ids, :string, 1 + end + add_message "google.pubsub.v2.ListTopicsRequest" do + optional :query, :string, 1 + optional :max_results, :int32, 2 + optional :page_token, :string, 3 + end + add_message "google.pubsub.v2.ListTopicsResponse" do + repeated :topics, :message, 1, "google.pubsub.v2.Topic" + optional :next_page_token, :string, 2 + end + add_message "google.pubsub.v2.DeleteTopicRequest" do + optional :topic, :string, 1 + end + add_message "google.pubsub.v2.Subscription" do + optional :name, :string, 1 + optional :topic, :string, 2 + optional :query, :string, 3 + optional :truncation_policy, :message, 4, "google.pubsub.v2.Subscription.TruncationPolicy" + optional :push_config, :message, 5, "google.pubsub.v2.PushConfig" + optional :ack_deadline_seconds, :int32, 6 + optional :garbage_collect_seconds, :int64, 7 + end + add_message "google.pubsub.v2.Subscription.TruncationPolicy" do + optional :max_bytes, :int64, 1 + optional :max_age_seconds, :int64, 2 + end + add_message "google.pubsub.v2.PushConfig" do + optional :push_endpoint, :string, 1 + end + add_message "google.pubsub.v2.PubsubEvent" do + optional :subscription, :string, 1 + optional :ack_id, :string, 5 + optional :message, :message, 2, "google.pubsub.v2.PubsubMessage" + optional :truncated, :bool, 3 + optional :end_of_stream, :bool, 4 + end + add_message "google.pubsub.v2.GetSubscriptionRequest" do + optional :subscription, :string, 1 + end + add_message "google.pubsub.v2.ListSubscriptionsRequest" do + optional :query, :string, 1 + optional :max_results, :int32, 3 + optional :page_token, :string, 4 + end + add_message "google.pubsub.v2.ListSubscriptionsResponse" do + repeated :subscriptions, :message, 1, "google.pubsub.v2.Subscription" + optional :next_page_token, :string, 2 + end + add_message "google.pubsub.v2.TruncateSubscriptionRequest" do + optional :subscription, :string, 1 + end + add_message "google.pubsub.v2.DetachSubscriptionRequest" do + optional :subscription, :string, 1 + end + add_message "google.pubsub.v2.DeleteSubscriptionRequest" do + optional :subscription, :string, 1 + end + add_message "google.pubsub.v2.ModifyPushConfigRequest" do + optional :subscription, :string, 1 + optional :push_config, :message, 2, "google.pubsub.v2.PushConfig" + end + add_message "google.pubsub.v2.PullRequest" do + optional :subscription, :string, 1 + optional :return_immediately, :bool, 2 + optional :max_events, :int32, 3 + end + add_message "google.pubsub.v2.PullResponse" do + repeated :pubsub_events, :message, 1, "google.pubsub.v2.PubsubEvent" + end + add_message "google.pubsub.v2.ModifyAckDeadlineRequest" do + optional :subscription, :string, 1 + optional :ack_id, :string, 2 + optional :ack_deadline_seconds, :int32, 3 + end + add_message "google.pubsub.v2.AcknowledgeRequest" do + optional :subscription, :string, 1 + repeated :ack_ids, :string, 2 + end + add_message "google.pubsub.v2.HandlePubsubEventResponse" do + optional :acknowledge_explicitly, :bool, 1 + end +end + +module Google + module Pubsub + module V2 + Topic = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.Topic").msgclass + PubsubMessage = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PubsubMessage").msgclass + PubsubMessage::LabelsEntry = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PubsubMessage.LabelsEntry").msgclass + GetTopicRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.GetTopicRequest").msgclass + PublishRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PublishRequest").msgclass + PublishResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PublishResponse").msgclass + ListTopicsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ListTopicsRequest").msgclass + ListTopicsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ListTopicsResponse").msgclass + DeleteTopicRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.DeleteTopicRequest").msgclass + Subscription = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.Subscription").msgclass + Subscription::TruncationPolicy = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.Subscription.TruncationPolicy").msgclass + PushConfig = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PushConfig").msgclass + PubsubEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PubsubEvent").msgclass + GetSubscriptionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.GetSubscriptionRequest").msgclass + ListSubscriptionsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ListSubscriptionsRequest").msgclass + ListSubscriptionsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ListSubscriptionsResponse").msgclass + TruncateSubscriptionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.TruncateSubscriptionRequest").msgclass + DetachSubscriptionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.DetachSubscriptionRequest").msgclass + DeleteSubscriptionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.DeleteSubscriptionRequest").msgclass + ModifyPushConfigRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ModifyPushConfigRequest").msgclass + PullRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PullRequest").msgclass + PullResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PullResponse").msgclass + ModifyAckDeadlineRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ModifyAckDeadlineRequest").msgclass + AcknowledgeRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.AcknowledgeRequest").msgclass + HandlePubsubEventResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.HandlePubsubEventResponse").msgclass + end + end +end diff --git a/src/ruby/bin/google/pubsub/v2/pubsub_services.rb b/src/ruby/bin/google/pubsub/v2/pubsub_services.rb new file mode 100644 index 00000000000..475332a04b2 --- /dev/null +++ b/src/ruby/bin/google/pubsub/v2/pubsub_services.rb @@ -0,0 +1,73 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# Source: google/pubsub/v2/pubsub.proto for package 'google.pubsub.v2' + +require 'grpc' +require 'google/pubsub/v2/pubsub' + +module Google + module Pubsub + module V2 + module PublisherService + + # TODO: add proto service documentation here + class Service + + include GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'google.pubsub.v2.PublisherService' + + rpc :CreateTopic, Topic, Topic + rpc :Publish, PublishRequest, PublishResponse + rpc :GetTopic, GetTopicRequest, Topic + rpc :ListTopics, ListTopicsRequest, ListTopicsResponse + rpc :DeleteTopic, DeleteTopicRequest, Empty + end + + Stub = Service.rpc_stub_class + end + module SubscriberService + + # TODO: add proto service documentation here + class Service + + include GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'google.pubsub.v2.SubscriberService' + + rpc :CreateSubscription, Subscription, Subscription + rpc :GetSubscription, GetSubscriptionRequest, Subscription + rpc :ListSubscriptions, ListSubscriptionsRequest, ListSubscriptionsResponse + rpc :DeleteSubscription, DeleteSubscriptionRequest, Empty + rpc :TruncateSubscription, TruncateSubscriptionRequest, Empty + rpc :DetachSubscription, DetachSubscriptionRequest, Empty + rpc :ModifyAckDeadline, ModifyAckDeadlineRequest, Empty + rpc :Acknowledge, AcknowledgeRequest, Empty + rpc :Pull, PullRequest, PullResponse + rpc :ModifyPushConfig, ModifyPushConfigRequest, Empty + end + + Stub = Service.rpc_stub_class + end + module PushEndpointService + + # TODO: add proto service documentation here + class Service + + include GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'google.pubsub.v2.PushEndpointService' + + rpc :HandlePubsubEvent, PubsubEvent, HandlePubsubEventResponse + end + + Stub = Service.rpc_stub_class + end + end + end +end From 7ae39506756d2865173bb074d9e8c7a9b00a4f54 Mon Sep 17 00:00:00 2001 From: Tim Emiola Date: Wed, 14 Jan 2015 13:38:44 -0800 Subject: [PATCH 2/5] Fix the transport name used to start the grpc java docker server --- tools/dockerfile/grpc_java/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dockerfile/grpc_java/Dockerfile b/tools/dockerfile/grpc_java/Dockerfile index f7156c7f382..78659dedeb2 100644 --- a/tools/dockerfile/grpc_java/Dockerfile +++ b/tools/dockerfile/grpc_java/Dockerfile @@ -13,4 +13,4 @@ RUN cd /var/local/git/grpc-java && \ mvn install # Specify the default command such that the interop server runs on its known testing port -CMD ["/var/local/git/grpc-java/run-test-server.sh", "--transport=NETTY_TLS", "--grpc_version=2", "--port=8030"] +CMD ["/var/local/git/grpc-java/run-test-server.sh", "--transport=HTTP2_NETTY_TLS", "--grpc_version=2", "--port=8030"] From baa26f845ee4c47c794b4dcc001025a267d2ffb1 Mon Sep 17 00:00:00 2001 From: Tim Emiola Date: Wed, 14 Jan 2015 15:39:07 -0800 Subject: [PATCH 3/5] Updates the JDK to JDK8 - necessary to allow seamless interop testing, as discussed earlier this week. --- tools/dockerfile/grpc_java_base/Dockerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile index fe8edeb6980..44fa52c0e8b 100644 --- a/tools/dockerfile/grpc_java_base/Dockerfile +++ b/tools/dockerfile/grpc_java_base/Dockerfile @@ -1,13 +1,21 @@ # Base Dockerfile for the gRPC Java dev image FROM grpc/base -RUN apt-get update && apt-get -y install java7-jdk +# Install JDK 8 +# +# TODO(temiola): simplify this if/when a simpler process is available. +# +RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections +RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list +RUN echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 +RUN apt-get update && apt-get -y install oracle-java8-installer # Install maven RUN wget http://mirror.olnevhost.net/pub/apache/maven/binaries/apache-maven-3.2.1-bin.tar.gz && \ tar xvf apache-maven-3.2.1-bin.tar.gz -C /var/local -ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle ENV M2_HOME /var/local/apache-maven-3.2.1 ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin ENV LD_LIBRARY_PATH /usr/local/lib From 2aa4d6494735a4292df99241d7b768a62f94f03f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 14 Jan 2015 15:59:44 -0800 Subject: [PATCH 4/5] Helgrind support for run_tests.py Also allow maxjobs to be tweaked based upon which configs are being run, to prevent memory starvation. --- tools/run_tests/run_tests.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 428f6c41b4b..04be27bab04 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -15,6 +15,7 @@ import watch_dirs class SimpleConfig(object): def __init__(self, config): self.build_config = config + self.maxjobs = 32 * multiprocessing.cpu_count() def run_command(self, binary): return [binary] @@ -22,11 +23,13 @@ class SimpleConfig(object): # ValgrindConfig: compile with some CONFIG=config, but use valgrind to run class ValgrindConfig(object): - def __init__(self, config): + def __init__(self, config, tool): self.build_config = config + self.tool = tool + self.maxjobs = 4 * multiprocessing.cpu_count() def run_command(self, binary): - return ['valgrind', binary] + return ['valgrind', binary, '--tool=%s' % self.tool] # different configurations we can run under @@ -37,7 +40,8 @@ _CONFIGS = { 'msan': SimpleConfig('msan'), 'asan': SimpleConfig('asan'), 'gcov': SimpleConfig('gcov'), - 'valgrind': ValgrindConfig('dbg'), + 'memcheck': ValgrindConfig('dbg', 'memcheck'), + 'helgrind': ValgrindConfig('dbg', 'helgrind') } @@ -81,14 +85,18 @@ def _build_and_run(check_cancelled): return 1 # run all the tests - if not jobset.run(( - config.run_command(x) - for config in run_configs - for filt in filters - for x in itertools.chain.from_iterable(itertools.repeat( - glob.glob('bins/%s/%s_test' % ( - config.build_config, filt)), - runs_per_test))), check_cancelled): + if not jobset.run( + itertools.ifilter( + lambda x: x is not None, ( + config.run_command(x) + for config in run_configs + for filt in filters + for x in itertools.chain.from_iterable(itertools.repeat( + glob.glob('bins/%s/%s_test' % ( + config.build_config, filt)), + runs_per_test)))), + check_cancelled, + maxjobs=min(c.maxjobs for c in run_configs)): return 2 return 0 From b891807429ba10ad9c4d7441757fac04fc9a68df Mon Sep 17 00:00:00 2001 From: Tim Emiola Date: Wed, 14 Jan 2015 16:59:34 -0800 Subject: [PATCH 5/5] rolled back generated proto changes --- src/ruby/bin/google/pubsub/v2/pubsub.rb | 144 ------------------ .../bin/google/pubsub/v2/pubsub_services.rb | 73 --------- 2 files changed, 217 deletions(-) delete mode 100644 src/ruby/bin/google/pubsub/v2/pubsub.rb delete mode 100644 src/ruby/bin/google/pubsub/v2/pubsub_services.rb diff --git a/src/ruby/bin/google/pubsub/v2/pubsub.rb b/src/ruby/bin/google/pubsub/v2/pubsub.rb deleted file mode 100644 index 28b7143b662..00000000000 --- a/src/ruby/bin/google/pubsub/v2/pubsub.rb +++ /dev/null @@ -1,144 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: google/pubsub/v2/pubsub.proto - -require 'google/protobuf' - -require 'google/protobuf/empty' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "google.pubsub.v2.Topic" do - optional :name, :string, 1 - optional :garbage_collect_seconds, :int64, 2 - end - add_message "google.pubsub.v2.PubsubMessage" do - optional :data, :string, 1 - repeated :labels, :message, 2, "google.pubsub.v2.PubsubMessage.LabelsEntry" - optional :message_id, :string, 3 - optional :data_truncated, :bool, 4 - end - add_message "google.pubsub.v2.PubsubMessage.LabelsEntry" do - optional :key, :string, 1 - optional :value, :string, 2 - end - add_message "google.pubsub.v2.GetTopicRequest" do - optional :topic, :string, 1 - end - add_message "google.pubsub.v2.PublishRequest" do - optional :topic, :string, 1 - repeated :messages, :message, 2, "google.pubsub.v2.PubsubMessage" - end - add_message "google.pubsub.v2.PublishResponse" do - repeated :message_ids, :string, 1 - end - add_message "google.pubsub.v2.ListTopicsRequest" do - optional :query, :string, 1 - optional :max_results, :int32, 2 - optional :page_token, :string, 3 - end - add_message "google.pubsub.v2.ListTopicsResponse" do - repeated :topics, :message, 1, "google.pubsub.v2.Topic" - optional :next_page_token, :string, 2 - end - add_message "google.pubsub.v2.DeleteTopicRequest" do - optional :topic, :string, 1 - end - add_message "google.pubsub.v2.Subscription" do - optional :name, :string, 1 - optional :topic, :string, 2 - optional :query, :string, 3 - optional :truncation_policy, :message, 4, "google.pubsub.v2.Subscription.TruncationPolicy" - optional :push_config, :message, 5, "google.pubsub.v2.PushConfig" - optional :ack_deadline_seconds, :int32, 6 - optional :garbage_collect_seconds, :int64, 7 - end - add_message "google.pubsub.v2.Subscription.TruncationPolicy" do - optional :max_bytes, :int64, 1 - optional :max_age_seconds, :int64, 2 - end - add_message "google.pubsub.v2.PushConfig" do - optional :push_endpoint, :string, 1 - end - add_message "google.pubsub.v2.PubsubEvent" do - optional :subscription, :string, 1 - optional :ack_id, :string, 5 - optional :message, :message, 2, "google.pubsub.v2.PubsubMessage" - optional :truncated, :bool, 3 - optional :end_of_stream, :bool, 4 - end - add_message "google.pubsub.v2.GetSubscriptionRequest" do - optional :subscription, :string, 1 - end - add_message "google.pubsub.v2.ListSubscriptionsRequest" do - optional :query, :string, 1 - optional :max_results, :int32, 3 - optional :page_token, :string, 4 - end - add_message "google.pubsub.v2.ListSubscriptionsResponse" do - repeated :subscriptions, :message, 1, "google.pubsub.v2.Subscription" - optional :next_page_token, :string, 2 - end - add_message "google.pubsub.v2.TruncateSubscriptionRequest" do - optional :subscription, :string, 1 - end - add_message "google.pubsub.v2.DetachSubscriptionRequest" do - optional :subscription, :string, 1 - end - add_message "google.pubsub.v2.DeleteSubscriptionRequest" do - optional :subscription, :string, 1 - end - add_message "google.pubsub.v2.ModifyPushConfigRequest" do - optional :subscription, :string, 1 - optional :push_config, :message, 2, "google.pubsub.v2.PushConfig" - end - add_message "google.pubsub.v2.PullRequest" do - optional :subscription, :string, 1 - optional :return_immediately, :bool, 2 - optional :max_events, :int32, 3 - end - add_message "google.pubsub.v2.PullResponse" do - repeated :pubsub_events, :message, 1, "google.pubsub.v2.PubsubEvent" - end - add_message "google.pubsub.v2.ModifyAckDeadlineRequest" do - optional :subscription, :string, 1 - optional :ack_id, :string, 2 - optional :ack_deadline_seconds, :int32, 3 - end - add_message "google.pubsub.v2.AcknowledgeRequest" do - optional :subscription, :string, 1 - repeated :ack_ids, :string, 2 - end - add_message "google.pubsub.v2.HandlePubsubEventResponse" do - optional :acknowledge_explicitly, :bool, 1 - end -end - -module Google - module Pubsub - module V2 - Topic = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.Topic").msgclass - PubsubMessage = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PubsubMessage").msgclass - PubsubMessage::LabelsEntry = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PubsubMessage.LabelsEntry").msgclass - GetTopicRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.GetTopicRequest").msgclass - PublishRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PublishRequest").msgclass - PublishResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PublishResponse").msgclass - ListTopicsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ListTopicsRequest").msgclass - ListTopicsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ListTopicsResponse").msgclass - DeleteTopicRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.DeleteTopicRequest").msgclass - Subscription = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.Subscription").msgclass - Subscription::TruncationPolicy = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.Subscription.TruncationPolicy").msgclass - PushConfig = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PushConfig").msgclass - PubsubEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PubsubEvent").msgclass - GetSubscriptionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.GetSubscriptionRequest").msgclass - ListSubscriptionsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ListSubscriptionsRequest").msgclass - ListSubscriptionsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ListSubscriptionsResponse").msgclass - TruncateSubscriptionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.TruncateSubscriptionRequest").msgclass - DetachSubscriptionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.DetachSubscriptionRequest").msgclass - DeleteSubscriptionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.DeleteSubscriptionRequest").msgclass - ModifyPushConfigRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ModifyPushConfigRequest").msgclass - PullRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PullRequest").msgclass - PullResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.PullResponse").msgclass - ModifyAckDeadlineRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.ModifyAckDeadlineRequest").msgclass - AcknowledgeRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.AcknowledgeRequest").msgclass - HandlePubsubEventResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.pubsub.v2.HandlePubsubEventResponse").msgclass - end - end -end diff --git a/src/ruby/bin/google/pubsub/v2/pubsub_services.rb b/src/ruby/bin/google/pubsub/v2/pubsub_services.rb deleted file mode 100644 index 475332a04b2..00000000000 --- a/src/ruby/bin/google/pubsub/v2/pubsub_services.rb +++ /dev/null @@ -1,73 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# Source: google/pubsub/v2/pubsub.proto for package 'google.pubsub.v2' - -require 'grpc' -require 'google/pubsub/v2/pubsub' - -module Google - module Pubsub - module V2 - module PublisherService - - # TODO: add proto service documentation here - class Service - - include GRPC::GenericService - - self.marshal_class_method = :encode - self.unmarshal_class_method = :decode - self.service_name = 'google.pubsub.v2.PublisherService' - - rpc :CreateTopic, Topic, Topic - rpc :Publish, PublishRequest, PublishResponse - rpc :GetTopic, GetTopicRequest, Topic - rpc :ListTopics, ListTopicsRequest, ListTopicsResponse - rpc :DeleteTopic, DeleteTopicRequest, Empty - end - - Stub = Service.rpc_stub_class - end - module SubscriberService - - # TODO: add proto service documentation here - class Service - - include GRPC::GenericService - - self.marshal_class_method = :encode - self.unmarshal_class_method = :decode - self.service_name = 'google.pubsub.v2.SubscriberService' - - rpc :CreateSubscription, Subscription, Subscription - rpc :GetSubscription, GetSubscriptionRequest, Subscription - rpc :ListSubscriptions, ListSubscriptionsRequest, ListSubscriptionsResponse - rpc :DeleteSubscription, DeleteSubscriptionRequest, Empty - rpc :TruncateSubscription, TruncateSubscriptionRequest, Empty - rpc :DetachSubscription, DetachSubscriptionRequest, Empty - rpc :ModifyAckDeadline, ModifyAckDeadlineRequest, Empty - rpc :Acknowledge, AcknowledgeRequest, Empty - rpc :Pull, PullRequest, PullResponse - rpc :ModifyPushConfig, ModifyPushConfigRequest, Empty - end - - Stub = Service.rpc_stub_class - end - module PushEndpointService - - # TODO: add proto service documentation here - class Service - - include GRPC::GenericService - - self.marshal_class_method = :encode - self.unmarshal_class_method = :decode - self.service_name = 'google.pubsub.v2.PushEndpointService' - - rpc :HandlePubsubEvent, PubsubEvent, HandlePubsubEventResponse - end - - Stub = Service.rpc_stub_class - end - end - end -end