From f71ffe380b632dfbe8e4e66456d8bac753b65818 Mon Sep 17 00:00:00 2001 From: Sven Krieger <37476281+svkrieger@users.noreply.github.com> Date: Thu, 15 May 2025 09:41:50 +0200 Subject: [PATCH 1/6] Upgrade protobuf --- Gemfile | 2 +- Gemfile.lock | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 0a72e534ce1..f6ca0cf83ec 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'concurrent-ruby' gem 'digest-xxhash' gem 'eventmachine', '~> 1.2.7' gem 'fluent-logger' -gem 'googleapis-common-protos', '>= 1.3.12' +gem 'googleapis-common-protos', '>= 1.8.0' gem 'hashdiff' gem 'honeycomb-beeline' gem 'httpclient' diff --git a/Gemfile.lock b/Gemfile.lock index b4f2c4d7a92..ba8a96eed7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -224,14 +224,20 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-protobuf (3.25.6) - google-protobuf (3.25.6-x86_64-darwin) - google-protobuf (3.25.6-x86_64-linux) - googleapis-common-protos (1.7.0) + google-protobuf (4.30.2) + bigdecimal + rake (>= 13) + google-protobuf (4.30.2-x86_64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.30.2-x86_64-linux) + bigdecimal + rake (>= 13) + googleapis-common-protos (1.8.0) google-protobuf (>= 3.18, < 5.a) - googleapis-common-protos-types (~> 1.7) + googleapis-common-protos-types (~> 1.20) grpc (~> 1.41) - googleapis-common-protos-types (1.19.0) + googleapis-common-protos-types (1.20.0) google-protobuf (>= 3.18, < 5.a) googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) @@ -239,13 +245,13 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - grpc (1.71.0) + grpc (1.72.0) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) - grpc (1.71.0-x86_64-darwin) + grpc (1.72.0-x86_64-darwin) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) - grpc (1.71.0-x86_64-linux) + grpc (1.72.0-x86_64-linux) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) hashdiff (1.1.2) @@ -632,7 +638,7 @@ DEPENDENCIES fog-google (~> 1.24.1) fog-local fog-openstack - googleapis-common-protos (>= 1.3.12) + googleapis-common-protos (>= 1.8.0) hashdiff honeycomb-beeline httpclient From 9bec0644bc54de395e9e0c46cea6f228f82f7296 Mon Sep 17 00:00:00 2001 From: Sven Krieger <37476281+svkrieger@users.noreply.github.com> Date: Thu, 15 May 2025 09:42:15 +0200 Subject: [PATCH 2/6] Regenerate bbs protobuf files --- lib/diego/bbs/models/actions_pb.rb | 107 +++------------ lib/diego/bbs/models/actual_lrp_pb.rb | 83 +++--------- .../bbs/models/actual_lrp_requests_pb.rb | 104 +++----------- lib/diego/bbs/models/cached_dependency_pb.rb | 19 +-- lib/diego/bbs/models/cells_pb.rb | 40 ++---- .../bbs/models/certificate_properties_pb.rb | 13 +- lib/diego/bbs/models/check_definition_pb.rb | 36 ++--- lib/diego/bbs/models/desired_lrp_pb.rb | 127 ++---------------- .../bbs/models/desired_lrp_requests_pb.rb | 65 +++------ lib/diego/bbs/models/domain_pb.rb | 26 ++-- .../bbs/models/environment_variables_pb.rb | 14 +- lib/diego/bbs/models/error_pb.rb | 43 ++---- lib/diego/bbs/models/evacuation_pb.rb | 58 ++------ lib/diego/bbs/models/events_pb.rb | 111 +++------------ lib/diego/bbs/models/file_pb.rb | 14 +- lib/diego/bbs/models/image_layer_pb.rb | 41 ++---- lib/diego/bbs/models/log_rate_limit_pb.rb | 13 +- lib/diego/bbs/models/metric_tags_pb.rb | 21 ++- lib/diego/bbs/models/modification_tag_pb.rb | 14 +- lib/diego/bbs/models/network_pb.rb | 13 +- lib/diego/bbs/models/ping_pb.rb | 13 +- lib/diego/bbs/models/security_group_pb.rb | 31 ++--- lib/diego/bbs/models/sidecar_pb.rb | 16 +-- lib/diego/bbs/models/task_pb.rb | 67 ++------- lib/diego/bbs/models/task_requests_pb.rb | 92 +++---------- lib/diego/bbs/models/volume_mount_pb.rb | 27 ++-- 26 files changed, 291 insertions(+), 917 deletions(-) diff --git a/lib/diego/bbs/models/actions_pb.rb b/lib/diego/bbs/models/actions_pb.rb index 80ab0d6eb48..d441708e98e 100644 --- a/lib/diego/bbs/models/actions_pb.rb +++ b/lib/diego/bbs/models/actions_pb.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: actions.proto @@ -5,99 +6,27 @@ require 'environment_variables_pb' require 'file_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.Action" do - optional :download_action, :message, 1, "diego.bbs.models.DownloadAction" - optional :upload_action, :message, 2, "diego.bbs.models.UploadAction" - optional :run_action, :message, 3, "diego.bbs.models.RunAction" - optional :timeout_action, :message, 4, "diego.bbs.models.TimeoutAction" - optional :emit_progress_action, :message, 5, "diego.bbs.models.EmitProgressAction" - optional :try_action, :message, 6, "diego.bbs.models.TryAction" - optional :parallel_action, :message, 7, "diego.bbs.models.ParallelAction" - optional :serial_action, :message, 8, "diego.bbs.models.SerialAction" - optional :codependent_action, :message, 9, "diego.bbs.models.CodependentAction" - end - add_message "diego.bbs.models.DownloadAction" do - optional :artifact, :string, 1 - optional :from, :string, 2 - optional :to, :string, 3 - optional :cache_key, :string, 4 - optional :log_source, :string, 5 - optional :user, :string, 6 - optional :checksum_algorithm, :string, 7 - optional :checksum_value, :string, 8 - end - add_message "diego.bbs.models.UploadAction" do - optional :artifact, :string, 1 - optional :from, :string, 2 - optional :to, :string, 3 - optional :log_source, :string, 4 - optional :user, :string, 5 - end - add_message "diego.bbs.models.RunAction" do - optional :path, :string, 1 - repeated :args, :string, 2 - optional :dir, :string, 3 - repeated :env, :message, 4, "diego.bbs.models.EnvironmentVariable" - optional :resource_limits, :message, 5, "diego.bbs.models.ResourceLimits" - optional :user, :string, 6 - optional :log_source, :string, 7 - optional :suppress_log_output, :bool, 8 - repeated :volume_mounted_files, :message, 9, "diego.bbs.models.File" - end - add_message "diego.bbs.models.TimeoutAction" do - optional :action, :message, 1, "diego.bbs.models.Action" - optional :deprecated_timeout_ns, :int64, 2 - optional :log_source, :string, 3 - optional :timeout_ms, :int64, 4 - end - add_message "diego.bbs.models.EmitProgressAction" do - optional :action, :message, 1, "diego.bbs.models.Action" - optional :start_message, :string, 2 - optional :success_message, :string, 3 - optional :failure_message_prefix, :string, 4 - optional :log_source, :string, 5 - end - add_message "diego.bbs.models.TryAction" do - optional :action, :message, 1, "diego.bbs.models.Action" - optional :log_source, :string, 2 - end - add_message "diego.bbs.models.ParallelAction" do - repeated :actions, :message, 1, "diego.bbs.models.Action" - optional :log_source, :string, 2 - end - add_message "diego.bbs.models.SerialAction" do - repeated :actions, :message, 1, "diego.bbs.models.Action" - optional :log_source, :string, 2 - end - add_message "diego.bbs.models.CodependentAction" do - repeated :actions, :message, 1, "diego.bbs.models.Action" - optional :log_source, :string, 2 - end - add_message "diego.bbs.models.ResourceLimits" do - oneof :optional_nofile do - optional :nofile, :uint64, 1 - end - oneof :optional_nproc do - optional :nproc, :uint64, 2 - end - end -end + + +descriptor_data = "\n\ractions.proto\x12\x10\x64iego.bbs.models\x1a\x1b\x65nvironment_variables.proto\x1a\nfile.proto\"\x8c\x04\n\x06\x41\x63tion\x12\x39\n\x0f\x64ownload_action\x18\x01 \x01(\x0b\x32 .diego.bbs.models.DownloadAction\x12\x35\n\rupload_action\x18\x02 \x01(\x0b\x32\x1e.diego.bbs.models.UploadAction\x12/\n\nrun_action\x18\x03 \x01(\x0b\x32\x1b.diego.bbs.models.RunAction\x12\x37\n\x0etimeout_action\x18\x04 \x01(\x0b\x32\x1f.diego.bbs.models.TimeoutAction\x12\x42\n\x14\x65mit_progress_action\x18\x05 \x01(\x0b\x32$.diego.bbs.models.EmitProgressAction\x12/\n\ntry_action\x18\x06 \x01(\x0b\x32\x1b.diego.bbs.models.TryAction\x12\x39\n\x0fparallel_action\x18\x07 \x01(\x0b\x32 .diego.bbs.models.ParallelAction\x12\x35\n\rserial_action\x18\x08 \x01(\x0b\x32\x1e.diego.bbs.models.SerialAction\x12?\n\x12\x63odependent_action\x18\t \x01(\x0b\x32#.diego.bbs.models.CodependentAction\"\xa5\x01\n\x0e\x44ownloadAction\x12\x10\n\x08\x61rtifact\x18\x01 \x01(\t\x12\x0c\n\x04\x66rom\x18\x02 \x01(\t\x12\n\n\x02to\x18\x03 \x01(\t\x12\x11\n\tcache_key\x18\x04 \x01(\t\x12\x12\n\nlog_source\x18\x05 \x01(\t\x12\x0c\n\x04user\x18\x06 \x01(\t\x12\x1a\n\x12\x63hecksum_algorithm\x18\x07 \x01(\t\x12\x16\n\x0e\x63hecksum_value\x18\x08 \x01(\t\"\\\n\x0cUploadAction\x12\x10\n\x08\x61rtifact\x18\x01 \x01(\t\x12\x0c\n\x04\x66rom\x18\x02 \x01(\t\x12\n\n\x02to\x18\x03 \x01(\t\x12\x12\n\nlog_source\x18\x04 \x01(\t\x12\x0c\n\x04user\x18\x05 \x01(\t\"\x98\x02\n\tRunAction\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x02 \x03(\t\x12\x0b\n\x03\x64ir\x18\x03 \x01(\t\x12\x32\n\x03\x65nv\x18\x04 \x03(\x0b\x32%.diego.bbs.models.EnvironmentVariable\x12\x39\n\x0fresource_limits\x18\x05 \x01(\x0b\x32 .diego.bbs.models.ResourceLimits\x12\x0c\n\x04user\x18\x06 \x01(\t\x12\x12\n\nlog_source\x18\x07 \x01(\t\x12\x1b\n\x13suppress_log_output\x18\x08 \x01(\x08\x12\x34\n\x14volume_mounted_files\x18\t \x03(\x0b\x32\x16.diego.bbs.models.File\"\x84\x01\n\rTimeoutAction\x12(\n\x06\x61\x63tion\x18\x01 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12!\n\x15\x64\x65precated_timeout_ns\x18\x02 \x01(\x03\x42\x02\x18\x01\x12\x12\n\nlog_source\x18\x03 \x01(\t\x12\x12\n\ntimeout_ms\x18\x04 \x01(\x03\"\xa2\x01\n\x12\x45mitProgressAction\x12(\n\x06\x61\x63tion\x18\x01 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12\x15\n\rstart_message\x18\x02 \x01(\t\x12\x17\n\x0fsuccess_message\x18\x03 \x01(\t\x12\x1e\n\x16\x66\x61ilure_message_prefix\x18\x04 \x01(\t\x12\x12\n\nlog_source\x18\x05 \x01(\t\"I\n\tTryAction\x12(\n\x06\x61\x63tion\x18\x01 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12\x12\n\nlog_source\x18\x02 \x01(\t\"O\n\x0eParallelAction\x12)\n\x07\x61\x63tions\x18\x01 \x03(\x0b\x32\x18.diego.bbs.models.Action\x12\x12\n\nlog_source\x18\x02 \x01(\t\"M\n\x0cSerialAction\x12)\n\x07\x61\x63tions\x18\x01 \x03(\x0b\x32\x18.diego.bbs.models.Action\x12\x12\n\nlog_source\x18\x02 \x01(\t\"R\n\x11\x43odependentAction\x12)\n\x07\x61\x63tions\x18\x01 \x03(\x0b\x32\x18.diego.bbs.models.Action\x12\x12\n\nlog_source\x18\x02 \x01(\t\"\\\n\x0eResourceLimits\x12\x10\n\x06nofile\x18\x01 \x01(\x04H\x00\x12\x13\n\x05nproc\x18\x02 \x01(\x04\x42\x02\x18\x01H\x01\x42\x11\n\x0foptional_nofileB\x10\n\x0eoptional_nprocb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - Action = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Action").msgclass - DownloadAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DownloadAction").msgclass - UploadAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.UploadAction").msgclass - RunAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RunAction").msgclass - TimeoutAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TimeoutAction").msgclass - EmitProgressAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EmitProgressAction").msgclass - TryAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TryAction").msgclass - ParallelAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ParallelAction").msgclass - SerialAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.SerialAction").msgclass - CodependentAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CodependentAction").msgclass - ResourceLimits = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ResourceLimits").msgclass + Action = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Action").msgclass + DownloadAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DownloadAction").msgclass + UploadAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.UploadAction").msgclass + RunAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RunAction").msgclass + TimeoutAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TimeoutAction").msgclass + EmitProgressAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EmitProgressAction").msgclass + TryAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TryAction").msgclass + ParallelAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ParallelAction").msgclass + SerialAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.SerialAction").msgclass + CodependentAction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CodependentAction").msgclass + ResourceLimits = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ResourceLimits").msgclass end end end diff --git a/lib/diego/bbs/models/actual_lrp_pb.rb b/lib/diego/bbs/models/actual_lrp_pb.rb index bbf2a52ba28..621a0089ff9 100644 --- a/lib/diego/bbs/models/actual_lrp_pb.rb +++ b/lib/diego/bbs/models/actual_lrp_pb.rb @@ -1,80 +1,29 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: actual_lrp.proto require 'google/protobuf' require 'modification_tag_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.ActualLRPGroup" do - optional :instance, :message, 1, "diego.bbs.models.ActualLRP" - optional :evacuating, :message, 2, "diego.bbs.models.ActualLRP" - end - add_message "diego.bbs.models.PortMapping" do - optional :container_port, :uint32, 1 - optional :host_port, :uint32, 2 - optional :container_tls_proxy_port, :uint32, 3 - optional :host_tls_proxy_port, :uint32, 4 - end - add_message "diego.bbs.models.ActualLRPKey" do - optional :process_guid, :string, 1 - optional :index, :int32, 2 - optional :domain, :string, 3 - end - add_message "diego.bbs.models.ActualLRPInstanceKey" do - optional :instance_guid, :string, 1 - optional :cell_id, :string, 2 - end - add_message "diego.bbs.models.ActualLRPNetInfo" do - optional :address, :string, 1 - repeated :ports, :message, 2, "diego.bbs.models.PortMapping" - optional :instance_address, :string, 3 - optional :preferred_address, :enum, 4, "diego.bbs.models.ActualLRPNetInfo.PreferredAddress" - end - add_enum "diego.bbs.models.ActualLRPNetInfo.PreferredAddress" do - value :UNKNOWN, 0 - value :INSTANCE, 1 - value :HOST, 2 - end - add_message "diego.bbs.models.ActualLRPInternalRoute" do - optional :hostname, :string, 1 - end - add_message "diego.bbs.models.ActualLRP" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - optional :actual_lrp_net_info, :message, 3, "diego.bbs.models.ActualLRPNetInfo" - optional :crash_count, :int32, 4 - optional :crash_reason, :string, 5 - optional :state, :string, 6 - optional :placement_error, :string, 7 - optional :since, :int64, 8 - optional :modification_tag, :message, 9, "diego.bbs.models.ModificationTag" - optional :presence, :enum, 10, "diego.bbs.models.ActualLRP.Presence" - repeated :actual_lrp_internal_routes, :message, 11, "diego.bbs.models.ActualLRPInternalRoute" - map :metric_tags, :string, :string, 12 - optional :availability_zone, :string, 14 - oneof :optional_routable do - optional :routable, :bool, 13 - end - end - add_enum "diego.bbs.models.ActualLRP.Presence" do - value :ORDINARY, 0 - value :EVACUATING, 1 - value :SUSPECT, 2 - end -end + + +descriptor_data = "\n\x10\x61\x63tual_lrp.proto\x12\x10\x64iego.bbs.models\x1a\x16modification_tag.proto\"t\n\x0e\x41\x63tualLRPGroup\x12-\n\x08instance\x18\x01 \x01(\x0b\x32\x1b.diego.bbs.models.ActualLRP\x12/\n\nevacuating\x18\x02 \x01(\x0b\x32\x1b.diego.bbs.models.ActualLRP:\x02\x18\x01\"w\n\x0bPortMapping\x12\x16\n\x0e\x63ontainer_port\x18\x01 \x01(\r\x12\x11\n\thost_port\x18\x02 \x01(\r\x12 \n\x18\x63ontainer_tls_proxy_port\x18\x03 \x01(\r\x12\x1b\n\x13host_tls_proxy_port\x18\x04 \x01(\r\"C\n\x0c\x41\x63tualLRPKey\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t\x12\r\n\x05index\x18\x02 \x01(\x05\x12\x0e\n\x06\x64omain\x18\x03 \x01(\t\">\n\x14\x41\x63tualLRPInstanceKey\x12\x15\n\rinstance_guid\x18\x01 \x01(\t\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\t\"\xf4\x01\n\x10\x41\x63tualLRPNetInfo\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12,\n\x05ports\x18\x02 \x03(\x0b\x32\x1d.diego.bbs.models.PortMapping\x12\x18\n\x10instance_address\x18\x03 \x01(\t\x12N\n\x11preferred_address\x18\x04 \x01(\x0e\x32\x33.diego.bbs.models.ActualLRPNetInfo.PreferredAddress\"7\n\x10PreferredAddress\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0c\n\x08INSTANCE\x10\x01\x12\x08\n\x04HOST\x10\x02\"*\n\x16\x41\x63tualLRPInternalRoute\x12\x10\n\x08hostname\x18\x01 \x01(\t\"\xe2\x05\n\tActualLRP\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\x12?\n\x13\x61\x63tual_lrp_net_info\x18\x03 \x01(\x0b\x32\".diego.bbs.models.ActualLRPNetInfo\x12\x13\n\x0b\x63rash_count\x18\x04 \x01(\x05\x12\x14\n\x0c\x63rash_reason\x18\x05 \x01(\t\x12\r\n\x05state\x18\x06 \x01(\t\x12\x17\n\x0fplacement_error\x18\x07 \x01(\t\x12\r\n\x05since\x18\x08 \x01(\x03\x12;\n\x10modification_tag\x18\t \x01(\x0b\x32!.diego.bbs.models.ModificationTag\x12\x36\n\x08presence\x18\n \x01(\x0e\x32$.diego.bbs.models.ActualLRP.Presence\x12L\n\x1a\x61\x63tual_lrp_internal_routes\x18\x0b \x03(\x0b\x32(.diego.bbs.models.ActualLRPInternalRoute\x12@\n\x0bmetric_tags\x18\x0c \x03(\x0b\x32+.diego.bbs.models.ActualLRP.MetricTagsEntry\x12\x12\n\x08routable\x18\r \x01(\x08H\x00\x12\x19\n\x11\x61vailability_zone\x18\x0e \x01(\t\x1a\x31\n\x0fMetricTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"5\n\x08Presence\x12\x0c\n\x08ORDINARY\x10\x00\x12\x0e\n\nEVACUATING\x10\x01\x12\x0b\n\x07SUSPECT\x10\x02\x42\x13\n\x11optional_routableb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - ActualLRPGroup = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroup").msgclass - PortMapping = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.PortMapping").msgclass - ActualLRPKey = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPKey").msgclass - ActualLRPInstanceKey = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInstanceKey").msgclass - ActualLRPNetInfo = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPNetInfo").msgclass - ActualLRPNetInfo::PreferredAddress = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPNetInfo.PreferredAddress").enummodule - ActualLRPInternalRoute = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInternalRoute").msgclass - ActualLRP = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRP").msgclass - ActualLRP::Presence = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRP.Presence").enummodule + ActualLRPGroup = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroup").msgclass + PortMapping = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.PortMapping").msgclass + ActualLRPKey = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPKey").msgclass + ActualLRPInstanceKey = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInstanceKey").msgclass + ActualLRPNetInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPNetInfo").msgclass + ActualLRPNetInfo::PreferredAddress = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPNetInfo.PreferredAddress").enummodule + ActualLRPInternalRoute = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInternalRoute").msgclass + ActualLRP = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRP").msgclass + ActualLRP::Presence = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRP.Presence").enummodule end end end diff --git a/lib/diego/bbs/models/actual_lrp_requests_pb.rb b/lib/diego/bbs/models/actual_lrp_requests_pb.rb index 0dea56c340e..aa1402962f3 100644 --- a/lib/diego/bbs/models/actual_lrp_requests_pb.rb +++ b/lib/diego/bbs/models/actual_lrp_requests_pb.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: actual_lrp_requests.proto @@ -5,93 +6,30 @@ require 'actual_lrp_pb' require 'error_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.ActualLRPLifecycleResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - end - add_message "diego.bbs.models.ActualLRPGroupsResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - repeated :actual_lrp_groups, :message, 2, "diego.bbs.models.ActualLRPGroup" - end - add_message "diego.bbs.models.ActualLRPGroupResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - optional :actual_lrp_group, :message, 2, "diego.bbs.models.ActualLRPGroup" - end - add_message "diego.bbs.models.ActualLRPGroupsRequest" do - optional :domain, :string, 1 - optional :cell_id, :string, 2 - end - add_message "diego.bbs.models.ActualLRPGroupsByProcessGuidRequest" do - optional :process_guid, :string, 1 - end - add_message "diego.bbs.models.ActualLRPGroupByProcessGuidAndIndexRequest" do - optional :process_guid, :string, 1 - optional :index, :int32, 2 - end - add_message "diego.bbs.models.ClaimActualLRPRequest" do - optional :process_guid, :string, 1 - optional :index, :int32, 2 - optional :actual_lrp_instance_key, :message, 3, "diego.bbs.models.ActualLRPInstanceKey" - end - add_message "diego.bbs.models.StartActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - optional :actual_lrp_net_info, :message, 3, "diego.bbs.models.ActualLRPNetInfo" - repeated :actual_lrp_internal_routes, :message, 4, "diego.bbs.models.ActualLRPInternalRoute" - map :metric_tags, :string, :string, 5 - optional :availability_zone, :string, 7 - oneof :optional_routable do - optional :Routable, :bool, 6 - end - end - add_message "diego.bbs.models.CrashActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - optional :error_message, :string, 3 - end - add_message "diego.bbs.models.FailActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :error_message, :string, 2 - end - add_message "diego.bbs.models.RetireActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - end - add_message "diego.bbs.models.RemoveActualLRPRequest" do - optional :process_guid, :string, 1 - optional :index, :int32, 2 - optional :actual_lrp_instance_key, :message, 3, "diego.bbs.models.ActualLRPInstanceKey" - end - add_message "diego.bbs.models.ActualLRPsResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - repeated :actual_lrps, :message, 2, "diego.bbs.models.ActualLRP" - end - add_message "diego.bbs.models.ActualLRPsRequest" do - optional :domain, :string, 1 - optional :cell_id, :string, 2 - optional :process_guid, :string, 3 - oneof :optional_index do - optional :index, :int32, 4 - end - end -end + + +descriptor_data = "\n\x19\x61\x63tual_lrp_requests.proto\x12\x10\x64iego.bbs.models\x1a\x10\x61\x63tual_lrp.proto\x1a\x0b\x65rror.proto\"D\n\x1a\x41\x63tualLRPLifecycleResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\"\x82\x01\n\x17\x41\x63tualLRPGroupsResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12;\n\x11\x61\x63tual_lrp_groups\x18\x02 \x03(\x0b\x32 .diego.bbs.models.ActualLRPGroup:\x02\x18\x01\"\x80\x01\n\x16\x41\x63tualLRPGroupResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12:\n\x10\x61\x63tual_lrp_group\x18\x02 \x01(\x0b\x32 .diego.bbs.models.ActualLRPGroup:\x02\x18\x01\"=\n\x16\x41\x63tualLRPGroupsRequest\x12\x0e\n\x06\x64omain\x18\x01 \x01(\t\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\t:\x02\x18\x01\"?\n#ActualLRPGroupsByProcessGuidRequest\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t:\x02\x18\x01\"U\n*ActualLRPGroupByProcessGuidAndIndexRequest\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t\x12\r\n\x05index\x18\x02 \x01(\x05:\x02\x18\x01\"\x85\x01\n\x15\x43laimActualLRPRequest\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t\x12\r\n\x05index\x18\x02 \x01(\x05\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x03 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\"\xec\x03\n\x15StartActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\x12?\n\x13\x61\x63tual_lrp_net_info\x18\x03 \x01(\x0b\x32\".diego.bbs.models.ActualLRPNetInfo\x12L\n\x1a\x61\x63tual_lrp_internal_routes\x18\x04 \x03(\x0b\x32(.diego.bbs.models.ActualLRPInternalRoute\x12L\n\x0bmetric_tags\x18\x05 \x03(\x0b\x32\x37.diego.bbs.models.StartActualLRPRequest.MetricTagsEntry\x12\x12\n\x08Routable\x18\x06 \x01(\x08H\x00\x12\x19\n\x11\x61vailability_zone\x18\x07 \x01(\t\x1a\x31\n\x0fMetricTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x13\n\x11optional_routable\"\xaf\x01\n\x15\x43rashActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\x12\x15\n\rerror_message\x18\x03 \x01(\t\"e\n\x14\x46\x61ilActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12\x15\n\rerror_message\x18\x02 \x01(\t\"P\n\x16RetireActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\"\x86\x01\n\x16RemoveActualLRPRequest\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t\x12\r\n\x05index\x18\x02 \x01(\x05\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x03 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\"n\n\x12\x41\x63tualLRPsResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12\x30\n\x0b\x61\x63tual_lrps\x18\x02 \x03(\x0b\x32\x1b.diego.bbs.models.ActualLRP\"m\n\x11\x41\x63tualLRPsRequest\x12\x0e\n\x06\x64omain\x18\x01 \x01(\t\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\t\x12\x14\n\x0cprocess_guid\x18\x03 \x01(\t\x12\x0f\n\x05index\x18\x04 \x01(\x05H\x00\x42\x10\n\x0eoptional_indexb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - ActualLRPLifecycleResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPLifecycleResponse").msgclass - ActualLRPGroupsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupsResponse").msgclass - ActualLRPGroupResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupResponse").msgclass - ActualLRPGroupsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupsRequest").msgclass - ActualLRPGroupsByProcessGuidRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupsByProcessGuidRequest").msgclass - ActualLRPGroupByProcessGuidAndIndexRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupByProcessGuidAndIndexRequest").msgclass - ClaimActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ClaimActualLRPRequest").msgclass - StartActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.StartActualLRPRequest").msgclass - CrashActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CrashActualLRPRequest").msgclass - FailActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.FailActualLRPRequest").msgclass - RetireActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RetireActualLRPRequest").msgclass - RemoveActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RemoveActualLRPRequest").msgclass - ActualLRPsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPsResponse").msgclass - ActualLRPsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPsRequest").msgclass + ActualLRPLifecycleResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPLifecycleResponse").msgclass + ActualLRPGroupsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupsResponse").msgclass + ActualLRPGroupResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupResponse").msgclass + ActualLRPGroupsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupsRequest").msgclass + ActualLRPGroupsByProcessGuidRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupsByProcessGuidRequest").msgclass + ActualLRPGroupByProcessGuidAndIndexRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPGroupByProcessGuidAndIndexRequest").msgclass + ClaimActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ClaimActualLRPRequest").msgclass + StartActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.StartActualLRPRequest").msgclass + CrashActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CrashActualLRPRequest").msgclass + FailActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.FailActualLRPRequest").msgclass + RetireActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RetireActualLRPRequest").msgclass + RemoveActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RemoveActualLRPRequest").msgclass + ActualLRPsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPsResponse").msgclass + ActualLRPsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPsRequest").msgclass end end end diff --git a/lib/diego/bbs/models/cached_dependency_pb.rb b/lib/diego/bbs/models/cached_dependency_pb.rb index 01886610375..43706889d39 100644 --- a/lib/diego/bbs/models/cached_dependency_pb.rb +++ b/lib/diego/bbs/models/cached_dependency_pb.rb @@ -1,24 +1,19 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: cached_dependency.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.CachedDependency" do - optional :name, :string, 1 - optional :from, :string, 2 - optional :to, :string, 3 - optional :cache_key, :string, 4 - optional :log_source, :string, 5 - optional :checksum_algorithm, :string, 6 - optional :checksum_value, :string, 7 - end -end + +descriptor_data = "\n\x17\x63\x61\x63hed_dependency.proto\x12\x10\x64iego.bbs.models\"\x95\x01\n\x10\x43\x61\x63hedDependency\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04\x66rom\x18\x02 \x01(\t\x12\n\n\x02to\x18\x03 \x01(\t\x12\x11\n\tcache_key\x18\x04 \x01(\t\x12\x12\n\nlog_source\x18\x05 \x01(\t\x12\x1a\n\x12\x63hecksum_algorithm\x18\x06 \x01(\t\x12\x16\n\x0e\x63hecksum_value\x18\x07 \x01(\tb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - CachedDependency = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CachedDependency").msgclass + CachedDependency = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CachedDependency").msgclass end end end diff --git a/lib/diego/bbs/models/cells_pb.rb b/lib/diego/bbs/models/cells_pb.rb index 39f44e99a8f..3f2ddaa223b 100644 --- a/lib/diego/bbs/models/cells_pb.rb +++ b/lib/diego/bbs/models/cells_pb.rb @@ -1,42 +1,24 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: cells.proto require 'google/protobuf' require 'error_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.CellCapacity" do - optional :memory_mb, :int32, 1 - optional :disk_mb, :int32, 2 - optional :containers, :int32, 3 - end - add_message "diego.bbs.models.CellPresence" do - optional :cell_id, :string, 1 - optional :rep_address, :string, 2 - optional :zone, :string, 3 - optional :capacity, :message, 4, "diego.bbs.models.CellCapacity" - repeated :rootfs_providers, :message, 5, "diego.bbs.models.Provider" - repeated :placement_tags, :string, 6 - repeated :optional_placement_tags, :string, 7 - optional :rep_url, :string, 8 - end - add_message "diego.bbs.models.Provider" do - optional :name, :string, 1 - repeated :properties, :string, 2 - end - add_message "diego.bbs.models.CellsResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - repeated :cells, :message, 2, "diego.bbs.models.CellPresence" - end -end + + +descriptor_data = "\n\x0b\x63\x65lls.proto\x12\x10\x64iego.bbs.models\x1a\x0b\x65rror.proto\"F\n\x0c\x43\x65llCapacity\x12\x11\n\tmemory_mb\x18\x01 \x01(\x05\x12\x0f\n\x07\x64isk_mb\x18\x02 \x01(\x05\x12\x12\n\ncontainers\x18\x03 \x01(\x05\"\xf4\x01\n\x0c\x43\x65llPresence\x12\x0f\n\x07\x63\x65ll_id\x18\x01 \x01(\t\x12\x13\n\x0brep_address\x18\x02 \x01(\t\x12\x0c\n\x04zone\x18\x03 \x01(\t\x12\x30\n\x08\x63\x61pacity\x18\x04 \x01(\x0b\x32\x1e.diego.bbs.models.CellCapacity\x12\x34\n\x10rootfs_providers\x18\x05 \x03(\x0b\x32\x1a.diego.bbs.models.Provider\x12\x16\n\x0eplacement_tags\x18\x06 \x03(\t\x12\x1f\n\x17optional_placement_tags\x18\x07 \x03(\t\x12\x0f\n\x07rep_url\x18\x08 \x01(\t\",\n\x08Provider\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x12\n\nproperties\x18\x02 \x03(\t\"f\n\rCellsResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12-\n\x05\x63\x65lls\x18\x02 \x03(\x0b\x32\x1e.diego.bbs.models.CellPresenceb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - CellCapacity = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CellCapacity").msgclass - CellPresence = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CellPresence").msgclass - Provider = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Provider").msgclass - CellsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CellsResponse").msgclass + CellCapacity = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CellCapacity").msgclass + CellPresence = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CellPresence").msgclass + Provider = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Provider").msgclass + CellsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CellsResponse").msgclass end end end diff --git a/lib/diego/bbs/models/certificate_properties_pb.rb b/lib/diego/bbs/models/certificate_properties_pb.rb index 5f6882dbfc3..003d022b902 100644 --- a/lib/diego/bbs/models/certificate_properties_pb.rb +++ b/lib/diego/bbs/models/certificate_properties_pb.rb @@ -1,18 +1,19 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: certificate_properties.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.CertificateProperties" do - repeated :organizational_unit, :string, 1 - end -end + +descriptor_data = "\n\x1c\x63\x65rtificate_properties.proto\x12\x10\x64iego.bbs.models\"4\n\x15\x43\x65rtificateProperties\x12\x1b\n\x13organizational_unit\x18\x01 \x03(\tb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - CertificateProperties = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CertificateProperties").msgclass + CertificateProperties = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CertificateProperties").msgclass end end end diff --git a/lib/diego/bbs/models/check_definition_pb.rb b/lib/diego/bbs/models/check_definition_pb.rb index db2aea466d0..7e741611b32 100644 --- a/lib/diego/bbs/models/check_definition_pb.rb +++ b/lib/diego/bbs/models/check_definition_pb.rb @@ -1,38 +1,22 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: check_definition.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.CheckDefinition" do - repeated :checks, :message, 1, "diego.bbs.models.Check" - optional :log_source, :string, 2 - repeated :readiness_checks, :message, 3, "diego.bbs.models.Check" - end - add_message "diego.bbs.models.Check" do - optional :tcp_check, :message, 1, "diego.bbs.models.TCPCheck" - optional :http_check, :message, 2, "diego.bbs.models.HTTPCheck" - end - add_message "diego.bbs.models.TCPCheck" do - optional :port, :uint32, 1 - optional :connect_timeout_ms, :uint64, 2 - optional :interval_ms, :uint64, 3 - end - add_message "diego.bbs.models.HTTPCheck" do - optional :port, :uint32, 1 - optional :request_timeout_ms, :uint64, 2 - optional :path, :string, 3 - optional :interval_ms, :uint64, 4 - end -end + +descriptor_data = "\n\x16\x63heck_definition.proto\x12\x10\x64iego.bbs.models\"\x81\x01\n\x0f\x43heckDefinition\x12\'\n\x06\x63hecks\x18\x01 \x03(\x0b\x32\x17.diego.bbs.models.Check\x12\x12\n\nlog_source\x18\x02 \x01(\t\x12\x31\n\x10readiness_checks\x18\x03 \x03(\x0b\x32\x17.diego.bbs.models.Check\"g\n\x05\x43heck\x12-\n\ttcp_check\x18\x01 \x01(\x0b\x32\x1a.diego.bbs.models.TCPCheck\x12/\n\nhttp_check\x18\x02 \x01(\x0b\x32\x1b.diego.bbs.models.HTTPCheck\"I\n\x08TCPCheck\x12\x0c\n\x04port\x18\x01 \x01(\r\x12\x1a\n\x12\x63onnect_timeout_ms\x18\x02 \x01(\x04\x12\x13\n\x0binterval_ms\x18\x03 \x01(\x04\"X\n\tHTTPCheck\x12\x0c\n\x04port\x18\x01 \x01(\r\x12\x1a\n\x12request_timeout_ms\x18\x02 \x01(\x04\x12\x0c\n\x04path\x18\x03 \x01(\t\x12\x13\n\x0binterval_ms\x18\x04 \x01(\x04\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - CheckDefinition = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CheckDefinition").msgclass - Check = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Check").msgclass - TCPCheck = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TCPCheck").msgclass - HTTPCheck = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.HTTPCheck").msgclass + CheckDefinition = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CheckDefinition").msgclass + Check = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Check").msgclass + TCPCheck = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TCPCheck").msgclass + HTTPCheck = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.HTTPCheck").msgclass end end end diff --git a/lib/diego/bbs/models/desired_lrp_pb.rb b/lib/diego/bbs/models/desired_lrp_pb.rb index 91b60107456..f8b84ad8eda 100644 --- a/lib/diego/bbs/models/desired_lrp_pb.rb +++ b/lib/diego/bbs/models/desired_lrp_pb.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: desired_lrp.proto @@ -17,123 +18,23 @@ require 'sidecar_pb' require 'log_rate_limit_pb' require 'file_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.DesiredLRPSchedulingInfo" do - optional :desired_lrp_key, :message, 1, "diego.bbs.models.DesiredLRPKey" - optional :annotation, :string, 2 - optional :instances, :int32, 3 - optional :desired_lrp_resource, :message, 4, "diego.bbs.models.DesiredLRPResource" - optional :routes, :message, 5, "diego.bbs.models.ProtoRoutes" - optional :modification_tag, :message, 6, "diego.bbs.models.ModificationTag" - optional :volume_placement, :message, 7, "diego.bbs.models.VolumePlacement" - repeated :PlacementTags, :string, 8 - end - add_message "diego.bbs.models.DesiredLRPRunInfo" do - optional :desired_lrp_key, :message, 1, "diego.bbs.models.DesiredLRPKey" - repeated :environment_variables, :message, 2, "diego.bbs.models.EnvironmentVariable" - optional :setup, :message, 3, "diego.bbs.models.Action" - optional :action, :message, 4, "diego.bbs.models.Action" - optional :monitor, :message, 5, "diego.bbs.models.Action" - optional :deprecated_start_timeout_s, :uint32, 6 - optional :privileged, :bool, 7 - optional :cpu_weight, :uint32, 8 - repeated :ports, :uint32, 9 - repeated :egress_rules, :message, 10, "diego.bbs.models.SecurityGroupRule" - optional :log_source, :string, 11 - optional :metrics_guid, :string, 12 - optional :created_at, :int64, 13 - repeated :cached_dependencies, :message, 14, "diego.bbs.models.CachedDependency" - optional :legacy_download_user, :string, 15 - optional :trusted_system_certificates_path, :string, 16 - repeated :volume_mounts, :message, 17, "diego.bbs.models.VolumeMount" - optional :network, :message, 18, "diego.bbs.models.Network" - optional :start_timeout_ms, :int64, 19 - optional :certificate_properties, :message, 20, "diego.bbs.models.CertificateProperties" - optional :image_username, :string, 21 - optional :image_password, :string, 22 - optional :check_definition, :message, 23, "diego.bbs.models.CheckDefinition" - repeated :image_layers, :message, 24, "diego.bbs.models.ImageLayer" - map :metric_tags, :string, :message, 25, "diego.bbs.models.MetricTagValue" - repeated :sidecars, :message, 26, "diego.bbs.models.Sidecar" - optional :log_rate_limit, :message, 27, "diego.bbs.models.LogRateLimit" - repeated :volume_mounted_files, :message, 28, "diego.bbs.models.File" - end - add_message "diego.bbs.models.ProtoRoutes" do - map :routes, :string, :bytes, 1 - end - add_message "diego.bbs.models.DesiredLRPUpdate" do - optional :routes, :message, 2, "diego.bbs.models.ProtoRoutes" - map :metric_tags, :string, :message, 4, "diego.bbs.models.MetricTagValue" - oneof :optional_instances do - optional :instances, :int32, 1 - end - oneof :optional_annotation do - optional :annotation, :string, 3 - end - end - add_message "diego.bbs.models.DesiredLRPKey" do - optional :process_guid, :string, 1 - optional :domain, :string, 2 - optional :log_guid, :string, 3 - end - add_message "diego.bbs.models.DesiredLRPResource" do - optional :memory_mb, :int32, 1 - optional :disk_mb, :int32, 2 - optional :root_fs, :string, 3 - optional :max_pids, :int32, 4 - end - add_message "diego.bbs.models.DesiredLRP" do - optional :process_guid, :string, 1 - optional :domain, :string, 2 - optional :root_fs, :string, 3 - optional :instances, :int32, 4 - repeated :environment_variables, :message, 5, "diego.bbs.models.EnvironmentVariable" - optional :setup, :message, 6, "diego.bbs.models.Action" - optional :action, :message, 7, "diego.bbs.models.Action" - optional :start_timeout_ms, :int64, 27 - optional :deprecated_start_timeout_s, :uint32, 8 - optional :monitor, :message, 9, "diego.bbs.models.Action" - optional :disk_mb, :int32, 10 - optional :memory_mb, :int32, 11 - optional :cpu_weight, :uint32, 12 - optional :privileged, :bool, 13 - repeated :ports, :uint32, 14 - optional :routes, :message, 15, "diego.bbs.models.ProtoRoutes" - optional :log_source, :string, 16 - optional :log_guid, :string, 17 - optional :metrics_guid, :string, 18 - optional :annotation, :string, 19 - repeated :egress_rules, :message, 20, "diego.bbs.models.SecurityGroupRule" - optional :modification_tag, :message, 21, "diego.bbs.models.ModificationTag" - repeated :cached_dependencies, :message, 22, "diego.bbs.models.CachedDependency" - optional :legacy_download_user, :string, 23 - optional :trusted_system_certificates_path, :string, 24 - repeated :volume_mounts, :message, 25, "diego.bbs.models.VolumeMount" - optional :network, :message, 26, "diego.bbs.models.Network" - repeated :PlacementTags, :string, 28 - optional :max_pids, :int32, 29 - optional :certificate_properties, :message, 30, "diego.bbs.models.CertificateProperties" - optional :image_username, :string, 31 - optional :image_password, :string, 32 - optional :check_definition, :message, 33, "diego.bbs.models.CheckDefinition" - repeated :image_layers, :message, 34, "diego.bbs.models.ImageLayer" - map :metric_tags, :string, :message, 35, "diego.bbs.models.MetricTagValue" - repeated :sidecars, :message, 36, "diego.bbs.models.Sidecar" - optional :log_rate_limit, :message, 37, "diego.bbs.models.LogRateLimit" - repeated :volume_mounted_files, :message, 38, "diego.bbs.models.File" - end -end + + +descriptor_data = "\n\x11\x64\x65sired_lrp.proto\x12\x10\x64iego.bbs.models\x1a\ractions.proto\x1a\x17\x63\x61\x63hed_dependency.proto\x1a\x1c\x63\x65rtificate_properties.proto\x1a\x1b\x65nvironment_variables.proto\x1a\x16modification_tag.proto\x1a\rnetwork.proto\x1a\x14security_group.proto\x1a\x12volume_mount.proto\x1a\x16\x63heck_definition.proto\x1a\x11image_layer.proto\x1a\x11metric_tags.proto\x1a\rsidecar.proto\x1a\x14log_rate_limit.proto\x1a\nfile.proto\"\xff\x02\n\x18\x44\x65siredLRPSchedulingInfo\x12\x38\n\x0f\x64\x65sired_lrp_key\x18\x01 \x01(\x0b\x32\x1f.diego.bbs.models.DesiredLRPKey\x12\x12\n\nannotation\x18\x02 \x01(\t\x12\x11\n\tinstances\x18\x03 \x01(\x05\x12\x42\n\x14\x64\x65sired_lrp_resource\x18\x04 \x01(\x0b\x32$.diego.bbs.models.DesiredLRPResource\x12-\n\x06routes\x18\x05 \x01(\x0b\x32\x1d.diego.bbs.models.ProtoRoutes\x12;\n\x10modification_tag\x18\x06 \x01(\x0b\x32!.diego.bbs.models.ModificationTag\x12;\n\x10volume_placement\x18\x07 \x01(\x0b\x32!.diego.bbs.models.VolumePlacement\x12\x15\n\rPlacementTags\x18\x08 \x03(\t\"\xa2\n\n\x11\x44\x65siredLRPRunInfo\x12\x38\n\x0f\x64\x65sired_lrp_key\x18\x01 \x01(\x0b\x32\x1f.diego.bbs.models.DesiredLRPKey\x12\x44\n\x15\x65nvironment_variables\x18\x02 \x03(\x0b\x32%.diego.bbs.models.EnvironmentVariable\x12\'\n\x05setup\x18\x03 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12(\n\x06\x61\x63tion\x18\x04 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12)\n\x07monitor\x18\x05 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12&\n\x1a\x64\x65precated_start_timeout_s\x18\x06 \x01(\rB\x02\x18\x01\x12\x12\n\nprivileged\x18\x07 \x01(\x08\x12\x12\n\ncpu_weight\x18\x08 \x01(\r\x12\x11\n\x05ports\x18\t \x03(\rB\x02\x10\x00\x12\x39\n\x0c\x65gress_rules\x18\n \x03(\x0b\x32#.diego.bbs.models.SecurityGroupRule\x12\x12\n\nlog_source\x18\x0b \x01(\t\x12\x18\n\x0cmetrics_guid\x18\x0c \x01(\tB\x02\x18\x01\x12\x12\n\ncreated_at\x18\r \x01(\x03\x12?\n\x13\x63\x61\x63hed_dependencies\x18\x0e \x03(\x0b\x32\".diego.bbs.models.CachedDependency\x12 \n\x14legacy_download_user\x18\x0f \x01(\tB\x02\x18\x01\x12(\n trusted_system_certificates_path\x18\x10 \x01(\t\x12\x34\n\rvolume_mounts\x18\x11 \x03(\x0b\x32\x1d.diego.bbs.models.VolumeMount\x12*\n\x07network\x18\x12 \x01(\x0b\x32\x19.diego.bbs.models.Network\x12\x18\n\x10start_timeout_ms\x18\x13 \x01(\x03\x12G\n\x16\x63\x65rtificate_properties\x18\x14 \x01(\x0b\x32\'.diego.bbs.models.CertificateProperties\x12\x16\n\x0eimage_username\x18\x15 \x01(\t\x12\x16\n\x0eimage_password\x18\x16 \x01(\t\x12;\n\x10\x63heck_definition\x18\x17 \x01(\x0b\x32!.diego.bbs.models.CheckDefinition\x12\x32\n\x0cimage_layers\x18\x18 \x03(\x0b\x32\x1c.diego.bbs.models.ImageLayer\x12L\n\x0bmetric_tags\x18\x19 \x03(\x0b\x32\x33.diego.bbs.models.DesiredLRPRunInfo.MetricTagsEntryB\x02\x18\x01\x12+\n\x08sidecars\x18\x1a \x03(\x0b\x32\x19.diego.bbs.models.Sidecar\x12\x36\n\x0elog_rate_limit\x18\x1b \x01(\x0b\x32\x1e.diego.bbs.models.LogRateLimit\x12\x34\n\x14volume_mounted_files\x18\x1c \x03(\x0b\x32\x16.diego.bbs.models.File\x1aS\n\x0fMetricTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .diego.bbs.models.MetricTagValue:\x02\x38\x01\"w\n\x0bProtoRoutes\x12\x39\n\x06routes\x18\x01 \x03(\x0b\x32).diego.bbs.models.ProtoRoutes.RoutesEntry\x1a-\n\x0bRoutesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"\xb7\x02\n\x10\x44\x65siredLRPUpdate\x12\x13\n\tinstances\x18\x01 \x01(\x05H\x00\x12-\n\x06routes\x18\x02 \x01(\x0b\x32\x1d.diego.bbs.models.ProtoRoutes\x12\x14\n\nannotation\x18\x03 \x01(\tH\x01\x12G\n\x0bmetric_tags\x18\x04 \x03(\x0b\x32\x32.diego.bbs.models.DesiredLRPUpdate.MetricTagsEntry\x1aS\n\x0fMetricTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .diego.bbs.models.MetricTagValue:\x02\x38\x01\x42\x14\n\x12optional_instancesB\x15\n\x13optional_annotation\"G\n\rDesiredLRPKey\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t\x12\x0e\n\x06\x64omain\x18\x02 \x01(\t\x12\x10\n\x08log_guid\x18\x03 \x01(\t\"[\n\x12\x44\x65siredLRPResource\x12\x11\n\tmemory_mb\x18\x01 \x01(\x05\x12\x0f\n\x07\x64isk_mb\x18\x02 \x01(\x05\x12\x0f\n\x07root_fs\x18\x03 \x01(\t\x12\x10\n\x08max_pids\x18\x04 \x01(\x05\"\xeb\x0b\n\nDesiredLRP\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t\x12\x0e\n\x06\x64omain\x18\x02 \x01(\t\x12\x0f\n\x07root_fs\x18\x03 \x01(\t\x12\x11\n\tinstances\x18\x04 \x01(\x05\x12\x44\n\x15\x65nvironment_variables\x18\x05 \x03(\x0b\x32%.diego.bbs.models.EnvironmentVariable\x12\'\n\x05setup\x18\x06 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12(\n\x06\x61\x63tion\x18\x07 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12\x18\n\x10start_timeout_ms\x18\x1b \x01(\x03\x12&\n\x1a\x64\x65precated_start_timeout_s\x18\x08 \x01(\rB\x02\x18\x01\x12)\n\x07monitor\x18\t \x01(\x0b\x32\x18.diego.bbs.models.Action\x12\x0f\n\x07\x64isk_mb\x18\n \x01(\x05\x12\x11\n\tmemory_mb\x18\x0b \x01(\x05\x12\x12\n\ncpu_weight\x18\x0c \x01(\r\x12\x12\n\nprivileged\x18\r \x01(\x08\x12\x11\n\x05ports\x18\x0e \x03(\rB\x02\x10\x00\x12-\n\x06routes\x18\x0f \x01(\x0b\x32\x1d.diego.bbs.models.ProtoRoutes\x12\x12\n\nlog_source\x18\x10 \x01(\t\x12\x10\n\x08log_guid\x18\x11 \x01(\t\x12\x18\n\x0cmetrics_guid\x18\x12 \x01(\tB\x02\x18\x01\x12\x12\n\nannotation\x18\x13 \x01(\t\x12\x39\n\x0c\x65gress_rules\x18\x14 \x03(\x0b\x32#.diego.bbs.models.SecurityGroupRule\x12;\n\x10modification_tag\x18\x15 \x01(\x0b\x32!.diego.bbs.models.ModificationTag\x12?\n\x13\x63\x61\x63hed_dependencies\x18\x16 \x03(\x0b\x32\".diego.bbs.models.CachedDependency\x12 \n\x14legacy_download_user\x18\x17 \x01(\tB\x02\x18\x01\x12(\n trusted_system_certificates_path\x18\x18 \x01(\t\x12\x34\n\rvolume_mounts\x18\x19 \x03(\x0b\x32\x1d.diego.bbs.models.VolumeMount\x12*\n\x07network\x18\x1a \x01(\x0b\x32\x19.diego.bbs.models.Network\x12\x15\n\rPlacementTags\x18\x1c \x03(\t\x12\x10\n\x08max_pids\x18\x1d \x01(\x05\x12G\n\x16\x63\x65rtificate_properties\x18\x1e \x01(\x0b\x32\'.diego.bbs.models.CertificateProperties\x12\x16\n\x0eimage_username\x18\x1f \x01(\t\x12\x16\n\x0eimage_password\x18 \x01(\t\x12;\n\x10\x63heck_definition\x18! \x01(\x0b\x32!.diego.bbs.models.CheckDefinition\x12\x32\n\x0cimage_layers\x18\" \x03(\x0b\x32\x1c.diego.bbs.models.ImageLayer\x12\x41\n\x0bmetric_tags\x18# \x03(\x0b\x32,.diego.bbs.models.DesiredLRP.MetricTagsEntry\x12+\n\x08sidecars\x18$ \x03(\x0b\x32\x19.diego.bbs.models.Sidecar\x12\x36\n\x0elog_rate_limit\x18% \x01(\x0b\x32\x1e.diego.bbs.models.LogRateLimit\x12\x34\n\x14volume_mounted_files\x18& \x03(\x0b\x32\x16.diego.bbs.models.File\x1aS\n\x0fMetricTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .diego.bbs.models.MetricTagValue:\x02\x38\x01\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - DesiredLRPSchedulingInfo = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPSchedulingInfo").msgclass - DesiredLRPRunInfo = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPRunInfo").msgclass - ProtoRoutes = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ProtoRoutes").msgclass - DesiredLRPUpdate = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPUpdate").msgclass - DesiredLRPKey = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPKey").msgclass - DesiredLRPResource = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPResource").msgclass - DesiredLRP = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRP").msgclass + DesiredLRPSchedulingInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPSchedulingInfo").msgclass + DesiredLRPRunInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPRunInfo").msgclass + ProtoRoutes = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ProtoRoutes").msgclass + DesiredLRPUpdate = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPUpdate").msgclass + DesiredLRPKey = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPKey").msgclass + DesiredLRPResource = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPResource").msgclass + DesiredLRP = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRP").msgclass end end end diff --git a/lib/diego/bbs/models/desired_lrp_requests_pb.rb b/lib/diego/bbs/models/desired_lrp_requests_pb.rb index 1d9aefb8bae..c1fc41a562d 100644 --- a/lib/diego/bbs/models/desired_lrp_requests_pb.rb +++ b/lib/diego/bbs/models/desired_lrp_requests_pb.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: desired_lrp_requests.proto @@ -5,58 +6,26 @@ require 'desired_lrp_pb' require 'error_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.DesiredLRPLifecycleResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - end - add_message "diego.bbs.models.DesiredLRPsResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - repeated :desired_lrps, :message, 2, "diego.bbs.models.DesiredLRP" - end - add_message "diego.bbs.models.DesiredLRPsRequest" do - optional :domain, :string, 1 - repeated :process_guids, :string, 2 - end - add_message "diego.bbs.models.DesiredLRPResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - optional :desired_lrp, :message, 2, "diego.bbs.models.DesiredLRP" - end - add_message "diego.bbs.models.DesiredLRPSchedulingInfosResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - repeated :desired_lrp_scheduling_infos, :message, 2, "diego.bbs.models.DesiredLRPSchedulingInfo" - end - add_message "diego.bbs.models.DesiredLRPSchedulingInfoByProcessGuidResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - optional :desired_lrp_scheduling_info, :message, 2, "diego.bbs.models.DesiredLRPSchedulingInfo" - end - add_message "diego.bbs.models.DesiredLRPByProcessGuidRequest" do - optional :process_guid, :string, 1 - end - add_message "diego.bbs.models.DesireLRPRequest" do - optional :desired_lrp, :message, 1, "diego.bbs.models.DesiredLRP" - end - add_message "diego.bbs.models.UpdateDesiredLRPRequest" do - optional :process_guid, :string, 1 - optional :update, :message, 2, "diego.bbs.models.DesiredLRPUpdate" - end - add_message "diego.bbs.models.RemoveDesiredLRPRequest" do - optional :process_guid, :string, 1 - end -end + + +descriptor_data = "\n\x1a\x64\x65sired_lrp_requests.proto\x12\x10\x64iego.bbs.models\x1a\x11\x64\x65sired_lrp.proto\x1a\x0b\x65rror.proto\"E\n\x1b\x44\x65siredLRPLifecycleResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\"q\n\x13\x44\x65siredLRPsResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12\x32\n\x0c\x64\x65sired_lrps\x18\x02 \x03(\x0b\x32\x1c.diego.bbs.models.DesiredLRP\";\n\x12\x44\x65siredLRPsRequest\x12\x0e\n\x06\x64omain\x18\x01 \x01(\t\x12\x15\n\rprocess_guids\x18\x02 \x03(\t\"o\n\x12\x44\x65siredLRPResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12\x31\n\x0b\x64\x65sired_lrp\x18\x02 \x01(\x0b\x32\x1c.diego.bbs.models.DesiredLRP\"\x9d\x01\n!DesiredLRPSchedulingInfosResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12P\n\x1c\x64\x65sired_lrp_scheduling_infos\x18\x02 \x03(\x0b\x32*.diego.bbs.models.DesiredLRPSchedulingInfo\"\xa8\x01\n-DesiredLRPSchedulingInfoByProcessGuidResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12O\n\x1b\x64\x65sired_lrp_scheduling_info\x18\x02 \x01(\x0b\x32*.diego.bbs.models.DesiredLRPSchedulingInfo\"6\n\x1e\x44\x65siredLRPByProcessGuidRequest\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t\"E\n\x10\x44\x65sireLRPRequest\x12\x31\n\x0b\x64\x65sired_lrp\x18\x01 \x01(\x0b\x32\x1c.diego.bbs.models.DesiredLRP\"c\n\x17UpdateDesiredLRPRequest\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\t\x12\x32\n\x06update\x18\x02 \x01(\x0b\x32\".diego.bbs.models.DesiredLRPUpdate\"/\n\x17RemoveDesiredLRPRequest\x12\x14\n\x0cprocess_guid\x18\x01 \x01(\tb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - DesiredLRPLifecycleResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPLifecycleResponse").msgclass - DesiredLRPsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPsResponse").msgclass - DesiredLRPsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPsRequest").msgclass - DesiredLRPResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPResponse").msgclass - DesiredLRPSchedulingInfosResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPSchedulingInfosResponse").msgclass - DesiredLRPSchedulingInfoByProcessGuidResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPSchedulingInfoByProcessGuidResponse").msgclass - DesiredLRPByProcessGuidRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPByProcessGuidRequest").msgclass - DesireLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesireLRPRequest").msgclass - UpdateDesiredLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.UpdateDesiredLRPRequest").msgclass - RemoveDesiredLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RemoveDesiredLRPRequest").msgclass + DesiredLRPLifecycleResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPLifecycleResponse").msgclass + DesiredLRPsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPsResponse").msgclass + DesiredLRPsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPsRequest").msgclass + DesiredLRPResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPResponse").msgclass + DesiredLRPSchedulingInfosResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPSchedulingInfosResponse").msgclass + DesiredLRPSchedulingInfoByProcessGuidResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPSchedulingInfoByProcessGuidResponse").msgclass + DesiredLRPByProcessGuidRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPByProcessGuidRequest").msgclass + DesireLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesireLRPRequest").msgclass + UpdateDesiredLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.UpdateDesiredLRPRequest").msgclass + RemoveDesiredLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RemoveDesiredLRPRequest").msgclass end end end diff --git a/lib/diego/bbs/models/domain_pb.rb b/lib/diego/bbs/models/domain_pb.rb index 1902d9c2bc3..07034e7489c 100644 --- a/lib/diego/bbs/models/domain_pb.rb +++ b/lib/diego/bbs/models/domain_pb.rb @@ -1,29 +1,23 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: domain.proto require 'google/protobuf' require 'error_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.DomainsResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - repeated :domains, :string, 2 - end - add_message "diego.bbs.models.UpsertDomainResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - end - add_message "diego.bbs.models.UpsertDomainRequest" do - optional :domain, :string, 1 - optional :ttl, :uint32, 2 - end -end + + +descriptor_data = "\n\x0c\x64omain.proto\x12\x10\x64iego.bbs.models\x1a\x0b\x65rror.proto\"J\n\x0f\x44omainsResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12\x0f\n\x07\x64omains\x18\x02 \x03(\t\">\n\x14UpsertDomainResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\"2\n\x13UpsertDomainRequest\x12\x0e\n\x06\x64omain\x18\x01 \x01(\t\x12\x0b\n\x03ttl\x18\x02 \x01(\rb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - DomainsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DomainsResponse").msgclass - UpsertDomainResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.UpsertDomainResponse").msgclass - UpsertDomainRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.UpsertDomainRequest").msgclass + DomainsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DomainsResponse").msgclass + UpsertDomainResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.UpsertDomainResponse").msgclass + UpsertDomainRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.UpsertDomainRequest").msgclass end end end diff --git a/lib/diego/bbs/models/environment_variables_pb.rb b/lib/diego/bbs/models/environment_variables_pb.rb index 5cfbab86827..45b4320ce18 100644 --- a/lib/diego/bbs/models/environment_variables_pb.rb +++ b/lib/diego/bbs/models/environment_variables_pb.rb @@ -1,19 +1,19 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: environment_variables.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.EnvironmentVariable" do - optional :name, :string, 1 - optional :value, :string, 2 - end -end + +descriptor_data = "\n\x1b\x65nvironment_variables.proto\x12\x10\x64iego.bbs.models\"2\n\x13\x45nvironmentVariable\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\tb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - EnvironmentVariable = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EnvironmentVariable").msgclass + EnvironmentVariable = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EnvironmentVariable").msgclass end end end diff --git a/lib/diego/bbs/models/error_pb.rb b/lib/diego/bbs/models/error_pb.rb index cfb1a820cac..299dd2469cb 100644 --- a/lib/diego/bbs/models/error_pb.rb +++ b/lib/diego/bbs/models/error_pb.rb @@ -1,47 +1,20 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: error.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.Error" do - optional :type, :enum, 1, "diego.bbs.models.Error.Type" - optional :message, :string, 2 - end - add_enum "diego.bbs.models.Error.Type" do - value :UnknownError, 0 - value :InvalidRecord, 3 - value :InvalidRequest, 4 - value :InvalidResponse, 5 - value :InvalidProtobufMessage, 6 - value :InvalidJSON, 7 - value :FailedToOpenEnvelope, 8 - value :InvalidStateTransition, 9 - value :ResourceConflict, 11 - value :ResourceExists, 12 - value :ResourceNotFound, 13 - value :RouterError, 14 - value :ActualLRPCannotBeClaimed, 15 - value :ActualLRPCannotBeStarted, 16 - value :ActualLRPCannotBeCrashed, 17 - value :ActualLRPCannotBeFailed, 18 - value :ActualLRPCannotBeRemoved, 19 - value :ActualLRPCannotBeUnclaimed, 21 - value :RunningOnDifferentCell, 24 - value :GUIDGeneration, 26 - value :Deserialize, 27 - value :Deadlock, 28 - value :Unrecoverable, 29 - value :LockCollision, 30 - value :Timeout, 31 - end -end + +descriptor_data = "\n\x0b\x65rror.proto\x12\x10\x64iego.bbs.models\"\xb0\x05\n\x05\x45rror\x12*\n\x04type\x18\x01 \x01(\x0e\x32\x1c.diego.bbs.models.Error.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\"\xe9\x04\n\x04Type\x12\x10\n\x0cUnknownError\x10\x00\x12\x11\n\rInvalidRecord\x10\x03\x12\x12\n\x0eInvalidRequest\x10\x04\x12\x13\n\x0fInvalidResponse\x10\x05\x12\x1a\n\x16InvalidProtobufMessage\x10\x06\x12\x0f\n\x0bInvalidJSON\x10\x07\x12\x18\n\x14\x46\x61iledToOpenEnvelope\x10\x08\x12\x1a\n\x16InvalidStateTransition\x10\t\x12\x14\n\x10ResourceConflict\x10\x0b\x12\x12\n\x0eResourceExists\x10\x0c\x12\x14\n\x10ResourceNotFound\x10\r\x12\x0f\n\x0bRouterError\x10\x0e\x12\x1c\n\x18\x41\x63tualLRPCannotBeClaimed\x10\x0f\x12\x1c\n\x18\x41\x63tualLRPCannotBeStarted\x10\x10\x12\x1c\n\x18\x41\x63tualLRPCannotBeCrashed\x10\x11\x12\x1b\n\x17\x41\x63tualLRPCannotBeFailed\x10\x12\x12\x1c\n\x18\x41\x63tualLRPCannotBeRemoved\x10\x13\x12\x1e\n\x1a\x41\x63tualLRPCannotBeUnclaimed\x10\x15\x12\x1a\n\x16RunningOnDifferentCell\x10\x18\x12\x12\n\x0eGUIDGeneration\x10\x1a\x12\x0f\n\x0b\x44\x65serialize\x10\x1b\x12\x0c\n\x08\x44\x65\x61\x64lock\x10\x1c\x12\x11\n\rUnrecoverable\x10\x1d\x12\x11\n\rLockCollision\x10\x1e\x12\x0b\n\x07Timeout\x10\x1f\"\x04\x08\x01\x10\x01\"\x04\x08\x02\x10\x02\"\x04\x08\n\x10\n\"\x04\x08\x14\x10\x14\"\x04\x08\x16\x10\x16\"\x04\x08\x17\x10\x17\"\x04\x08\x19\x10\x19\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - Error = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Error").msgclass - Error::Type = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Error.Type").enummodule + Error = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Error").msgclass + Error::Type = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Error.Type").enummodule end end end diff --git a/lib/diego/bbs/models/evacuation_pb.rb b/lib/diego/bbs/models/evacuation_pb.rb index 333f887fe02..cf3147deacb 100644 --- a/lib/diego/bbs/models/evacuation_pb.rb +++ b/lib/diego/bbs/models/evacuation_pb.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: evacuation.proto @@ -5,54 +6,23 @@ require 'actual_lrp_pb' require 'error_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.EvacuationResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - optional :keep_container, :bool, 2 - end - add_message "diego.bbs.models.EvacuateClaimedActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - end - add_message "diego.bbs.models.EvacuateRunningActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - optional :actual_lrp_net_info, :message, 3, "diego.bbs.models.ActualLRPNetInfo" - repeated :actual_lrp_internal_routes, :message, 5, "diego.bbs.models.ActualLRPInternalRoute" - map :metric_tags, :string, :string, 6 - optional :availability_zone, :string, 8 - oneof :optional_routable do - optional :Routable, :bool, 7 - end - end - add_message "diego.bbs.models.EvacuateStoppedActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - end - add_message "diego.bbs.models.EvacuateCrashedActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - optional :error_message, :string, 3 - end - add_message "diego.bbs.models.RemoveEvacuatingActualLRPRequest" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - end - add_message "diego.bbs.models.RemoveEvacuatingActualLRPResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - end -end + + +descriptor_data = "\n\x10\x65vacuation.proto\x12\x10\x64iego.bbs.models\x1a\x10\x61\x63tual_lrp.proto\x1a\x0b\x65rror.proto\"T\n\x12\x45vacuationResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12\x16\n\x0ekeep_container\x18\x02 \x01(\x08\"\xa2\x01\n\x1f\x45vacuateClaimedActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\"\x86\x04\n\x1f\x45vacuateRunningActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\x12?\n\x13\x61\x63tual_lrp_net_info\x18\x03 \x01(\x0b\x32\".diego.bbs.models.ActualLRPNetInfo\x12L\n\x1a\x61\x63tual_lrp_internal_routes\x18\x05 \x03(\x0b\x32(.diego.bbs.models.ActualLRPInternalRoute\x12V\n\x0bmetric_tags\x18\x06 \x03(\x0b\x32\x41.diego.bbs.models.EvacuateRunningActualLRPRequest.MetricTagsEntry\x12\x12\n\x08Routable\x18\x07 \x01(\x08H\x00\x12\x19\n\x11\x61vailability_zone\x18\x08 \x01(\t\x1a\x31\n\x0fMetricTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x13\n\x11optional_routableJ\x04\x08\x04\x10\x05\"\xa2\x01\n\x1f\x45vacuateStoppedActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\"\xb9\x01\n\x1f\x45vacuateCrashedActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\x12\x15\n\rerror_message\x18\x03 \x01(\t\"\xa3\x01\n RemoveEvacuatingActualLRPRequest\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\"K\n!RemoveEvacuatingActualLRPResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Errorb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - EvacuationResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuationResponse").msgclass - EvacuateClaimedActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuateClaimedActualLRPRequest").msgclass - EvacuateRunningActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuateRunningActualLRPRequest").msgclass - EvacuateStoppedActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuateStoppedActualLRPRequest").msgclass - EvacuateCrashedActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuateCrashedActualLRPRequest").msgclass - RemoveEvacuatingActualLRPRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RemoveEvacuatingActualLRPRequest").msgclass - RemoveEvacuatingActualLRPResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RemoveEvacuatingActualLRPResponse").msgclass + EvacuationResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuationResponse").msgclass + EvacuateClaimedActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuateClaimedActualLRPRequest").msgclass + EvacuateRunningActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuateRunningActualLRPRequest").msgclass + EvacuateStoppedActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuateStoppedActualLRPRequest").msgclass + EvacuateCrashedActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EvacuateCrashedActualLRPRequest").msgclass + RemoveEvacuatingActualLRPRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RemoveEvacuatingActualLRPRequest").msgclass + RemoveEvacuatingActualLRPResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RemoveEvacuatingActualLRPResponse").msgclass end end end diff --git a/lib/diego/bbs/models/events_pb.rb b/lib/diego/bbs/models/events_pb.rb index e4d6c443bee..3190571830b 100644 --- a/lib/diego/bbs/models/events_pb.rb +++ b/lib/diego/bbs/models/events_pb.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: events.proto @@ -7,99 +8,31 @@ require 'desired_lrp_pb' require 'task_pb' require 'modification_tag_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.ActualLRPCreatedEvent" do - optional :actual_lrp_group, :message, 1, "diego.bbs.models.ActualLRPGroup" - end - add_message "diego.bbs.models.ActualLRPChangedEvent" do - optional :before, :message, 1, "diego.bbs.models.ActualLRPGroup" - optional :after, :message, 2, "diego.bbs.models.ActualLRPGroup" - end - add_message "diego.bbs.models.ActualLRPRemovedEvent" do - optional :actual_lrp_group, :message, 1, "diego.bbs.models.ActualLRPGroup" - end - add_message "diego.bbs.models.ActualLRPInstanceCreatedEvent" do - optional :actual_lrp, :message, 1, "diego.bbs.models.ActualLRP" - optional :trace_id, :string, 2 - end - add_message "diego.bbs.models.ActualLRPInfo" do - optional :actual_lrp_net_info, :message, 3, "diego.bbs.models.ActualLRPNetInfo" - optional :crash_count, :int32, 4 - optional :crash_reason, :string, 5 - optional :state, :string, 6 - optional :placement_error, :string, 7 - optional :since, :int64, 8 - optional :modification_tag, :message, 9, "diego.bbs.models.ModificationTag" - optional :presence, :enum, 10, "diego.bbs.models.ActualLRP.Presence" - optional :availability_zone, :string, 12 - oneof :optional_routable do - optional :Routable, :bool, 11 - end - end - add_message "diego.bbs.models.ActualLRPInstanceChangedEvent" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - optional :before, :message, 3, "diego.bbs.models.ActualLRPInfo" - optional :after, :message, 4, "diego.bbs.models.ActualLRPInfo" - optional :trace_id, :string, 5 - end - add_message "diego.bbs.models.ActualLRPInstanceRemovedEvent" do - optional :actual_lrp, :message, 1, "diego.bbs.models.ActualLRP" - optional :trace_id, :string, 2 - end - add_message "diego.bbs.models.DesiredLRPCreatedEvent" do - optional :desired_lrp, :message, 1, "diego.bbs.models.DesiredLRP" - optional :trace_id, :string, 2 - end - add_message "diego.bbs.models.DesiredLRPChangedEvent" do - optional :before, :message, 1, "diego.bbs.models.DesiredLRP" - optional :after, :message, 2, "diego.bbs.models.DesiredLRP" - optional :trace_id, :string, 3 - end - add_message "diego.bbs.models.DesiredLRPRemovedEvent" do - optional :desired_lrp, :message, 1, "diego.bbs.models.DesiredLRP" - optional :trace_id, :string, 2 - end - add_message "diego.bbs.models.ActualLRPCrashedEvent" do - optional :actual_lrp_key, :message, 1, "diego.bbs.models.ActualLRPKey" - optional :actual_lrp_instance_key, :message, 2, "diego.bbs.models.ActualLRPInstanceKey" - optional :crash_count, :int32, 3 - optional :crash_reason, :string, 4 - optional :since, :int64, 5 - end - add_message "diego.bbs.models.EventsByCellId" do - optional :cell_id, :string, 1 - end - add_message "diego.bbs.models.TaskCreatedEvent" do - optional :task, :message, 1, "diego.bbs.models.Task" - end - add_message "diego.bbs.models.TaskChangedEvent" do - optional :before, :message, 1, "diego.bbs.models.Task" - optional :after, :message, 2, "diego.bbs.models.Task" - end - add_message "diego.bbs.models.TaskRemovedEvent" do - optional :task, :message, 1, "diego.bbs.models.Task" - end -end + + +descriptor_data = "\n\x0c\x65vents.proto\x12\x10\x64iego.bbs.models\x1a\x10\x61\x63tual_lrp.proto\x1a\x11\x64\x65sired_lrp.proto\x1a\ntask.proto\x1a\x16modification_tag.proto\"W\n\x15\x41\x63tualLRPCreatedEvent\x12:\n\x10\x61\x63tual_lrp_group\x18\x01 \x01(\x0b\x32 .diego.bbs.models.ActualLRPGroup:\x02\x18\x01\"~\n\x15\x41\x63tualLRPChangedEvent\x12\x30\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32 .diego.bbs.models.ActualLRPGroup\x12/\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32 .diego.bbs.models.ActualLRPGroup:\x02\x18\x01\"W\n\x15\x41\x63tualLRPRemovedEvent\x12:\n\x10\x61\x63tual_lrp_group\x18\x01 \x01(\x0b\x32 .diego.bbs.models.ActualLRPGroup:\x02\x18\x01\"b\n\x1d\x41\x63tualLRPInstanceCreatedEvent\x12/\n\nactual_lrp\x18\x01 \x01(\x0b\x32\x1b.diego.bbs.models.ActualLRP\x12\x10\n\x08trace_id\x18\x02 \x01(\t\"\xeb\x02\n\rActualLRPInfo\x12?\n\x13\x61\x63tual_lrp_net_info\x18\x03 \x01(\x0b\x32\".diego.bbs.models.ActualLRPNetInfo\x12\x13\n\x0b\x63rash_count\x18\x04 \x01(\x05\x12\x14\n\x0c\x63rash_reason\x18\x05 \x01(\t\x12\r\n\x05state\x18\x06 \x01(\t\x12\x17\n\x0fplacement_error\x18\x07 \x01(\t\x12\r\n\x05since\x18\x08 \x01(\x03\x12;\n\x10modification_tag\x18\t \x01(\x0b\x32!.diego.bbs.models.ModificationTag\x12\x36\n\x08presence\x18\n \x01(\x0e\x32$.diego.bbs.models.ActualLRP.Presence\x12\x12\n\x08Routable\x18\x0b \x01(\x08H\x00\x12\x19\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x13\n\x11optional_routable\"\x93\x02\n\x1d\x41\x63tualLRPInstanceChangedEvent\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\x12/\n\x06\x62\x65\x66ore\x18\x03 \x01(\x0b\x32\x1f.diego.bbs.models.ActualLRPInfo\x12.\n\x05\x61\x66ter\x18\x04 \x01(\x0b\x32\x1f.diego.bbs.models.ActualLRPInfo\x12\x10\n\x08trace_id\x18\x05 \x01(\t\"b\n\x1d\x41\x63tualLRPInstanceRemovedEvent\x12/\n\nactual_lrp\x18\x01 \x01(\x0b\x32\x1b.diego.bbs.models.ActualLRP\x12\x10\n\x08trace_id\x18\x02 \x01(\t\"]\n\x16\x44\x65siredLRPCreatedEvent\x12\x31\n\x0b\x64\x65sired_lrp\x18\x01 \x01(\x0b\x32\x1c.diego.bbs.models.DesiredLRP\x12\x10\n\x08trace_id\x18\x02 \x01(\t\"\x85\x01\n\x16\x44\x65siredLRPChangedEvent\x12,\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\x1c.diego.bbs.models.DesiredLRP\x12+\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\x1c.diego.bbs.models.DesiredLRP\x12\x10\n\x08trace_id\x18\x03 \x01(\t\"]\n\x16\x44\x65siredLRPRemovedEvent\x12\x31\n\x0b\x64\x65sired_lrp\x18\x01 \x01(\x0b\x32\x1c.diego.bbs.models.DesiredLRP\x12\x10\n\x08trace_id\x18\x02 \x01(\t\"\xd2\x01\n\x15\x41\x63tualLRPCrashedEvent\x12\x36\n\x0e\x61\x63tual_lrp_key\x18\x01 \x01(\x0b\x32\x1e.diego.bbs.models.ActualLRPKey\x12G\n\x17\x61\x63tual_lrp_instance_key\x18\x02 \x01(\x0b\x32&.diego.bbs.models.ActualLRPInstanceKey\x12\x13\n\x0b\x63rash_count\x18\x03 \x01(\x05\x12\x14\n\x0c\x63rash_reason\x18\x04 \x01(\t\x12\r\n\x05since\x18\x05 \x01(\x03\"!\n\x0e\x45ventsByCellId\x12\x0f\n\x07\x63\x65ll_id\x18\x01 \x01(\t\"8\n\x10TaskCreatedEvent\x12$\n\x04task\x18\x01 \x01(\x0b\x32\x16.diego.bbs.models.Task\"a\n\x10TaskChangedEvent\x12&\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\x16.diego.bbs.models.Task\x12%\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\x16.diego.bbs.models.Task\"8\n\x10TaskRemovedEvent\x12$\n\x04task\x18\x01 \x01(\x0b\x32\x16.diego.bbs.models.Taskb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - ActualLRPCreatedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPCreatedEvent").msgclass - ActualLRPChangedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPChangedEvent").msgclass - ActualLRPRemovedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPRemovedEvent").msgclass - ActualLRPInstanceCreatedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInstanceCreatedEvent").msgclass - ActualLRPInfo = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInfo").msgclass - ActualLRPInstanceChangedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInstanceChangedEvent").msgclass - ActualLRPInstanceRemovedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInstanceRemovedEvent").msgclass - DesiredLRPCreatedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPCreatedEvent").msgclass - DesiredLRPChangedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPChangedEvent").msgclass - DesiredLRPRemovedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPRemovedEvent").msgclass - ActualLRPCrashedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPCrashedEvent").msgclass - EventsByCellId = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EventsByCellId").msgclass - TaskCreatedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskCreatedEvent").msgclass - TaskChangedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskChangedEvent").msgclass - TaskRemovedEvent = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskRemovedEvent").msgclass + ActualLRPCreatedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPCreatedEvent").msgclass + ActualLRPChangedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPChangedEvent").msgclass + ActualLRPRemovedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPRemovedEvent").msgclass + ActualLRPInstanceCreatedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInstanceCreatedEvent").msgclass + ActualLRPInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInfo").msgclass + ActualLRPInstanceChangedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInstanceChangedEvent").msgclass + ActualLRPInstanceRemovedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPInstanceRemovedEvent").msgclass + DesiredLRPCreatedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPCreatedEvent").msgclass + DesiredLRPChangedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPChangedEvent").msgclass + DesiredLRPRemovedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesiredLRPRemovedEvent").msgclass + ActualLRPCrashedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ActualLRPCrashedEvent").msgclass + EventsByCellId = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.EventsByCellId").msgclass + TaskCreatedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskCreatedEvent").msgclass + TaskChangedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskChangedEvent").msgclass + TaskRemovedEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskRemovedEvent").msgclass end end end diff --git a/lib/diego/bbs/models/file_pb.rb b/lib/diego/bbs/models/file_pb.rb index 54c5064fd7e..cd7491a62db 100644 --- a/lib/diego/bbs/models/file_pb.rb +++ b/lib/diego/bbs/models/file_pb.rb @@ -1,19 +1,19 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: file.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.File" do - optional :path, :string, 1 - optional :content, :string, 2 - end -end + +descriptor_data = "\n\nfile.proto\x12\x10\x64iego.bbs.models\"%\n\x04\x46ile\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\tb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - File = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.File").msgclass + File = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.File").msgclass end end end diff --git a/lib/diego/bbs/models/image_layer_pb.rb b/lib/diego/bbs/models/image_layer_pb.rb index 93840b22fc7..0689aa55ac9 100644 --- a/lib/diego/bbs/models/image_layer_pb.rb +++ b/lib/diego/bbs/models/image_layer_pb.rb @@ -1,43 +1,22 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: image_layer.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.ImageLayer" do - optional :name, :string, 1 - optional :url, :string, 2 - optional :destination_path, :string, 3 - optional :layer_type, :enum, 4, "diego.bbs.models.ImageLayer.Type" - optional :media_type, :enum, 5, "diego.bbs.models.ImageLayer.MediaType" - optional :digest_algorithm, :enum, 6, "diego.bbs.models.ImageLayer.DigestAlgorithm" - optional :digest_value, :string, 7 - end - add_enum "diego.bbs.models.ImageLayer.DigestAlgorithm" do - value :DigestAlgorithmInvalid, 0 - value :SHA256, 1 - value :SHA512, 2 - end - add_enum "diego.bbs.models.ImageLayer.MediaType" do - value :MediaTypeInvalid, 0 - value :TGZ, 1 - value :TAR, 2 - value :ZIP, 3 - end - add_enum "diego.bbs.models.ImageLayer.Type" do - value :LayerTypeInvalid, 0 - value :SHARED, 1 - value :EXCLUSIVE, 2 - end -end + +descriptor_data = "\n\x11image_layer.proto\x12\x10\x64iego.bbs.models\"\xd4\x03\n\nImageLayer\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0b\n\x03url\x18\x02 \x01(\t\x12\x18\n\x10\x64\x65stination_path\x18\x03 \x01(\t\x12\x35\n\nlayer_type\x18\x04 \x01(\x0e\x32!.diego.bbs.models.ImageLayer.Type\x12:\n\nmedia_type\x18\x05 \x01(\x0e\x32&.diego.bbs.models.ImageLayer.MediaType\x12\x46\n\x10\x64igest_algorithm\x18\x06 \x01(\x0e\x32,.diego.bbs.models.ImageLayer.DigestAlgorithm\x12\x14\n\x0c\x64igest_value\x18\x07 \x01(\t\"I\n\x0f\x44igestAlgorithm\x12\x1a\n\x16\x44igestAlgorithmInvalid\x10\x00\x12\n\n\x06SHA256\x10\x01\x12\x0e\n\x06SHA512\x10\x02\x1a\x02\x08\x01\"<\n\tMediaType\x12\x14\n\x10MediaTypeInvalid\x10\x00\x12\x07\n\x03TGZ\x10\x01\x12\x07\n\x03TAR\x10\x02\x12\x07\n\x03ZIP\x10\x03\"7\n\x04Type\x12\x14\n\x10LayerTypeInvalid\x10\x00\x12\n\n\x06SHARED\x10\x01\x12\r\n\tEXCLUSIVE\x10\x02\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - ImageLayer = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ImageLayer").msgclass - ImageLayer::DigestAlgorithm = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ImageLayer.DigestAlgorithm").enummodule - ImageLayer::MediaType = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ImageLayer.MediaType").enummodule - ImageLayer::Type = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ImageLayer.Type").enummodule + ImageLayer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ImageLayer").msgclass + ImageLayer::DigestAlgorithm = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ImageLayer.DigestAlgorithm").enummodule + ImageLayer::MediaType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ImageLayer.MediaType").enummodule + ImageLayer::Type = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ImageLayer.Type").enummodule end end end diff --git a/lib/diego/bbs/models/log_rate_limit_pb.rb b/lib/diego/bbs/models/log_rate_limit_pb.rb index a549296f05c..b18d1d1770d 100644 --- a/lib/diego/bbs/models/log_rate_limit_pb.rb +++ b/lib/diego/bbs/models/log_rate_limit_pb.rb @@ -1,18 +1,19 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: log_rate_limit.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.LogRateLimit" do - optional :bytes_per_second, :int64, 1 - end -end + +descriptor_data = "\n\x14log_rate_limit.proto\x12\x10\x64iego.bbs.models\"(\n\x0cLogRateLimit\x12\x18\n\x10\x62ytes_per_second\x18\x01 \x01(\x03\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - LogRateLimit = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.LogRateLimit").msgclass + LogRateLimit = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.LogRateLimit").msgclass end end end diff --git a/lib/diego/bbs/models/metric_tags_pb.rb b/lib/diego/bbs/models/metric_tags_pb.rb index 58471e41d4e..ea25319f51a 100644 --- a/lib/diego/bbs/models/metric_tags_pb.rb +++ b/lib/diego/bbs/models/metric_tags_pb.rb @@ -1,25 +1,20 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: metric_tags.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.MetricTagValue" do - optional :static, :string, 1 - optional :dynamic, :enum, 2, "diego.bbs.models.MetricTagValue.DynamicValue" - end - add_enum "diego.bbs.models.MetricTagValue.DynamicValue" do - value :DynamicValueInvalid, 0 - value :INDEX, 1 - value :INSTANCE_GUID, 2 - end -end + +descriptor_data = "\n\x11metric_tags.proto\x12\x10\x64iego.bbs.models\"\xa7\x01\n\x0eMetricTagValue\x12\x0e\n\x06static\x18\x01 \x01(\t\x12>\n\x07\x64ynamic\x18\x02 \x01(\x0e\x32-.diego.bbs.models.MetricTagValue.DynamicValue\"E\n\x0c\x44ynamicValue\x12\x17\n\x13\x44ynamicValueInvalid\x10\x00\x12\t\n\x05INDEX\x10\x01\x12\x11\n\rINSTANCE_GUID\x10\x02\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - MetricTagValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.MetricTagValue").msgclass - MetricTagValue::DynamicValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.MetricTagValue.DynamicValue").enummodule + MetricTagValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.MetricTagValue").msgclass + MetricTagValue::DynamicValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.MetricTagValue.DynamicValue").enummodule end end end diff --git a/lib/diego/bbs/models/modification_tag_pb.rb b/lib/diego/bbs/models/modification_tag_pb.rb index 6139504a18a..1f72a486b95 100644 --- a/lib/diego/bbs/models/modification_tag_pb.rb +++ b/lib/diego/bbs/models/modification_tag_pb.rb @@ -1,19 +1,19 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: modification_tag.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.ModificationTag" do - optional :epoch, :string, 1 - optional :index, :uint32, 2 - end -end + +descriptor_data = "\n\x16modification_tag.proto\x12\x10\x64iego.bbs.models\"/\n\x0fModificationTag\x12\r\n\x05\x65poch\x18\x01 \x01(\t\x12\r\n\x05index\x18\x02 \x01(\rb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - ModificationTag = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ModificationTag").msgclass + ModificationTag = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ModificationTag").msgclass end end end diff --git a/lib/diego/bbs/models/network_pb.rb b/lib/diego/bbs/models/network_pb.rb index af63a65d060..816e53b8c49 100644 --- a/lib/diego/bbs/models/network_pb.rb +++ b/lib/diego/bbs/models/network_pb.rb @@ -1,18 +1,19 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: network.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.Network" do - map :properties, :string, :string, 1 - end -end + +descriptor_data = "\n\rnetwork.proto\x12\x10\x64iego.bbs.models\"{\n\x07Network\x12=\n\nproperties\x18\x01 \x03(\x0b\x32).diego.bbs.models.Network.PropertiesEntry\x1a\x31\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - Network = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Network").msgclass + Network = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Network").msgclass end end end diff --git a/lib/diego/bbs/models/ping_pb.rb b/lib/diego/bbs/models/ping_pb.rb index 7aa091486ce..abf8e430db1 100644 --- a/lib/diego/bbs/models/ping_pb.rb +++ b/lib/diego/bbs/models/ping_pb.rb @@ -1,18 +1,19 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: ping.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.PingResponse" do - optional :available, :bool, 1 - end -end + +descriptor_data = "\n\nping.proto\x12\x10\x64iego.bbs.models\"!\n\x0cPingResponse\x12\x11\n\tavailable\x18\x01 \x01(\x08\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - PingResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.PingResponse").msgclass + PingResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.PingResponse").msgclass end end end diff --git a/lib/diego/bbs/models/security_group_pb.rb b/lib/diego/bbs/models/security_group_pb.rb index 65be63fb800..49678866826 100644 --- a/lib/diego/bbs/models/security_group_pb.rb +++ b/lib/diego/bbs/models/security_group_pb.rb @@ -1,34 +1,21 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: security_group.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.PortRange" do - optional :start, :uint32, 1 - optional :end, :uint32, 2 - end - add_message "diego.bbs.models.ICMPInfo" do - optional :type, :int32, 1 - optional :code, :int32, 2 - end - add_message "diego.bbs.models.SecurityGroupRule" do - optional :protocol, :string, 1 - repeated :destinations, :string, 2 - repeated :ports, :uint32, 3 - optional :port_range, :message, 4, "diego.bbs.models.PortRange" - optional :icmp_info, :message, 5, "diego.bbs.models.ICMPInfo" - optional :log, :bool, 6 - repeated :annotations, :string, 7 - end -end + +descriptor_data = "\n\x14security_group.proto\x12\x10\x64iego.bbs.models\"\'\n\tPortRange\x12\r\n\x05start\x18\x01 \x01(\r\x12\x0b\n\x03\x65nd\x18\x02 \x01(\r\"&\n\x08ICMPInfo\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0c\n\x04\x63ode\x18\x02 \x01(\x05\"\xd0\x01\n\x11SecurityGroupRule\x12\x10\n\x08protocol\x18\x01 \x01(\t\x12\x14\n\x0c\x64\x65stinations\x18\x02 \x03(\t\x12\x11\n\x05ports\x18\x03 \x03(\rB\x02\x10\x00\x12/\n\nport_range\x18\x04 \x01(\x0b\x32\x1b.diego.bbs.models.PortRange\x12-\n\ticmp_info\x18\x05 \x01(\x0b\x32\x1a.diego.bbs.models.ICMPInfo\x12\x0b\n\x03log\x18\x06 \x01(\x08\x12\x13\n\x0b\x61nnotations\x18\x07 \x03(\tb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - PortRange = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.PortRange").msgclass - ICMPInfo = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ICMPInfo").msgclass - SecurityGroupRule = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.SecurityGroupRule").msgclass + PortRange = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.PortRange").msgclass + ICMPInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.ICMPInfo").msgclass + SecurityGroupRule = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.SecurityGroupRule").msgclass end end end diff --git a/lib/diego/bbs/models/sidecar_pb.rb b/lib/diego/bbs/models/sidecar_pb.rb index 1e73948faea..4109d28666f 100644 --- a/lib/diego/bbs/models/sidecar_pb.rb +++ b/lib/diego/bbs/models/sidecar_pb.rb @@ -1,21 +1,21 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: sidecar.proto require 'google/protobuf' require 'actions_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.Sidecar" do - optional :action, :message, 1, "diego.bbs.models.Action" - optional :disk_mb, :int32, 2 - optional :memory_mb, :int32, 3 - end -end + + +descriptor_data = "\n\rsidecar.proto\x12\x10\x64iego.bbs.models\x1a\ractions.proto\"W\n\x07Sidecar\x12(\n\x06\x61\x63tion\x18\x01 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12\x0f\n\x07\x64isk_mb\x18\x02 \x01(\x05\x12\x11\n\tmemory_mb\x18\x03 \x01(\x05\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - Sidecar = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Sidecar").msgclass + Sidecar = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Sidecar").msgclass end end end diff --git a/lib/diego/bbs/models/task_pb.rb b/lib/diego/bbs/models/task_pb.rb index 717f3b3a375..098cf9b95aa 100644 --- a/lib/diego/bbs/models/task_pb.rb +++ b/lib/diego/bbs/models/task_pb.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: task.proto @@ -14,67 +15,19 @@ require 'log_rate_limit_pb' require 'metric_tags_pb' require 'file_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.TaskDefinition" do - optional :root_fs, :string, 1 - repeated :environment_variables, :message, 2, "diego.bbs.models.EnvironmentVariable" - optional :action, :message, 3, "diego.bbs.models.Action" - optional :disk_mb, :int32, 4 - optional :memory_mb, :int32, 5 - optional :cpu_weight, :uint32, 6 - optional :privileged, :bool, 7 - optional :log_source, :string, 8 - optional :log_guid, :string, 9 - optional :metrics_guid, :string, 10 - optional :result_file, :string, 11 - optional :completion_callback_url, :string, 12 - optional :annotation, :string, 13 - repeated :egress_rules, :message, 14, "diego.bbs.models.SecurityGroupRule" - repeated :cached_dependencies, :message, 15, "diego.bbs.models.CachedDependency" - optional :legacy_download_user, :string, 16 - optional :trusted_system_certificates_path, :string, 17 - repeated :volume_mounts, :message, 18, "diego.bbs.models.VolumeMount" - optional :network, :message, 19, "diego.bbs.models.Network" - repeated :placement_tags, :string, 20 - optional :max_pids, :int32, 21 - optional :certificate_properties, :message, 22, "diego.bbs.models.CertificateProperties" - optional :image_username, :string, 23 - optional :image_password, :string, 24 - repeated :image_layers, :message, 25, "diego.bbs.models.ImageLayer" - optional :log_rate_limit, :message, 26, "diego.bbs.models.LogRateLimit" - map :metric_tags, :string, :message, 27, "diego.bbs.models.MetricTagValue" - repeated :volume_mounted_files, :message, 28, "diego.bbs.models.File" - end - add_message "diego.bbs.models.Task" do - optional :task_definition, :message, 1, "diego.bbs.models.TaskDefinition" - optional :task_guid, :string, 2 - optional :domain, :string, 3 - optional :created_at, :int64, 4 - optional :updated_at, :int64, 5 - optional :first_completed_at, :int64, 6 - optional :state, :enum, 7, "diego.bbs.models.Task.State" - optional :cell_id, :string, 8 - optional :result, :string, 9 - optional :failed, :bool, 10 - optional :failure_reason, :string, 11 - optional :rejection_count, :int32, 12 - optional :rejection_reason, :string, 13 - end - add_enum "diego.bbs.models.Task.State" do - value :Invalid, 0 - value :Pending, 1 - value :Running, 2 - value :Completed, 3 - value :Resolving, 4 - end -end + + +descriptor_data = "\n\ntask.proto\x12\x10\x64iego.bbs.models\x1a\ractions.proto\x1a\x1b\x65nvironment_variables.proto\x1a\x14security_group.proto\x1a\x17\x63\x61\x63hed_dependency.proto\x1a\x12volume_mount.proto\x1a\rnetwork.proto\x1a\x1c\x63\x65rtificate_properties.proto\x1a\x11image_layer.proto\x1a\x14log_rate_limit.proto\x1a\x11metric_tags.proto\x1a\nfile.proto\"\xee\x08\n\x0eTaskDefinition\x12\x0f\n\x07root_fs\x18\x01 \x01(\t\x12\x44\n\x15\x65nvironment_variables\x18\x02 \x03(\x0b\x32%.diego.bbs.models.EnvironmentVariable\x12(\n\x06\x61\x63tion\x18\x03 \x01(\x0b\x32\x18.diego.bbs.models.Action\x12\x0f\n\x07\x64isk_mb\x18\x04 \x01(\x05\x12\x11\n\tmemory_mb\x18\x05 \x01(\x05\x12\x12\n\ncpu_weight\x18\x06 \x01(\r\x12\x12\n\nprivileged\x18\x07 \x01(\x08\x12\x12\n\nlog_source\x18\x08 \x01(\t\x12\x10\n\x08log_guid\x18\t \x01(\t\x12\x14\n\x0cmetrics_guid\x18\n \x01(\t\x12\x13\n\x0bresult_file\x18\x0b \x01(\t\x12\x1f\n\x17\x63ompletion_callback_url\x18\x0c \x01(\t\x12\x12\n\nannotation\x18\r \x01(\t\x12\x39\n\x0c\x65gress_rules\x18\x0e \x03(\x0b\x32#.diego.bbs.models.SecurityGroupRule\x12?\n\x13\x63\x61\x63hed_dependencies\x18\x0f \x03(\x0b\x32\".diego.bbs.models.CachedDependency\x12 \n\x14legacy_download_user\x18\x10 \x01(\tB\x02\x18\x01\x12(\n trusted_system_certificates_path\x18\x11 \x01(\t\x12\x34\n\rvolume_mounts\x18\x12 \x03(\x0b\x32\x1d.diego.bbs.models.VolumeMount\x12*\n\x07network\x18\x13 \x01(\x0b\x32\x19.diego.bbs.models.Network\x12\x16\n\x0eplacement_tags\x18\x14 \x03(\t\x12\x10\n\x08max_pids\x18\x15 \x01(\x05\x12G\n\x16\x63\x65rtificate_properties\x18\x16 \x01(\x0b\x32\'.diego.bbs.models.CertificateProperties\x12\x16\n\x0eimage_username\x18\x17 \x01(\t\x12\x16\n\x0eimage_password\x18\x18 \x01(\t\x12\x32\n\x0cimage_layers\x18\x19 \x03(\x0b\x32\x1c.diego.bbs.models.ImageLayer\x12\x36\n\x0elog_rate_limit\x18\x1a \x01(\x0b\x32\x1e.diego.bbs.models.LogRateLimit\x12\x45\n\x0bmetric_tags\x18\x1b \x03(\x0b\x32\x30.diego.bbs.models.TaskDefinition.MetricTagsEntry\x12\x34\n\x14volume_mounted_files\x18\x1c \x03(\x0b\x32\x16.diego.bbs.models.File\x1aS\n\x0fMetricTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .diego.bbs.models.MetricTagValue:\x02\x38\x01\"\x9f\x03\n\x04Task\x12\x39\n\x0ftask_definition\x18\x01 \x01(\x0b\x32 .diego.bbs.models.TaskDefinition\x12\x11\n\ttask_guid\x18\x02 \x01(\t\x12\x0e\n\x06\x64omain\x18\x03 \x01(\t\x12\x12\n\ncreated_at\x18\x04 \x01(\x03\x12\x12\n\nupdated_at\x18\x05 \x01(\x03\x12\x1a\n\x12\x66irst_completed_at\x18\x06 \x01(\x03\x12+\n\x05state\x18\x07 \x01(\x0e\x32\x1c.diego.bbs.models.Task.State\x12\x0f\n\x07\x63\x65ll_id\x18\x08 \x01(\t\x12\x0e\n\x06result\x18\t \x01(\t\x12\x0e\n\x06\x66\x61iled\x18\n \x01(\x08\x12\x16\n\x0e\x66\x61ilure_reason\x18\x0b \x01(\t\x12\x17\n\x0frejection_count\x18\x0c \x01(\x05\x12\x18\n\x10rejection_reason\x18\r \x01(\t\"L\n\x05State\x12\x0b\n\x07Invalid\x10\x00\x12\x0b\n\x07Pending\x10\x01\x12\x0b\n\x07Running\x10\x02\x12\r\n\tCompleted\x10\x03\x12\r\n\tResolving\x10\x04\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - TaskDefinition = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskDefinition").msgclass - Task = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Task").msgclass - Task::State = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Task.State").enummodule + TaskDefinition = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskDefinition").msgclass + Task = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Task").msgclass + Task::State = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.Task.State").enummodule end end end diff --git a/lib/diego/bbs/models/task_requests_pb.rb b/lib/diego/bbs/models/task_requests_pb.rb index 33e2b3a0cf0..2d866b150f1 100644 --- a/lib/diego/bbs/models/task_requests_pb.rb +++ b/lib/diego/bbs/models/task_requests_pb.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: task_requests.proto @@ -5,82 +6,29 @@ require 'task_pb' require 'error_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.TaskLifecycleResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - end - add_message "diego.bbs.models.DesireTaskRequest" do - optional :task_definition, :message, 1, "diego.bbs.models.TaskDefinition" - optional :task_guid, :string, 2 - optional :domain, :string, 3 - end - add_message "diego.bbs.models.StartTaskRequest" do - optional :task_guid, :string, 1 - optional :cell_id, :string, 2 - end - add_message "diego.bbs.models.StartTaskResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - optional :should_start, :bool, 2 - end - add_message "diego.bbs.models.FailTaskRequest" do - optional :task_guid, :string, 1 - optional :failure_reason, :string, 2 - end - add_message "diego.bbs.models.RejectTaskRequest" do - optional :task_guid, :string, 1 - optional :rejection_reason, :string, 2 - end - add_message "diego.bbs.models.TaskGuidRequest" do - optional :task_guid, :string, 1 - end - add_message "diego.bbs.models.CompleteTaskRequest" do - optional :task_guid, :string, 1 - optional :cell_id, :string, 2 - optional :failed, :bool, 3 - optional :failure_reason, :string, 4 - optional :result, :string, 5 - end - add_message "diego.bbs.models.TaskCallbackResponse" do - optional :task_guid, :string, 1 - optional :failed, :bool, 2 - optional :failure_reason, :string, 3 - optional :result, :string, 4 - optional :annotation, :string, 5 - optional :created_at, :int64, 6 - end - add_message "diego.bbs.models.TasksRequest" do - optional :domain, :string, 1 - optional :cell_id, :string, 2 - end - add_message "diego.bbs.models.TasksResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - repeated :tasks, :message, 2, "diego.bbs.models.Task" - end - add_message "diego.bbs.models.TaskByGuidRequest" do - optional :task_guid, :string, 1 - end - add_message "diego.bbs.models.TaskResponse" do - optional :error, :message, 1, "diego.bbs.models.Error" - optional :task, :message, 2, "diego.bbs.models.Task" - end -end + + +descriptor_data = "\n\x13task_requests.proto\x12\x10\x64iego.bbs.models\x1a\ntask.proto\x1a\x0b\x65rror.proto\"?\n\x15TaskLifecycleResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\"q\n\x11\x44\x65sireTaskRequest\x12\x39\n\x0ftask_definition\x18\x01 \x01(\x0b\x32 .diego.bbs.models.TaskDefinition\x12\x11\n\ttask_guid\x18\x02 \x01(\t\x12\x0e\n\x06\x64omain\x18\x03 \x01(\t\"6\n\x10StartTaskRequest\x12\x11\n\ttask_guid\x18\x01 \x01(\t\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\t\"Q\n\x11StartTaskResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12\x14\n\x0cshould_start\x18\x02 \x01(\x08\"@\n\x0f\x46\x61ilTaskRequest\x12\x11\n\ttask_guid\x18\x01 \x01(\t\x12\x16\n\x0e\x66\x61ilure_reason\x18\x02 \x01(\t:\x02\x18\x01\"@\n\x11RejectTaskRequest\x12\x11\n\ttask_guid\x18\x01 \x01(\t\x12\x18\n\x10rejection_reason\x18\x02 \x01(\t\"$\n\x0fTaskGuidRequest\x12\x11\n\ttask_guid\x18\x01 \x01(\t\"q\n\x13\x43ompleteTaskRequest\x12\x11\n\ttask_guid\x18\x01 \x01(\t\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\t\x12\x0e\n\x06\x66\x61iled\x18\x03 \x01(\x08\x12\x16\n\x0e\x66\x61ilure_reason\x18\x04 \x01(\t\x12\x0e\n\x06result\x18\x05 \x01(\t\"\x89\x01\n\x14TaskCallbackResponse\x12\x11\n\ttask_guid\x18\x01 \x01(\t\x12\x0e\n\x06\x66\x61iled\x18\x02 \x01(\x08\x12\x16\n\x0e\x66\x61ilure_reason\x18\x03 \x01(\t\x12\x0e\n\x06result\x18\x04 \x01(\t\x12\x12\n\nannotation\x18\x05 \x01(\t\x12\x12\n\ncreated_at\x18\x06 \x01(\x03\"/\n\x0cTasksRequest\x12\x0e\n\x06\x64omain\x18\x01 \x01(\t\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\t\"^\n\rTasksResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12%\n\x05tasks\x18\x02 \x03(\x0b\x32\x16.diego.bbs.models.Task\"&\n\x11TaskByGuidRequest\x12\x11\n\ttask_guid\x18\x01 \x01(\t\"\\\n\x0cTaskResponse\x12&\n\x05\x65rror\x18\x01 \x01(\x0b\x32\x17.diego.bbs.models.Error\x12$\n\x04task\x18\x02 \x01(\x0b\x32\x16.diego.bbs.models.Taskb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - TaskLifecycleResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskLifecycleResponse").msgclass - DesireTaskRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesireTaskRequest").msgclass - StartTaskRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.StartTaskRequest").msgclass - StartTaskResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.StartTaskResponse").msgclass - FailTaskRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.FailTaskRequest").msgclass - RejectTaskRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RejectTaskRequest").msgclass - TaskGuidRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskGuidRequest").msgclass - CompleteTaskRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CompleteTaskRequest").msgclass - TaskCallbackResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskCallbackResponse").msgclass - TasksRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TasksRequest").msgclass - TasksResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TasksResponse").msgclass - TaskByGuidRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskByGuidRequest").msgclass - TaskResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskResponse").msgclass + TaskLifecycleResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskLifecycleResponse").msgclass + DesireTaskRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.DesireTaskRequest").msgclass + StartTaskRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.StartTaskRequest").msgclass + StartTaskResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.StartTaskResponse").msgclass + FailTaskRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.FailTaskRequest").msgclass + RejectTaskRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.RejectTaskRequest").msgclass + TaskGuidRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskGuidRequest").msgclass + CompleteTaskRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.CompleteTaskRequest").msgclass + TaskCallbackResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskCallbackResponse").msgclass + TasksRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TasksRequest").msgclass + TasksResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TasksResponse").msgclass + TaskByGuidRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskByGuidRequest").msgclass + TaskResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.TaskResponse").msgclass end end end diff --git a/lib/diego/bbs/models/volume_mount_pb.rb b/lib/diego/bbs/models/volume_mount_pb.rb index 957170ee0c9..eeb69e1317a 100644 --- a/lib/diego/bbs/models/volume_mount_pb.rb +++ b/lib/diego/bbs/models/volume_mount_pb.rb @@ -1,30 +1,21 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! # source: volume_mount.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "diego.bbs.models.SharedDevice" do - optional :volume_id, :string, 1 - optional :mount_config, :string, 2 - end - add_message "diego.bbs.models.VolumeMount" do - optional :driver, :string, 1 - optional :container_dir, :string, 3 - optional :mode, :string, 6 - optional :shared, :message, 7, "diego.bbs.models.SharedDevice" - end - add_message "diego.bbs.models.VolumePlacement" do - repeated :driver_names, :string, 1 - end -end + +descriptor_data = "\n\x12volume_mount.proto\x12\x10\x64iego.bbs.models\"7\n\x0cSharedDevice\x12\x11\n\tvolume_id\x18\x01 \x01(\t\x12\x14\n\x0cmount_config\x18\x02 \x01(\t\"\x84\x01\n\x0bVolumeMount\x12\x0e\n\x06\x64river\x18\x01 \x01(\t\x12\x15\n\rcontainer_dir\x18\x03 \x01(\t\x12\x0c\n\x04mode\x18\x06 \x01(\t\x12.\n\x06shared\x18\x07 \x01(\x0b\x32\x1e.diego.bbs.models.SharedDeviceJ\x04\x08\x02\x10\x03J\x04\x08\x04\x10\x05J\x04\x08\x05\x10\x06\"\'\n\x0fVolumePlacement\x12\x14\n\x0c\x64river_names\x18\x01 \x03(\tb\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Diego module Bbs module Models - SharedDevice = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.SharedDevice").msgclass - VolumeMount = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.VolumeMount").msgclass - VolumePlacement = Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.VolumePlacement").msgclass + SharedDevice = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.SharedDevice").msgclass + VolumeMount = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.VolumeMount").msgclass + VolumePlacement = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("diego.bbs.models.VolumePlacement").msgclass end end end From 8d31562020ac7b39d58a25c9637419f97ee51475 Mon Sep 17 00:00:00 2001 From: Sven Krieger <37476281+svkrieger@users.noreply.github.com> Date: Thu, 15 May 2025 14:02:51 +0200 Subject: [PATCH 3/6] regenerate logcache and loggregator protobuf files --- .rubocop_cc.yml | 2 +- lib/logcache/client.rb | 4 +- lib/logcache/egress_pb.rb | 57 ++++--------- ...s_services_pb.rb => egress_services_pb.rb} | 11 ++- lib/logcache/ingress_pb.rb | 20 +++++ lib/logcache/ingress_services_pb.rb | 27 ++++++ lib/logcache/orchestration_pb.rb | 26 ++++++ lib/logcache/orchestration_services_pb.rb | 27 ++++++ lib/logcache/promql_pb.rb | 29 +++++++ lib/logcache/promql_services_pb.rb | 25 ++++++ lib/logcache/v2/envelope_pb.rb | 82 ------------------- lib/loggregator-api/v2/envelope_pb.rb | 26 ++++++ 12 files changed, 202 insertions(+), 134 deletions(-) rename lib/logcache/{logcache_egress_services_pb.rb => egress_services_pb.rb} (64%) create mode 100644 lib/logcache/ingress_pb.rb create mode 100644 lib/logcache/ingress_services_pb.rb create mode 100644 lib/logcache/orchestration_pb.rb create mode 100644 lib/logcache/orchestration_services_pb.rb create mode 100644 lib/logcache/promql_pb.rb create mode 100644 lib/logcache/promql_services_pb.rb delete mode 100644 lib/logcache/v2/envelope_pb.rb create mode 100644 lib/loggregator-api/v2/envelope_pb.rb diff --git a/.rubocop_cc.yml b/.rubocop_cc.yml index a77b4f10f32..7926c85dbb4 100644 --- a/.rubocop_cc.yml +++ b/.rubocop_cc.yml @@ -21,7 +21,7 @@ AllCops: - errors/**/* - lib/diego/bbs/models/**/* - lib/locket/**/* - - lib/logcache/v2/**/* + - lib/loggregator-api/v2/**/* - vendor/bundle/**/* Layout/DotPosition: EnforcedStyle: trailing diff --git a/lib/logcache/client.rb b/lib/logcache/client.rb index 28d6fb133f3..f0d842bc1a1 100644 --- a/lib/logcache/client.rb +++ b/lib/logcache/client.rb @@ -1,5 +1,5 @@ -require 'logcache/logcache_egress_services_pb' -require 'logcache/v2/envelope_pb' +require 'logcache/egress_services_pb' +require 'loggregator-api/v2/envelope_pb' module Logcache class Client diff --git a/lib/logcache/egress_pb.rb b/lib/logcache/egress_pb.rb index 9bd342e5ff1..1eceba60cba 100644 --- a/lib/logcache/egress_pb.rb +++ b/lib/logcache/egress_pb.rb @@ -1,54 +1,25 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: egress.proto - -# See README.md in this directory for the commands used to generate this file +# source: logcache/egress.proto require 'google/protobuf' -require 'logcache/v2/envelope_pb' +require 'loggregator-api/v2/envelope_pb' require 'google/api/annotations_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message 'logcache.v1.ReadRequest' do - optional :source_id, :string, 1 - optional :start_time, :int64, 2 - optional :end_time, :int64, 3 - optional :limit, :int64, 4 - repeated :envelope_types, :enum, 5, 'logcache.v1.EnvelopeType' - optional :descending, :bool, 6 - end - add_message 'logcache.v1.ReadResponse' do - optional :envelopes, :message, 1, 'loggregator.v2.EnvelopeBatch' - end - add_message 'logcache.v1.MetaRequest' do - optional :local_only, :bool, 1 - end - add_message 'logcache.v1.MetaResponse' do - map :meta, :string, :message, 1, 'logcache.v1.MetaInfo' - end - add_message 'logcache.v1.MetaInfo' do - optional :count, :int64, 1 - optional :expired, :int64, 2 - optional :oldest_timestamp, :int64, 3 - optional :newest_timestamp, :int64, 4 - end - add_enum 'logcache.v1.EnvelopeType' do - value :ANY, 0 - value :LOG, 1 - value :COUNTER, 2 - value :GAUGE, 3 - value :TIMER, 4 - value :EVENT, 5 - end -end + +descriptor_data = "\n\x15logcache/egress.proto\x12\x0blogcache.v1\x1a!loggregator-api/v2/envelope.proto\x1a\x1cgoogle/api/annotations.proto\"\xb1\x01\n\x0bReadRequest\x12\x11\n\tsource_id\x18\x01 \x01(\t\x12\x12\n\nstart_time\x18\x02 \x01(\x03\x12\x10\n\x08\x65nd_time\x18\x03 \x01(\x03\x12\r\n\x05limit\x18\x04 \x01(\x03\x12\x31\n\x0e\x65nvelope_types\x18\x05 \x03(\x0e\x32\x19.logcache.v1.EnvelopeType\x12\x12\n\ndescending\x18\x06 \x01(\x08\x12\x13\n\x0bname_filter\x18\x07 \x01(\t\"@\n\x0cReadResponse\x12\x30\n\tenvelopes\x18\x01 \x01(\x0b\x32\x1d.loggregator.v2.EnvelopeBatch\"!\n\x0bMetaRequest\x12\x12\n\nlocal_only\x18\x01 \x01(\x08\"\x85\x01\n\x0cMetaResponse\x12\x31\n\x04meta\x18\x01 \x03(\x0b\x32#.logcache.v1.MetaResponse.MetaEntry\x1a\x42\n\tMetaEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.logcache.v1.MetaInfo:\x02\x38\x01\"^\n\x08MetaInfo\x12\r\n\x05\x63ount\x18\x01 \x01(\x03\x12\x0f\n\x07\x65xpired\x18\x02 \x01(\x03\x12\x18\n\x10oldest_timestamp\x18\x03 \x01(\x03\x12\x18\n\x10newest_timestamp\x18\x04 \x01(\x03*N\n\x0c\x45nvelopeType\x12\x07\n\x03\x41NY\x10\x00\x12\x07\n\x03LOG\x10\x01\x12\x0b\n\x07\x43OUNTER\x10\x02\x12\t\n\x05GAUGE\x10\x03\x12\t\n\x05TIMER\x10\x04\x12\t\n\x05\x45VENT\x10\x05\x32\xbd\x01\n\x06\x45gress\x12`\n\x04Read\x12\x18.logcache.v1.ReadRequest\x1a\x19.logcache.v1.ReadResponse\"#\x82\xd3\xe4\x93\x02\x1d\x12\x1b/api/v1/read/{source_id=**}\x12Q\n\x04Meta\x12\x18.logcache.v1.MetaRequest\x1a\x19.logcache.v1.MetaResponse\"\x14\x82\xd3\xe4\x93\x02\x0e\x12\x0c/api/v1/metaB7Z5code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1b\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Logcache module V1 - ReadRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup('logcache.v1.ReadRequest').msgclass - ReadResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup('logcache.v1.ReadResponse').msgclass - MetaRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup('logcache.v1.MetaRequest').msgclass - MetaResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup('logcache.v1.MetaResponse').msgclass - MetaInfo = Google::Protobuf::DescriptorPool.generated_pool.lookup('logcache.v1.MetaInfo').msgclass - EnvelopeType = Google::Protobuf::DescriptorPool.generated_pool.lookup('logcache.v1.EnvelopeType').enummodule + ReadRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.ReadRequest").msgclass + ReadResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.ReadResponse").msgclass + MetaRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.MetaRequest").msgclass + MetaResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.MetaResponse").msgclass + MetaInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.MetaInfo").msgclass + EnvelopeType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.EnvelopeType").enummodule end end diff --git a/lib/logcache/logcache_egress_services_pb.rb b/lib/logcache/egress_services_pb.rb similarity index 64% rename from lib/logcache/logcache_egress_services_pb.rb rename to lib/logcache/egress_services_pb.rb index e3079d166fc..d992f790679 100644 --- a/lib/logcache/logcache_egress_services_pb.rb +++ b/lib/logcache/egress_services_pb.rb @@ -1,7 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# Source: egress.proto for package 'logcache.v1' - -# See README.md in this directory for the commands used to generate this file +# Source: logcache/egress.proto for package 'logcache.v1' require 'grpc' require 'logcache/egress_pb' @@ -11,14 +9,15 @@ module V1 module Egress # The egress service is used to read data from the LogCache system. class Service - include GRPC::GenericService + + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode self.service_name = 'logcache.v1.Egress' - rpc :Read, ReadRequest, ReadResponse - rpc :Meta, MetaRequest, MetaResponse + rpc :Read, ::Logcache::V1::ReadRequest, ::Logcache::V1::ReadResponse + rpc :Meta, ::Logcache::V1::MetaRequest, ::Logcache::V1::MetaResponse end Stub = Service.rpc_stub_class diff --git a/lib/logcache/ingress_pb.rb b/lib/logcache/ingress_pb.rb new file mode 100644 index 00000000000..0ee8b227b6e --- /dev/null +++ b/lib/logcache/ingress_pb.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: logcache/ingress.proto + +require 'google/protobuf' + +require 'loggregator-api/v2/envelope_pb' + + +descriptor_data = "\n\x16logcache/ingress.proto\x12\x0blogcache.v1\x1a!loggregator-api/v2/envelope.proto\"S\n\x0bSendRequest\x12\x30\n\tenvelopes\x18\x01 \x01(\x0b\x32\x1d.loggregator.v2.EnvelopeBatch\x12\x12\n\nlocal_only\x18\x02 \x01(\x08\"\x0e\n\x0cSendResponse2H\n\x07Ingress\x12=\n\x04Send\x12\x18.logcache.v1.SendRequest\x1a\x19.logcache.v1.SendResponse\"\x00\x42\x37Z5code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1b\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) + +module Logcache + module V1 + SendRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.SendRequest").msgclass + SendResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.SendResponse").msgclass + end +end diff --git a/lib/logcache/ingress_services_pb.rb b/lib/logcache/ingress_services_pb.rb new file mode 100644 index 00000000000..06015172e93 --- /dev/null +++ b/lib/logcache/ingress_services_pb.rb @@ -0,0 +1,27 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# Source: logcache/ingress.proto for package 'logcache.v1' + +require 'grpc' +require 'logcache/ingress_pb' + +module Logcache + module V1 + module Ingress + # The ingress service is used to write data into the LogCache system. + class Service + + include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'logcache.v1.Ingress' + + # Send is used to emit Envelopes batches into LogCache. The RPC function + # will not return until the data has been stored. + rpc :Send, ::Logcache::V1::SendRequest, ::Logcache::V1::SendResponse + end + + Stub = Service.rpc_stub_class + end + end +end diff --git a/lib/logcache/orchestration_pb.rb b/lib/logcache/orchestration_pb.rb new file mode 100644 index 00000000000..510788c2f91 --- /dev/null +++ b/lib/logcache/orchestration_pb.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: logcache/orchestration.proto + +require 'google/protobuf' + + +descriptor_data = "\n\x1clogcache/orchestration.proto\x12\x0blogcache.v1\"#\n\x05Range\x12\r\n\x05start\x18\x01 \x01(\x04\x12\x0b\n\x03\x65nd\x18\x02 \x01(\x04\",\n\x06Ranges\x12\"\n\x06ranges\x18\x01 \x03(\x0b\x32\x12.logcache.v1.Range\"4\n\x0f\x41\x64\x64RangeRequest\x12!\n\x05range\x18\x01 \x01(\x0b\x32\x12.logcache.v1.Range\"\x12\n\x10\x41\x64\x64RangeResponse\"7\n\x12RemoveRangeRequest\x12!\n\x05range\x18\x01 \x01(\x0b\x32\x12.logcache.v1.Range\"\x15\n\x13RemoveRangeResponse\"\x13\n\x11ListRangesRequest\"8\n\x12ListRangesResponse\x12\"\n\x06ranges\x18\x01 \x03(\x0b\x32\x12.logcache.v1.Range\"\x91\x01\n\x10SetRangesRequest\x12\x39\n\x06ranges\x18\x01 \x03(\x0b\x32).logcache.v1.SetRangesRequest.RangesEntry\x1a\x42\n\x0bRangesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.logcache.v1.Ranges:\x02\x38\x01\"\x13\n\x11SetRangesResponse2\xcd\x02\n\rOrchestration\x12I\n\x08\x41\x64\x64Range\x12\x1c.logcache.v1.AddRangeRequest\x1a\x1d.logcache.v1.AddRangeResponse\"\x00\x12R\n\x0bRemoveRange\x12\x1f.logcache.v1.RemoveRangeRequest\x1a .logcache.v1.RemoveRangeResponse\"\x00\x12O\n\nListRanges\x12\x1e.logcache.v1.ListRangesRequest\x1a\x1f.logcache.v1.ListRangesResponse\"\x00\x12L\n\tSetRanges\x12\x1d.logcache.v1.SetRangesRequest\x1a\x1e.logcache.v1.SetRangesResponse\"\x00\x42\x37Z5code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1b\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) + +module Logcache + module V1 + Range = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.Range").msgclass + Ranges = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.Ranges").msgclass + AddRangeRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.AddRangeRequest").msgclass + AddRangeResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.AddRangeResponse").msgclass + RemoveRangeRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.RemoveRangeRequest").msgclass + RemoveRangeResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.RemoveRangeResponse").msgclass + ListRangesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.ListRangesRequest").msgclass + ListRangesResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.ListRangesResponse").msgclass + SetRangesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.SetRangesRequest").msgclass + SetRangesResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.SetRangesResponse").msgclass + end +end diff --git a/lib/logcache/orchestration_services_pb.rb b/lib/logcache/orchestration_services_pb.rb new file mode 100644 index 00000000000..2b0aa7456dd --- /dev/null +++ b/lib/logcache/orchestration_services_pb.rb @@ -0,0 +1,27 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# Source: logcache/orchestration.proto for package 'logcache.v1' + +require 'grpc' +require 'logcache/orchestration_pb' + +module Logcache + module V1 + module Orchestration + class Service + + include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'logcache.v1.Orchestration' + + rpc :AddRange, ::Logcache::V1::AddRangeRequest, ::Logcache::V1::AddRangeResponse + rpc :RemoveRange, ::Logcache::V1::RemoveRangeRequest, ::Logcache::V1::RemoveRangeResponse + rpc :ListRanges, ::Logcache::V1::ListRangesRequest, ::Logcache::V1::ListRangesResponse + rpc :SetRanges, ::Logcache::V1::SetRangesRequest, ::Logcache::V1::SetRangesResponse + end + + Stub = Service.rpc_stub_class + end + end +end diff --git a/lib/logcache/promql_pb.rb b/lib/logcache/promql_pb.rb new file mode 100644 index 00000000000..aa5ec9e61ba --- /dev/null +++ b/lib/logcache/promql_pb.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: logcache/promql.proto + +require 'google/protobuf' + +require 'google/api/annotations_pb' + + +descriptor_data = "\n\x15logcache/promql.proto\x12\x0blogcache.v1\x1a\x1cgoogle/api/annotations.proto\"\xf4\x06\n\x06PromQL\x1a\x32\n\x13InstantQueryRequest\x12\r\n\x05query\x18\x01 \x01(\t\x12\x0c\n\x04time\x18\x02 \x01(\t\x1aL\n\x11RangeQueryRequest\x12\r\n\x05query\x18\x01 \x01(\t\x12\r\n\x05start\x18\x02 \x01(\t\x12\x0b\n\x03\x65nd\x18\x03 \x01(\t\x12\x0c\n\x04step\x18\x04 \x01(\t\x1a\xa8\x01\n\x12InstantQueryResult\x12,\n\x06scalar\x18\x01 \x01(\x0b\x32\x1a.logcache.v1.PromQL.ScalarH\x00\x12,\n\x06vector\x18\x02 \x01(\x0b\x32\x1a.logcache.v1.PromQL.VectorH\x00\x12,\n\x06matrix\x18\x03 \x01(\x0b\x32\x1a.logcache.v1.PromQL.MatrixH\x00\x42\x08\n\x06Result\x1aJ\n\x10RangeQueryResult\x12,\n\x06matrix\x18\x01 \x01(\x0b\x32\x1a.logcache.v1.PromQL.MatrixH\x00\x42\x08\n\x06Result\x1a%\n\x06Scalar\x12\x0c\n\x04time\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01\x1a\x35\n\x06Vector\x12+\n\x07samples\x18\x01 \x03(\x0b\x32\x1a.logcache.v1.PromQL.Sample\x1a$\n\x05Point\x12\x0c\n\x04time\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01\x1a\x99\x01\n\x06Sample\x12\x36\n\x06metric\x18\x01 \x03(\x0b\x32&.logcache.v1.PromQL.Sample.MetricEntry\x12(\n\x05point\x18\x02 \x01(\x0b\x32\x19.logcache.v1.PromQL.Point\x1a-\n\x0bMetricEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x34\n\x06Matrix\x12*\n\x06series\x18\x01 \x03(\x0b\x32\x1a.logcache.v1.PromQL.Series\x1a\x9a\x01\n\x06Series\x12\x36\n\x06metric\x18\x01 \x03(\x0b\x32&.logcache.v1.PromQL.Series.MetricEntry\x12)\n\x06points\x18\x02 \x03(\x0b\x32\x19.logcache.v1.PromQL.Point\x1a-\n\x0bMetricEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x32\xff\x01\n\rPromQLQuerier\x12v\n\x0cInstantQuery\x12\'.logcache.v1.PromQL.InstantQueryRequest\x1a&.logcache.v1.PromQL.InstantQueryResult\"\x15\x82\xd3\xe4\x93\x02\x0f\x12\r/api/v1/query\x12v\n\nRangeQuery\x12%.logcache.v1.PromQL.RangeQueryRequest\x1a$.logcache.v1.PromQL.RangeQueryResult\"\x1b\x82\xd3\xe4\x93\x02\x15\x12\x13/api/v1/query_rangeB7Z5code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1b\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) + +module Logcache + module V1 + PromQL = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL").msgclass + PromQL::InstantQueryRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.InstantQueryRequest").msgclass + PromQL::RangeQueryRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.RangeQueryRequest").msgclass + PromQL::InstantQueryResult = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.InstantQueryResult").msgclass + PromQL::RangeQueryResult = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.RangeQueryResult").msgclass + PromQL::Scalar = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.Scalar").msgclass + PromQL::Vector = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.Vector").msgclass + PromQL::Point = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.Point").msgclass + PromQL::Sample = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.Sample").msgclass + PromQL::Matrix = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.Matrix").msgclass + PromQL::Series = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("logcache.v1.PromQL.Series").msgclass + end +end diff --git a/lib/logcache/promql_services_pb.rb b/lib/logcache/promql_services_pb.rb new file mode 100644 index 00000000000..5438c28b519 --- /dev/null +++ b/lib/logcache/promql_services_pb.rb @@ -0,0 +1,25 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# Source: logcache/promql.proto for package 'logcache.v1' + +require 'grpc' +require 'logcache/promql_pb' + +module Logcache + module V1 + module PromQLQuerier + class Service + + include ::GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'logcache.v1.PromQLQuerier' + + rpc :InstantQuery, ::Logcache::V1::PromQL::InstantQueryRequest, ::Logcache::V1::PromQL::InstantQueryResult + rpc :RangeQuery, ::Logcache::V1::PromQL::RangeQueryRequest, ::Logcache::V1::PromQL::RangeQueryResult + end + + Stub = Service.rpc_stub_class + end + end +end diff --git a/lib/logcache/v2/envelope_pb.rb b/lib/logcache/v2/envelope_pb.rb deleted file mode 100644 index c8a7536b07b..00000000000 --- a/lib/logcache/v2/envelope_pb.rb +++ /dev/null @@ -1,82 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: envelope.proto - -# See the README.md file in logcache/ to see how this file was generated - -require 'google/protobuf' - -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message 'loggregator.v2.Envelope' do - optional :timestamp, :int64, 1 - optional :source_id, :string, 2 - optional :instance_id, :string, 8 - map :deprecated_tags, :string, :message, 3, 'loggregator.v2.Value' - map :tags, :string, :string, 9 - oneof :message do - optional :log, :message, 4, 'loggregator.v2.Log' - optional :counter, :message, 5, 'loggregator.v2.Counter' - optional :gauge, :message, 6, 'loggregator.v2.Gauge' - optional :timer, :message, 7, 'loggregator.v2.Timer' - optional :event, :message, 10, 'loggregator.v2.Event' - end - end - # envelope: { - # source_id: app_guid echoed back, - # gauge: ... - # } - add_message 'loggregator.v2.EnvelopeBatch' do - repeated :batch, :message, 1, 'loggregator.v2.Envelope' - end - add_message 'loggregator.v2.Value' do - oneof :data do - optional :text, :string, 1 - optional :integer, :int64, 2 - optional :decimal, :double, 3 - end - end - add_message 'loggregator.v2.Log' do - optional :payload, :bytes, 1 - optional :type, :enum, 2, 'loggregator.v2.Log.Type' - end - add_enum 'loggregator.v2.Log.Type' do - value :OUT, 0 - value :ERR, 1 - end - add_message 'loggregator.v2.Counter' do - optional :name, :string, 1 - optional :delta, :uint64, 2 - optional :total, :uint64, 3 - end - add_message 'loggregator.v2.Gauge' do - map :metrics, :string, :message, 1, 'loggregator.v2.GaugeValue' - end - # 'gauge': {'metrics': {'string': gaugeValue, 'string': gaugeValue, 'string': gaugeValue}} - add_message 'loggregator.v2.GaugeValue' do - optional :unit, :string, 1 - optional :value, :double, 2 - end - add_message 'loggregator.v2.Timer' do - optional :name, :string, 1 - optional :start, :int64, 2 - optional :stop, :int64, 3 - end - add_message 'loggregator.v2.Event' do - optional :title, :string, 1 - optional :body, :string, 2 - end -end - -module Loggregator - module V2 - Envelope = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.Envelope').msgclass - EnvelopeBatch = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.EnvelopeBatch').msgclass - Value = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.Value').msgclass - Log = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.Log').msgclass - Log::Type = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.Log.Type').enummodule - Counter = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.Counter').msgclass - Gauge = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.Gauge').msgclass - GaugeValue = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.GaugeValue').msgclass - Timer = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.Timer').msgclass - Event = Google::Protobuf::DescriptorPool.generated_pool.lookup('loggregator.v2.Event').msgclass - end -end diff --git a/lib/loggregator-api/v2/envelope_pb.rb b/lib/loggregator-api/v2/envelope_pb.rb new file mode 100644 index 00000000000..e510bb2125e --- /dev/null +++ b/lib/loggregator-api/v2/envelope_pb.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: loggregator-api/v2/envelope.proto + +require 'google/protobuf' + + +descriptor_data = "\n!loggregator-api/v2/envelope.proto\x12\x0eloggregator.v2\"\xb5\x04\n\x08\x45nvelope\x12\x11\n\ttimestamp\x18\x01 \x01(\x03\x12\x1c\n\tsource_id\x18\x02 \x01(\tR\tsource_id\x12 \n\x0binstance_id\x18\x08 \x01(\tR\x0binstance_id\x12V\n\x0f\x64\x65precated_tags\x18\x03 \x03(\x0b\x32,.loggregator.v2.Envelope.DeprecatedTagsEntryR\x0f\x64\x65precated_tags\x12\x30\n\x04tags\x18\t \x03(\x0b\x32\".loggregator.v2.Envelope.TagsEntry\x12\"\n\x03log\x18\x04 \x01(\x0b\x32\x13.loggregator.v2.LogH\x00\x12*\n\x07\x63ounter\x18\x05 \x01(\x0b\x32\x17.loggregator.v2.CounterH\x00\x12&\n\x05gauge\x18\x06 \x01(\x0b\x32\x15.loggregator.v2.GaugeH\x00\x12&\n\x05timer\x18\x07 \x01(\x0b\x32\x15.loggregator.v2.TimerH\x00\x12&\n\x05\x65vent\x18\n \x01(\x0b\x32\x15.loggregator.v2.EventH\x00\x1aL\n\x13\x44\x65precatedTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.loggregator.v2.Value:\x02\x38\x01\x1a+\n\tTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\t\n\x07message\"8\n\rEnvelopeBatch\x12\'\n\x05\x62\x61tch\x18\x01 \x03(\x0b\x32\x18.loggregator.v2.Envelope\"E\n\x05Value\x12\x0e\n\x04text\x18\x01 \x01(\tH\x00\x12\x11\n\x07integer\x18\x02 \x01(\x03H\x00\x12\x11\n\x07\x64\x65\x63imal\x18\x03 \x01(\x01H\x00\x42\x06\n\x04\x64\x61ta\"X\n\x03Log\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12&\n\x04type\x18\x02 \x01(\x0e\x32\x18.loggregator.v2.Log.Type\"\x18\n\x04Type\x12\x07\n\x03OUT\x10\x00\x12\x07\n\x03\x45RR\x10\x01\"5\n\x07\x43ounter\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05\x64\x65lta\x18\x02 \x01(\x04\x12\r\n\x05total\x18\x03 \x01(\x04\"\x88\x01\n\x05Gauge\x12\x33\n\x07metrics\x18\x01 \x03(\x0b\x32\".loggregator.v2.Gauge.MetricsEntry\x1aJ\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.loggregator.v2.GaugeValue:\x02\x38\x01\")\n\nGaugeValue\x12\x0c\n\x04unit\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01\"2\n\x05Timer\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05start\x18\x02 \x01(\x03\x12\x0c\n\x04stop\x18\x03 \x01(\x03\"$\n\x05\x45vent\x12\r\n\x05title\x18\x01 \x01(\t\x12\x0c\n\x04\x62ody\x18\x02 \x01(\tBs\n\x1forg.cloudfoundry.loggregator.v2B\x13LoggregatorEnvelopeZ;code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2b\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) + +module Loggregator + module V2 + Envelope = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.Envelope").msgclass + EnvelopeBatch = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.EnvelopeBatch").msgclass + Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.Value").msgclass + Log = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.Log").msgclass + Log::Type = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.Log.Type").enummodule + Counter = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.Counter").msgclass + Gauge = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.Gauge").msgclass + GaugeValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.GaugeValue").msgclass + Timer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.Timer").msgclass + Event = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("loggregator.v2.Event").msgclass + end +end From f62448681d5cf5f1b7aced9da231761a321ae7db Mon Sep 17 00:00:00 2001 From: Sven Krieger <37476281+svkrieger@users.noreply.github.com> Date: Thu, 15 May 2025 17:14:37 +0200 Subject: [PATCH 4/6] regenerate locket protobuf files --- .rubocop_cc.yml | 3 +- lib/locket/locket_pb.rb | 66 ++++++++------------------------ lib/locket/locket_services_pb.rb | 13 ++++--- 3 files changed, 26 insertions(+), 56 deletions(-) diff --git a/.rubocop_cc.yml b/.rubocop_cc.yml index 7926c85dbb4..2c9b88101d4 100644 --- a/.rubocop_cc.yml +++ b/.rubocop_cc.yml @@ -21,7 +21,8 @@ AllCops: - errors/**/* - lib/diego/bbs/models/**/* - lib/locket/**/* - - lib/loggregator-api/v2/**/* + - lib/loggregator-api/**/* + - lib/logcache/*_pb.rb - vendor/bundle/**/* Layout/DotPosition: EnforcedStyle: trailing diff --git a/lib/locket/locket_pb.rb b/lib/locket/locket_pb.rb index e191c36d713..fcbf24817a1 100644 --- a/lib/locket/locket_pb.rb +++ b/lib/locket/locket_pb.rb @@ -1,56 +1,24 @@ +# frozen_string_literal: true # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: locket.proto +# source: locket/locket.proto require 'google/protobuf' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_message "models.Resource" do - optional :key, :string, 1 - optional :owner, :string, 2 - optional :value, :string, 3 - optional :type, :string, 4 - optional :type_code, :enum, 5, "models.TypeCode" - end - add_message "models.LockRequest" do - optional :resource, :message, 1, "models.Resource" - optional :ttl_in_seconds, :int64, 2 - end - add_message "models.LockResponse" do - end - add_message "models.ReleaseRequest" do - optional :resource, :message, 1, "models.Resource" - end - add_message "models.ReleaseResponse" do - end - add_message "models.FetchRequest" do - optional :key, :string, 1 - end - add_message "models.FetchResponse" do - optional :resource, :message, 1, "models.Resource" - end - add_message "models.FetchAllRequest" do - optional :type, :string, 1 - optional :type_code, :enum, 2, "models.TypeCode" - end - add_message "models.FetchAllResponse" do - repeated :resources, :message, 1, "models.Resource" - end - add_enum "models.TypeCode" do - value :UNKNOWN, 0 - value :LOCK, 1 - value :PRESENCE, 2 - end -end + +descriptor_data = "\n\x13locket/locket.proto\x12\x06models\"l\n\x08Resource\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05owner\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\x12\x10\n\x04type\x18\x04 \x01(\tB\x02\x18\x01\x12#\n\ttype_code\x18\x05 \x01(\x0e\x32\x10.models.TypeCode\"I\n\x0bLockRequest\x12\"\n\x08resource\x18\x01 \x01(\x0b\x32\x10.models.Resource\x12\x16\n\x0ettl_in_seconds\x18\x02 \x01(\x03\"\x0e\n\x0cLockResponse\"4\n\x0eReleaseRequest\x12\"\n\x08resource\x18\x01 \x01(\x0b\x32\x10.models.Resource\"\x11\n\x0fReleaseResponse\"\x1b\n\x0c\x46\x65tchRequest\x12\x0b\n\x03key\x18\x01 \x01(\t\"3\n\rFetchResponse\x12\"\n\x08resource\x18\x01 \x01(\x0b\x32\x10.models.Resource\"H\n\x0f\x46\x65tchAllRequest\x12\x10\n\x04type\x18\x01 \x01(\tB\x02\x18\x01\x12#\n\ttype_code\x18\x02 \x01(\x0e\x32\x10.models.TypeCode\"7\n\x10\x46\x65tchAllResponse\x12#\n\tresources\x18\x01 \x03(\x0b\x32\x10.models.Resource*/\n\x08TypeCode\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04LOCK\x10\x01\x12\x0c\n\x08PRESENCE\x10\x02\x32\xf4\x01\n\x06Locket\x12\x33\n\x04Lock\x12\x13.models.LockRequest\x1a\x14.models.LockResponse\"\x00\x12\x36\n\x05\x46\x65tch\x12\x14.models.FetchRequest\x1a\x15.models.FetchResponse\"\x00\x12<\n\x07Release\x12\x16.models.ReleaseRequest\x1a\x17.models.ReleaseResponse\"\x00\x12?\n\x08\x46\x65tchAll\x12\x17.models.FetchAllRequest\x1a\x18.models.FetchAllResponse\"\x00\x62\x06proto3" + +pool = Google::Protobuf::DescriptorPool.generated_pool +pool.add_serialized_file(descriptor_data) module Models - Resource = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.Resource").msgclass - LockRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.LockRequest").msgclass - LockResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.LockResponse").msgclass - ReleaseRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.ReleaseRequest").msgclass - ReleaseResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.ReleaseResponse").msgclass - FetchRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.FetchRequest").msgclass - FetchResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.FetchResponse").msgclass - FetchAllRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.FetchAllRequest").msgclass - FetchAllResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.FetchAllResponse").msgclass - TypeCode = Google::Protobuf::DescriptorPool.generated_pool.lookup("models.TypeCode").enummodule + Resource = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.Resource").msgclass + LockRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.LockRequest").msgclass + LockResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.LockResponse").msgclass + ReleaseRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.ReleaseRequest").msgclass + ReleaseResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.ReleaseResponse").msgclass + FetchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.FetchRequest").msgclass + FetchResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.FetchResponse").msgclass + FetchAllRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.FetchAllRequest").msgclass + FetchAllResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.FetchAllResponse").msgclass + TypeCode = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("models.TypeCode").enummodule end diff --git a/lib/locket/locket_services_pb.rb b/lib/locket/locket_services_pb.rb index 36d59888980..a8f9d95382e 100644 --- a/lib/locket/locket_services_pb.rb +++ b/lib/locket/locket_services_pb.rb @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# Source: locket.proto for package 'models' +# Source: locket/locket.proto for package 'models' require 'grpc' require 'locket/locket_pb' @@ -7,16 +7,17 @@ module Models module Locket class Service - include GRPC::GenericService + + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode self.service_name = 'models.Locket' - rpc :Lock, LockRequest, LockResponse - rpc :Fetch, FetchRequest, FetchResponse - rpc :Release, ReleaseRequest, ReleaseResponse - rpc :FetchAll, FetchAllRequest, FetchAllResponse + rpc :Lock, ::Models::LockRequest, ::Models::LockResponse + rpc :Fetch, ::Models::FetchRequest, ::Models::FetchResponse + rpc :Release, ::Models::ReleaseRequest, ::Models::ReleaseResponse + rpc :FetchAll, ::Models::FetchAllRequest, ::Models::FetchAllResponse end Stub = Service.rpc_stub_class From 805210e71a3e61d95010c9e9abeefa3864c9a43b Mon Sep 17 00:00:00 2001 From: Sven Krieger <37476281+svkrieger@users.noreply.github.com> Date: Mon, 19 May 2025 12:04:09 +0200 Subject: [PATCH 5/6] Use protoc 30.2 in bump_bbs_protos action --- .github/workflows/bump_bbs_protos.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/bump_bbs_protos.yml b/.github/workflows/bump_bbs_protos.yml index 4f2cd4476f5..92254d6cb96 100644 --- a/.github/workflows/bump_bbs_protos.yml +++ b/.github/workflows/bump_bbs_protos.yml @@ -26,28 +26,22 @@ jobs: - name: Install protoc run: | - wget -q -O /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip - sudo unzip -q /tmp/protoc.zip -d /usr/local + wget -q -O /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip + unzip -q /tmp/protoc.zip -d /tmp/protoc rm /tmp/protoc.zip - wget -q -O /tmp/protobuf.zip https://github.com/protocolbuffers/protobuf/archive/v3.6.1.zip - unzip -q /tmp/protobuf.zip -d /tmp - sudo cp -r /tmp/protobuf-3.6.1/src/google /usr/local/include/ + + sudo mv /tmp/protoc/bin/protoc /usr/local/bin/protoc + sudo cp -r /tmp/protoc/include/google /usr/local/include/ sudo chmod -R 755 /usr/local/include/google - rm -rf /tmp/protobuf.zip /tmp/protobuf-3.6.1 + rm -rf /tmp/protoc export PATH=$PATH:/usr/local/bin - - name: Clone gogo/protobuf - run: | - PROTO_SRC=$(mktemp -d) - git clone https://github.com/gogo/protobuf.git "$PROTO_SRC/github.com/gogo/protobuf" - echo "PROTO_SRC=$PROTO_SRC" >> $GITHUB_ENV - - name: Generate Ruby files from protos run: | RUBY_OUT=$(mktemp -d) pushd bbs > /dev/null - sed -i'' -e 's/package models/package diego.bbs.models/' models/*.proto - protoc --proto_path="$PROTO_SRC":models --ruby_out="$RUBY_OUT" models/*.proto + sed -i'' -E '/import.*gogoproto/d; /option.*gogoproto/d; s/\(gogoproto.*, //g; s/, \(gogoproto[^]]+//g; s/\[\(gogoproto[^]]*\]//g; s/package models/package diego.bbs.models/' models/*.proto + protoc --proto_path=models --ruby_out="$RUBY_OUT" models/*.proto popd > /dev/null cp -r "$RUBY_OUT/." cloud_controller_ng/lib/diego/bbs/models From 5efea146b3ece3df9f1b0ab0a8ee442b88ac4e34 Mon Sep 17 00:00:00 2001 From: Sven Krieger <37476281+svkrieger@users.noreply.github.com> Date: Mon, 19 May 2025 12:05:10 +0200 Subject: [PATCH 6/6] Update/create readme for generating protobuf files for logcache, loggregator and locket --- lib/locket/README.md | 29 ++++++++++++++ lib/logcache/README.md | 72 ++++++++++------------------------- lib/loggregator-api/README.md | 19 +++++++++ 3 files changed, 68 insertions(+), 52 deletions(-) create mode 100644 lib/locket/README.md create mode 100644 lib/loggregator-api/README.md diff --git a/lib/locket/README.md b/lib/locket/README.md new file mode 100644 index 00000000000..280ff72947d --- /dev/null +++ b/lib/locket/README.md @@ -0,0 +1,29 @@ +To generate the locket protobuf files: + +1. Install protoc 30.2 from https://github.com/protocolbuffers/protobuf/releases + +2. Generate protobuf files: + +``` +#!/bin/bash + +gem install grpc-tools + +tmp_dir=$(mktemp -d) +echo "Temp dir: $tmp_dir" + +pushd $tmp_dir + git clone --depth 1 "https://github.com/cloudfoundry/locket.git" + mv locket/models/locket.proto locket/ +popd + +out_dir=$(mktemp -d) +echo "Out dir: $out_dir" +RUBY_OUT=$out_dir/ruby-out +GRPC_OUT=$out_dir/grpc-out +mkdir -p $RUBY_OUT $GRPC_OUT + +protoc --plugin=protoc-gen-grpc=`which grpc_tools_ruby_protoc_plugin` --proto_path=$tmp_dir --ruby_out=$RUBY_OUT --grpc_out=$GRPC_OUT $tmp_dir/locket/locket.proto +``` + +3. Copy `$out_dir/ruby_out/locket/*` and `$out_dir/grpc_out/locket` into `lib/locket`. diff --git a/lib/logcache/README.md b/lib/logcache/README.md index bccf7a43cf8..ddae1ea41c4 100644 --- a/lib/logcache/README.md +++ b/lib/logcache/README.md @@ -1,68 +1,36 @@ -This is taken from code.cloudfoundry.org/go-log-cache/rpc/logcache_v1/generate.sh +This is taken from [github.com/cloudfoundry/go-log-cache/rpc/logcache_v1/generate.sh](https://github.com/cloudfoundry/go-log-cache/blob/main/rpc/logcache_v1/generate.sh) -To generate the two logcache egress*pb.rb files: +1. Install protoc 30.2 from https://github.com/protocolbuffers/protobuf/releases -`grpc_tools_ruby_protoc` comes from doing `gem install grpc-tools` +2. Generate protobuf files: ``` #!/bin/bash - -go get github.com/golang/protobuf/{proto,protoc-gen-go} -go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway -go get code.cloudfoundry.org/log-cache +gem install grpc-tools tmp_dir=$(mktemp -d) -mkdir -p $tmp_dir/log-cache - -trash_dir=$(mktemp -d) - -cp $GOPATH/src/code.cloudfoundry.org/log-cache/api/v1/*proto $tmp_dir/log-cache +echo "Temp dir: $tmp_dir" +mkdir -p $tmp_dir/logcache pushd $tmp_dir - git clone https://github.com/cloudfoundry/loggregator-api + git clone --depth 1 https://github.com/cloudfoundry/loggregator-api.git + git clone --depth 1 https://github.com/googleapis/googleapis.git + mv googleapis/google . + rm -rf googleapis + + git clone --depth 1 https://github.com/cloudfoundry/go-log-cache.git + cp go-log-cache/api/v1/*.proto logcache/ + rm -rf go-log-cache popd -RUBY_OUT=$trash_dir/log-cache/ruby-out -GRPC_OUT=$trash_dir/log-cache/grpc-out -mkdir -p $RUBY_OUT $GRPC_OUT -grpc_tools_ruby_protoc \ - $tmp_dir/log-cache/*.proto \ - --go_out=plugins=grpc,Mv2/envelope.proto=code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2:. \ - --ruby_out=$RUBY_OUT \ - --grpc_out=$GRPC_OUT \ - --proto_path=$tmp_dir/log-cache \ - --grpc-gateway_out=logtostderr=true:. \ - -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \ - -I=/usr/local/include \ - -I=$tmp_dir/log-cache \ - -I=$tmp_dir/loggregator-api/. -``` - -You want `$trash_dir/log-cache/ruby-out/egress_pb.rb` and `$trash_dir/log-cache/grpc-out/egress_services_pb.rb` - - -To generate the two v2/envelope_pb.rb file: - -``` -mkdir -p $tmp_dir/loggregator-api -cp $GOPATH/src/code.cloudfoundry.org/loggregator-api/v2/*proto $tmp_dir/loggregator-api/ - -RUBY_OUT=$trash_dir/loggregator-api/ruby-out -GRPC_OUT=$trash_dir/loggregator-api/grpc-out +out_dir=$(mktemp -d) +echo "Out dir: $out_dir" +RUBY_OUT=$out_dir/ruby-out +GRPC_OUT=$out_dir/grpc-out mkdir -p $RUBY_OUT $GRPC_OUT -grpc_tools_ruby_protoc \ - $tmp_dir/loggregator-api/*.proto \ - --go_out=plugins=grpc,Mv2/envelope.proto=code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2:. \ - --ruby_out=$RUBY_OUT \ - --grpc_out=$GRPC_OUT \ - --proto_path=$tmp_dir/loggregator-api \ - --grpc-gateway_out=logtostderr=true:. \ - -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \ - -I=/usr/local/include \ - -I=$tmp_dir/log-cache \ - -I=$GOPATH/src/code.cloudfoundry.org/loggregator-api/. +protoc --plugin=protoc-gen-grpc=`which grpc_tools_ruby_protoc_plugin` --proto_path=$tmp_dir --ruby_out=$RUBY_OUT --grpc_out=$GRPC_OUT $tmp_dir/logcache/*.proto ``` -You want `$trash_dir/ruby-out/envelope_pb.rb` +3. Copy `$out_dir/ruby_out/logcache/*` and `$out_dir/grpc_out/logcache` into `lib/logcache`. diff --git a/lib/loggregator-api/README.md b/lib/loggregator-api/README.md new file mode 100644 index 00000000000..746f12e3a0d --- /dev/null +++ b/lib/loggregator-api/README.md @@ -0,0 +1,19 @@ +To generate the envelope_pb.rb file: + +1. Install protoc 30.2 from https://github.com/protocolbuffers/protobuf/releases + +2. Generate protobuf files: + +``` +#!/bin/bash + +tmp_dir=$(mktemp -d) + +pushd $tmp_dir + git clone https://github.com/cloudfoundry/loggregator-api + + protoc --ruby_out=. loggregator-api/v2/envelope.proto +popd +``` + +3. Copy `$tmp_dir/envelope_pb.rb` to CC's `lib/loggregator-api/v2/`. \ No newline at end of file