From 1a6aeb5811a41d8df1a99f85e0f2bbc05ca3983f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 2 Feb 2021 15:01:19 -0800 Subject: [PATCH] Update proto file locations --- lib/vagrant/proto/gen/plugin/core_pb.rb | 231 ----------------- .../proto/gen/plugin/core_services_pb.rb | 40 --- .../proto}/protostructure_pb.rb | 0 .../proto/ruby_vagrant}/ruby-server_pb.rb | 4 +- .../ruby_vagrant}/ruby-server_services_pb.rb | 4 +- .../proto/vagrant_plugin_sdk}/plugin_pb.rb | 244 +++++++++++++++++- .../vagrant_plugin_sdk}/plugin_services_pb.rb | 37 ++- .../proto/vagrant_server}/server_pb.rb | 42 +-- .../vagrant_server}/server_services_pb.rb | 4 +- 9 files changed, 305 insertions(+), 301 deletions(-) delete mode 100644 lib/vagrant/proto/gen/plugin/core_pb.rb delete mode 100644 lib/vagrant/proto/gen/plugin/core_services_pb.rb rename lib/vagrant/{proto/gen/plugin => protobufs/proto}/protostructure_pb.rb (100%) rename lib/vagrant/{proto/gen => protobufs/proto/ruby_vagrant}/ruby-server_pb.rb (95%) rename lib/vagrant/{proto/gen => protobufs/proto/ruby_vagrant}/ruby-server_services_pb.rb (85%) rename lib/vagrant/{proto/gen/plugin => protobufs/proto/vagrant_plugin_sdk}/plugin_pb.rb (62%) rename lib/vagrant/{proto/gen/plugin => protobufs/proto/vagrant_plugin_sdk}/plugin_services_pb.rb (83%) rename lib/vagrant/{proto/gen/internal/server/proto => protobufs/proto/vagrant_server}/server_pb.rb (97%) rename lib/vagrant/{proto/gen/internal/server/proto => protobufs/proto/vagrant_server}/server_services_pb.rb (98%) diff --git a/lib/vagrant/proto/gen/plugin/core_pb.rb b/lib/vagrant/proto/gen/plugin/core_pb.rb deleted file mode 100644 index 0a394dff8..000000000 --- a/lib/vagrant/proto/gen/plugin/core_pb.rb +++ /dev/null @@ -1,231 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: core.proto - -require 'google/protobuf' - -require 'plugin_pb' -require 'google/protobuf/any_pb' -require 'google/protobuf/timestamp_pb' -Google::Protobuf::DescriptorPool.generated_pool.build do - add_file("core.proto", :syntax => :proto3) do - add_message "hashicorp.vagrant.sdk.StateBag" do - map :data, :string, :message, 1, "hashicorp.vagrant.sdk.StateBag.Value" - end - add_message "hashicorp.vagrant.sdk.StateBag.Value" do - oneof :value do - optional :text, :string, 1 - optional :map, :message, 2, "google.protobuf.Any" - end - end - add_message "hashicorp.vagrant.sdk.LabelSet" do - map :labels, :string, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Options" do - optional :opt, :message, 1, "hashicorp.vagrant.sdk.LabelSet" - end - add_message "hashicorp.vagrant.sdk.SSHInfo" do - optional :host, :string, 1 - optional :port, :string, 2 - optional :private_key_path, :string, 3 - optional :keys_only, :bool, 4 - optional :verify_host_key, :bool, 5 - optional :username, :string, 6 - optional :remote_user, :string, 7 - optional :compression, :bool, 8 - optional :dsa_authentication, :bool, 9 - optional :config, :string, 10 - repeated :extra_args, :string, 11 - optional :forward_agent, :bool, 12 - optional :forward_x11, :bool, 13 - repeated :forward_env, :string, 14 - optional :connect_timeout, :int64, 15 - optional :ssh_command, :string, 16 - optional :proxy_command, :string, 17 - end - add_message "hashicorp.vagrant.sdk.WinrmInfo" do - optional :username, :string, 1 - optional :password, :string, 2 - optional :host, :string, 3 - optional :port, :int64, 4 - optional :guest_port, :int64, 5 - optional :max_tries, :int64, 6 - optional :retry_delay, :int64, 7 - optional :timeout, :int64, 8 - optional :transport, :enum, 9, "hashicorp.vagrant.sdk.WinrmInfo.Transport" - optional :ssl_peer_verification, :bool, 10 - optional :execution_time_limit, :string, 11 - optional :basic_auth_only, :bool, 12 - optional :codepage, :string, 13 - end - add_enum "hashicorp.vagrant.sdk.WinrmInfo.Transport" do - value :NEGOTIATE, 0 - value :SSL, 1 - value :PLAINTEXT, 2 - end - add_message "hashicorp.vagrant.sdk.MachineState" do - optional :id, :string, 1 - optional :short_description, :string, 2 - optional :long_description, :string, 3 - end - add_message "hashicorp.vagrant.sdk.MachineIndex" do - end - add_message "hashicorp.vagrant.sdk.MachineIndex.Entry" do - optional :id, :string, 1 - optional :local_data_path, :string, 2 - optional :name, :string, 3 - optional :provider, :string, 4 - optional :state, :string, 5 - optional :vagrantfile_name, :string, 6 - optional :vagrantfile_path, :string, 7 - optional :updated_at, :string, 8 - optional :extra_data, :message, 9, "hashicorp.vagrant.sdk.Options" - end - add_message "hashicorp.vagrant.sdk.BoxCollection" do - optional :directory, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Box" do - optional :name, :string, 1 - optional :provider, :string, 2 - optional :version, :string, 3 - optional :directory, :string, 4 - optional :metadata, :message, 5, "hashicorp.vagrant.sdk.Options" - optional :metadata_url, :string, 6 - end - add_message "hashicorp.vagrant.sdk.Environment" do - end - add_message "hashicorp.vagrant.sdk.MachineProvider" do - end - add_message "hashicorp.vagrant.sdk.Configuration" do - end - add_message "hashicorp.vagrant.sdk.Vagrantfile" do - end - add_message "hashicorp.vagrant.sdk.Ref" do - end - add_message "hashicorp.vagrant.sdk.Ref.Machine" do - optional :resource_id, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Machine" do - end - add_message "hashicorp.vagrant.sdk.Machine.SetNameRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - optional :name, :string, 2 - end - add_message "hashicorp.vagrant.sdk.Machine.SetNameResponse" do - end - add_message "hashicorp.vagrant.sdk.Machine.GetNameRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.GetNameResponse" do - optional :name, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Machine.SetIDRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - optional :id, :string, 2 - end - add_message "hashicorp.vagrant.sdk.Machine.SetIDResponse" do - end - add_message "hashicorp.vagrant.sdk.Machine.GetIDRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.GetIDResponse" do - optional :id, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Machine.BoxRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.BoxResponse" do - optional :box, :message, 1, "hashicorp.vagrant.sdk.Box" - end - add_message "hashicorp.vagrant.sdk.Machine.DatadirRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.DatadirResponse" do - optional :datadir, :message, 1, "hashicorp.vagrant.sdk.Args.DataDir.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.LocalDataPathRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.LocalDataPathResponse" do - optional :path, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Machine.ProviderRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.ProviderResponse" do - end - add_message "hashicorp.vagrant.sdk.Machine.VagrantfileNameRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.VagrantfileNameResponse" do - optional :name, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Machine.VagrantfilePathRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.VagrantfilePathResponse" do - optional :path, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Machine.UpdatedAtRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.UpdatedAtResponse" do - optional :updated_at, :message, 1, "google.protobuf.Timestamp" - end - add_message "hashicorp.vagrant.sdk.Machine.UIRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" - end - add_message "hashicorp.vagrant.sdk.Machine.UIResponse" do - optional :ui, :message, 1, "hashicorp.vagrant.sdk.Args.TerminalUI" - end - end -end - -module Hashicorp - module Vagrant - module Sdk - StateBag = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.StateBag").msgclass - StateBag::Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.StateBag.Value").msgclass - LabelSet = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.LabelSet").msgclass - Options = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Options").msgclass - SSHInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.SSHInfo").msgclass - WinrmInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.WinrmInfo").msgclass - WinrmInfo::Transport = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.WinrmInfo.Transport").enummodule - MachineState = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.MachineState").msgclass - MachineIndex = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.MachineIndex").msgclass - MachineIndex::Entry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.MachineIndex.Entry").msgclass - BoxCollection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.BoxCollection").msgclass - Box = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box").msgclass - Environment = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Environment").msgclass - MachineProvider = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.MachineProvider").msgclass - Configuration = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Configuration").msgclass - Vagrantfile = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Vagrantfile").msgclass - Ref = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref").msgclass - Ref::Machine = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref.Machine").msgclass - Machine = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine").msgclass - Machine::SetNameRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetNameRequest").msgclass - Machine::SetNameResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetNameResponse").msgclass - Machine::GetNameRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetNameRequest").msgclass - Machine::GetNameResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetNameResponse").msgclass - Machine::SetIDRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetIDRequest").msgclass - Machine::SetIDResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetIDResponse").msgclass - Machine::GetIDRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetIDRequest").msgclass - Machine::GetIDResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetIDResponse").msgclass - Machine::BoxRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.BoxRequest").msgclass - Machine::BoxResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.BoxResponse").msgclass - Machine::DatadirRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.DatadirRequest").msgclass - Machine::DatadirResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.DatadirResponse").msgclass - Machine::LocalDataPathRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.LocalDataPathRequest").msgclass - Machine::LocalDataPathResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.LocalDataPathResponse").msgclass - Machine::ProviderRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.ProviderRequest").msgclass - Machine::ProviderResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.ProviderResponse").msgclass - Machine::VagrantfileNameRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.VagrantfileNameRequest").msgclass - Machine::VagrantfileNameResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.VagrantfileNameResponse").msgclass - Machine::VagrantfilePathRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.VagrantfilePathRequest").msgclass - Machine::VagrantfilePathResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.VagrantfilePathResponse").msgclass - Machine::UpdatedAtRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.UpdatedAtRequest").msgclass - Machine::UpdatedAtResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.UpdatedAtResponse").msgclass - Machine::UIRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.UIRequest").msgclass - Machine::UIResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.UIResponse").msgclass - end - end -end diff --git a/lib/vagrant/proto/gen/plugin/core_services_pb.rb b/lib/vagrant/proto/gen/plugin/core_services_pb.rb deleted file mode 100644 index d39f18207..000000000 --- a/lib/vagrant/proto/gen/plugin/core_services_pb.rb +++ /dev/null @@ -1,40 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# Source: core.proto for package 'hashicorp.vagrant.sdk' - -require 'grpc' -require 'core_pb' - -module Hashicorp - module Vagrant - module Sdk - module MachineService - # ******************************************************************* - # Machine services - # ****************************************************************** - class Service - - include GRPC::GenericService - - self.marshal_class_method = :encode - self.unmarshal_class_method = :decode - self.service_name = 'hashicorp.vagrant.sdk.MachineService' - - rpc :SetName, ::Hashicorp::Vagrant::Sdk::Machine::SetNameRequest, ::Hashicorp::Vagrant::Sdk::Machine::SetNameResponse - rpc :GetName, ::Hashicorp::Vagrant::Sdk::Machine::GetNameRequest, ::Hashicorp::Vagrant::Sdk::Machine::GetNameResponse - rpc :SetID, ::Hashicorp::Vagrant::Sdk::Machine::SetIDRequest, ::Hashicorp::Vagrant::Sdk::Machine::SetIDResponse - rpc :GetID, ::Hashicorp::Vagrant::Sdk::Machine::GetIDRequest, ::Hashicorp::Vagrant::Sdk::Machine::GetIDResponse - rpc :Box, ::Hashicorp::Vagrant::Sdk::Machine::BoxRequest, ::Hashicorp::Vagrant::Sdk::Machine::BoxResponse - rpc :Datadir, ::Hashicorp::Vagrant::Sdk::Machine::DatadirRequest, ::Hashicorp::Vagrant::Sdk::Machine::DatadirResponse - rpc :LocalDataPath, ::Hashicorp::Vagrant::Sdk::Machine::LocalDataPathRequest, ::Hashicorp::Vagrant::Sdk::Machine::LocalDataPathResponse - rpc :Provider, ::Hashicorp::Vagrant::Sdk::Machine::ProviderRequest, ::Hashicorp::Vagrant::Sdk::Machine::ProviderResponse - rpc :VagrantfileName, ::Hashicorp::Vagrant::Sdk::Machine::VagrantfileNameRequest, ::Hashicorp::Vagrant::Sdk::Machine::VagrantfileNameResponse - rpc :VagrantfilePath, ::Hashicorp::Vagrant::Sdk::Machine::VagrantfilePathRequest, ::Hashicorp::Vagrant::Sdk::Machine::VagrantfilePathResponse - rpc :UpdatedAt, ::Hashicorp::Vagrant::Sdk::Machine::UpdatedAtRequest, ::Hashicorp::Vagrant::Sdk::Machine::UpdatedAtResponse - rpc :UI, ::Hashicorp::Vagrant::Sdk::Machine::UIRequest, ::Hashicorp::Vagrant::Sdk::Machine::UIResponse - end - - Stub = Service.rpc_stub_class - end - end - end -end diff --git a/lib/vagrant/proto/gen/plugin/protostructure_pb.rb b/lib/vagrant/protobufs/proto/protostructure_pb.rb similarity index 100% rename from lib/vagrant/proto/gen/plugin/protostructure_pb.rb rename to lib/vagrant/protobufs/proto/protostructure_pb.rb diff --git a/lib/vagrant/proto/gen/ruby-server_pb.rb b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb similarity index 95% rename from lib/vagrant/proto/gen/ruby-server_pb.rb rename to lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb index f125543c8..580524445 100644 --- a/lib/vagrant/proto/gen/ruby-server_pb.rb +++ b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb @@ -1,12 +1,12 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: internal/server/proto/ruby-server.proto +# source: proto/ruby_vagrant/ruby-server.proto require 'google/protobuf' require 'google/protobuf/empty_pb' require 'google/protobuf/any_pb' Google::Protobuf::DescriptorPool.generated_pool.build do - add_file("internal/server/proto/ruby-server.proto", :syntax => :proto3) do + add_file("proto/ruby_vagrant/ruby-server.proto", :syntax => :proto3) do add_message "hashicorp.vagrant.GetPluginsResponse" do repeated :plugins, :message, 1, "hashicorp.vagrant.Plugin" end diff --git a/lib/vagrant/proto/gen/ruby-server_services_pb.rb b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb.rb similarity index 85% rename from lib/vagrant/proto/gen/ruby-server_services_pb.rb rename to lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb.rb index 97dbd907d..8521da877 100644 --- a/lib/vagrant/proto/gen/ruby-server_services_pb.rb +++ b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb.rb @@ -1,8 +1,8 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# Source: internal/server/proto/ruby-server.proto for package 'hashicorp.vagrant' +# Source: proto/ruby_vagrant/ruby-server.proto for package 'hashicorp.vagrant' require 'grpc' -require_relative './ruby-server_pb' +require 'proto/ruby_vagrant/ruby-server_pb' module Hashicorp module Vagrant diff --git a/lib/vagrant/proto/gen/plugin/plugin_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb similarity index 62% rename from lib/vagrant/proto/gen/plugin/plugin_pb.rb rename to lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb index d718e6a92..c3ebfcc62 100644 --- a/lib/vagrant/proto/gen/plugin/plugin_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb @@ -1,14 +1,15 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: plugin.proto +# source: vagrant_plugin_sdk/plugin.proto require 'google/protobuf' require 'google/protobuf/any_pb' +require 'google/protobuf/timestamp_pb' require 'google/protobuf/empty_pb' require 'google/rpc/status_pb' require 'protostructure_pb' Google::Protobuf::DescriptorPool.generated_pool.build do - add_file("plugin.proto", :syntax => :proto3) do + add_file("vagrant_plugin_sdk/plugin.proto", :syntax => :proto3) do add_message "hashicorp.vagrant.sdk.Args" do end add_message "hashicorp.vagrant.sdk.Args.DataDir" do @@ -68,7 +69,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end add_message "hashicorp.vagrant.sdk.Args.Machine" do optional :resource_id, :string, 1 - optional :serverAddr, :string, 2 + optional :server_addr, :string, 2 end add_message "hashicorp.vagrant.sdk.Args.Configuration" do end @@ -262,7 +263,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_enum "hashicorp.vagrant.sdk.Command.Flag.Type" do value :STRING, 0 value :BOOL, 2 - value :INT, 3 end add_message "hashicorp.vagrant.sdk.Command.HelpResp" do optional :help, :string, 1 @@ -331,6 +331,193 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.Host.Capability.Resp" do optional :result, :message, 1, "google.protobuf.Any" end + add_message "hashicorp.vagrant.sdk.StateBag" do + map :data, :string, :message, 1, "hashicorp.vagrant.sdk.StateBag.Value" + end + add_message "hashicorp.vagrant.sdk.StateBag.Value" do + oneof :value do + optional :text, :string, 1 + optional :map, :message, 2, "google.protobuf.Any" + end + end + add_message "hashicorp.vagrant.sdk.SSHInfo" do + optional :host, :string, 1 + optional :port, :string, 2 + optional :private_key_path, :string, 3 + optional :keys_only, :bool, 4 + optional :verify_host_key, :bool, 5 + optional :username, :string, 6 + optional :remote_user, :string, 7 + optional :compression, :bool, 8 + optional :dsa_authentication, :bool, 9 + optional :config, :string, 10 + repeated :extra_args, :string, 11 + optional :forward_agent, :bool, 12 + optional :forward_x11, :bool, 13 + repeated :forward_env, :string, 14 + optional :connect_timeout, :int64, 15 + optional :ssh_command, :string, 16 + optional :proxy_command, :string, 17 + end + add_message "hashicorp.vagrant.sdk.WinrmInfo" do + optional :username, :string, 1 + optional :password, :string, 2 + optional :host, :string, 3 + optional :port, :int64, 4 + optional :guest_port, :int64, 5 + optional :max_tries, :int64, 6 + optional :retry_delay, :int64, 7 + optional :timeout, :int64, 8 + optional :transport, :enum, 9, "hashicorp.vagrant.sdk.WinrmInfo.Transport" + optional :ssl_peer_verification, :bool, 10 + optional :execution_time_limit, :string, 11 + optional :basic_auth_only, :bool, 12 + optional :codepage, :string, 13 + end + add_enum "hashicorp.vagrant.sdk.WinrmInfo.Transport" do + value :NEGOTIATE, 0 + value :SSL, 1 + value :PLAINTEXT, 2 + end + add_message "hashicorp.vagrant.sdk.MachineState" do + optional :id, :string, 1 + optional :short_description, :string, 2 + optional :long_description, :string, 3 + end + add_message "hashicorp.vagrant.sdk.MachineIndex" do + end + add_message "hashicorp.vagrant.sdk.MachineIndex.Entry" do + optional :id, :string, 1 + optional :local_data_path, :string, 2 + optional :name, :string, 3 + optional :provider, :string, 4 + optional :state, :string, 5 + optional :vagrantfile_name, :string, 6 + optional :vagrantfile_path, :string, 7 + optional :updated_at, :message, 8, "google.protobuf.Timestamp" + map :extra_data, :string, :string, 9 + end + add_message "hashicorp.vagrant.sdk.BoxCollection" do + optional :directory, :string, 1 + end + add_message "hashicorp.vagrant.sdk.Box" do + optional :name, :string, 1 + optional :provider, :string, 2 + optional :version, :string, 3 + optional :directory, :string, 4 + map :metadata, :string, :string, 5 + optional :metadata_url, :string, 6 + end + add_message "hashicorp.vagrant.sdk.Environment" do + end + add_message "hashicorp.vagrant.sdk.MachineProvider" do + end + add_message "hashicorp.vagrant.sdk.Configuration" do + end + add_message "hashicorp.vagrant.sdk.Vagrantfile" do + end + add_message "hashicorp.vagrant.sdk.Ref" do + end + add_message "hashicorp.vagrant.sdk.Ref.Machine" do + optional :resource_id, :string, 1 + end + add_message "hashicorp.vagrant.sdk.Machine" do + end + add_message "hashicorp.vagrant.sdk.Machine.SetNameRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + optional :name, :string, 2 + end + add_message "hashicorp.vagrant.sdk.Machine.SetNameResponse" do + end + add_message "hashicorp.vagrant.sdk.Machine.GetNameRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.GetNameResponse" do + optional :name, :string, 1 + end + add_message "hashicorp.vagrant.sdk.Machine.SetIDRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + optional :id, :string, 2 + end + add_message "hashicorp.vagrant.sdk.Machine.SetIDResponse" do + end + add_message "hashicorp.vagrant.sdk.Machine.GetIDRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.GetIDResponse" do + optional :id, :string, 1 + end + add_message "hashicorp.vagrant.sdk.Machine.SetStateRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + optional :state, :message, 2, "hashicorp.vagrant.sdk.MachineState" + end + add_message "hashicorp.vagrant.sdk.Machine.SetStateResponse" do + end + add_message "hashicorp.vagrant.sdk.Machine.GetStateRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.GetStateResponse" do + optional :state, :message, 1, "hashicorp.vagrant.sdk.MachineState" + end + add_message "hashicorp.vagrant.sdk.Machine.GetUUIDRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.GetUUIDResponse" do + optional :uuid, :string, 1 + end + add_message "hashicorp.vagrant.sdk.Machine.SetUUIDRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + optional :uuid, :string, 2 + end + add_message "hashicorp.vagrant.sdk.Machine.SetUUIDResponse" do + end + add_message "hashicorp.vagrant.sdk.Machine.BoxRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.BoxResponse" do + optional :box, :message, 1, "hashicorp.vagrant.sdk.Box" + end + add_message "hashicorp.vagrant.sdk.Machine.DatadirRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.DatadirResponse" do + optional :datadir, :message, 1, "hashicorp.vagrant.sdk.Args.DataDir.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.LocalDataPathRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.LocalDataPathResponse" do + optional :path, :string, 1 + end + add_message "hashicorp.vagrant.sdk.Machine.ProviderRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.ProviderResponse" do + end + add_message "hashicorp.vagrant.sdk.Machine.VagrantfileNameRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.VagrantfileNameResponse" do + optional :name, :string, 1 + end + add_message "hashicorp.vagrant.sdk.Machine.VagrantfilePathRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.VagrantfilePathResponse" do + optional :path, :string, 1 + end + add_message "hashicorp.vagrant.sdk.Machine.UpdatedAtRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.UpdatedAtResponse" do + optional :updated_at, :message, 1, "google.protobuf.Timestamp" + end + add_message "hashicorp.vagrant.sdk.Machine.UIRequest" do + optional :machine, :message, 1, "hashicorp.vagrant.sdk.Ref.Machine" + end + add_message "hashicorp.vagrant.sdk.Machine.UIResponse" do + optional :ui, :message, 1, "hashicorp.vagrant.sdk.Args.TerminalUI" + end end end @@ -422,6 +609,55 @@ module Hashicorp Host::Capability = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Host.Capability").msgclass Host::Capability::CheckResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Host.Capability.CheckResp").msgclass Host::Capability::Resp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Host.Capability.Resp").msgclass + StateBag = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.StateBag").msgclass + StateBag::Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.StateBag.Value").msgclass + SSHInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.SSHInfo").msgclass + WinrmInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.WinrmInfo").msgclass + WinrmInfo::Transport = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.WinrmInfo.Transport").enummodule + MachineState = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.MachineState").msgclass + MachineIndex = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.MachineIndex").msgclass + MachineIndex::Entry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.MachineIndex.Entry").msgclass + BoxCollection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.BoxCollection").msgclass + Box = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box").msgclass + Environment = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Environment").msgclass + MachineProvider = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.MachineProvider").msgclass + Configuration = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Configuration").msgclass + Vagrantfile = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Vagrantfile").msgclass + Ref = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref").msgclass + Ref::Machine = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref.Machine").msgclass + Machine = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine").msgclass + Machine::SetNameRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetNameRequest").msgclass + Machine::SetNameResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetNameResponse").msgclass + Machine::GetNameRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetNameRequest").msgclass + Machine::GetNameResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetNameResponse").msgclass + Machine::SetIDRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetIDRequest").msgclass + Machine::SetIDResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetIDResponse").msgclass + Machine::GetIDRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetIDRequest").msgclass + Machine::GetIDResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetIDResponse").msgclass + Machine::SetStateRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetStateRequest").msgclass + Machine::SetStateResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetStateResponse").msgclass + Machine::GetStateRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetStateRequest").msgclass + Machine::GetStateResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetStateResponse").msgclass + Machine::GetUUIDRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetUUIDRequest").msgclass + Machine::GetUUIDResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.GetUUIDResponse").msgclass + Machine::SetUUIDRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetUUIDRequest").msgclass + Machine::SetUUIDResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.SetUUIDResponse").msgclass + Machine::BoxRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.BoxRequest").msgclass + Machine::BoxResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.BoxResponse").msgclass + Machine::DatadirRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.DatadirRequest").msgclass + Machine::DatadirResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.DatadirResponse").msgclass + Machine::LocalDataPathRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.LocalDataPathRequest").msgclass + Machine::LocalDataPathResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.LocalDataPathResponse").msgclass + Machine::ProviderRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.ProviderRequest").msgclass + Machine::ProviderResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.ProviderResponse").msgclass + Machine::VagrantfileNameRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.VagrantfileNameRequest").msgclass + Machine::VagrantfileNameResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.VagrantfileNameResponse").msgclass + Machine::VagrantfilePathRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.VagrantfilePathRequest").msgclass + Machine::VagrantfilePathResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.VagrantfilePathResponse").msgclass + Machine::UpdatedAtRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.UpdatedAtRequest").msgclass + Machine::UpdatedAtResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.UpdatedAtResponse").msgclass + Machine::UIRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.UIRequest").msgclass + Machine::UIResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Machine.UIResponse").msgclass end end end diff --git a/lib/vagrant/proto/gen/plugin/plugin_services_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb similarity index 83% rename from lib/vagrant/proto/gen/plugin/plugin_services_pb.rb rename to lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb index 7eb51cc3d..1dffd4fc7 100644 --- a/lib/vagrant/proto/gen/plugin/plugin_services_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb @@ -1,8 +1,8 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# Source: plugin.proto for package 'hashicorp.vagrant.sdk' +# Source: vagrant_plugin_sdk/plugin.proto for package 'hashicorp.vagrant.sdk' require 'grpc' -require 'plugin_pb' +require 'vagrant_plugin_sdk/plugin_pb' module Hashicorp module Vagrant @@ -259,6 +259,39 @@ module Hashicorp rpc :Documentation, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Config::Documentation end + Stub = Service.rpc_stub_class + end + module MachineService + # ******************************************************************* + # Machine services + # ****************************************************************** + class Service + + include GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'hashicorp.vagrant.sdk.MachineService' + + # Getters and Setters + rpc :SetName, ::Hashicorp::Vagrant::Sdk::Machine::SetNameRequest, ::Hashicorp::Vagrant::Sdk::Machine::SetNameResponse + rpc :GetName, ::Hashicorp::Vagrant::Sdk::Machine::GetNameRequest, ::Hashicorp::Vagrant::Sdk::Machine::GetNameResponse + rpc :SetID, ::Hashicorp::Vagrant::Sdk::Machine::SetIDRequest, ::Hashicorp::Vagrant::Sdk::Machine::SetIDResponse + rpc :GetID, ::Hashicorp::Vagrant::Sdk::Machine::GetIDRequest, ::Hashicorp::Vagrant::Sdk::Machine::GetIDResponse + rpc :SetState, ::Hashicorp::Vagrant::Sdk::Machine::SetStateRequest, ::Hashicorp::Vagrant::Sdk::Machine::SetStateResponse + rpc :GetState, ::Hashicorp::Vagrant::Sdk::Machine::GetStateRequest, ::Hashicorp::Vagrant::Sdk::Machine::GetStateResponse + rpc :SetUUID, ::Hashicorp::Vagrant::Sdk::Machine::SetUUIDRequest, ::Hashicorp::Vagrant::Sdk::Machine::SetUUIDResponse + rpc :GetUUID, ::Hashicorp::Vagrant::Sdk::Machine::GetUUIDRequest, ::Hashicorp::Vagrant::Sdk::Machine::GetUUIDResponse + rpc :Box, ::Hashicorp::Vagrant::Sdk::Machine::BoxRequest, ::Hashicorp::Vagrant::Sdk::Machine::BoxResponse + rpc :Datadir, ::Hashicorp::Vagrant::Sdk::Machine::DatadirRequest, ::Hashicorp::Vagrant::Sdk::Machine::DatadirResponse + rpc :LocalDataPath, ::Hashicorp::Vagrant::Sdk::Machine::LocalDataPathRequest, ::Hashicorp::Vagrant::Sdk::Machine::LocalDataPathResponse + rpc :Provider, ::Hashicorp::Vagrant::Sdk::Machine::ProviderRequest, ::Hashicorp::Vagrant::Sdk::Machine::ProviderResponse + rpc :VagrantfileName, ::Hashicorp::Vagrant::Sdk::Machine::VagrantfileNameRequest, ::Hashicorp::Vagrant::Sdk::Machine::VagrantfileNameResponse + rpc :VagrantfilePath, ::Hashicorp::Vagrant::Sdk::Machine::VagrantfilePathRequest, ::Hashicorp::Vagrant::Sdk::Machine::VagrantfilePathResponse + rpc :UpdatedAt, ::Hashicorp::Vagrant::Sdk::Machine::UpdatedAtRequest, ::Hashicorp::Vagrant::Sdk::Machine::UpdatedAtResponse + rpc :UI, ::Hashicorp::Vagrant::Sdk::Machine::UIRequest, ::Hashicorp::Vagrant::Sdk::Machine::UIResponse + end + Stub = Service.rpc_stub_class end end diff --git a/lib/vagrant/proto/gen/internal/server/proto/server_pb.rb b/lib/vagrant/protobufs/proto/vagrant_server/server_pb.rb similarity index 97% rename from lib/vagrant/proto/gen/internal/server/proto/server_pb.rb rename to lib/vagrant/protobufs/proto/vagrant_server/server_pb.rb index eea752956..8d5b3bec8 100644 --- a/lib/vagrant/proto/gen/internal/server/proto/server_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_server/server_pb.rb @@ -1,14 +1,15 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: internal/server/proto/server.proto +# source: proto/vagrant_server/server.proto require 'google/protobuf' -require 'google/protobuf/any_pb' require 'google/protobuf/empty_pb' require 'google/protobuf/timestamp_pb' +require 'google/protobuf/any_pb' require 'google/rpc/status_pb' +require 'plugin_pb' Google::Protobuf::DescriptorPool.generated_pool.build do - add_file("internal/server/proto/server.proto", :syntax => :proto3) do + add_file("proto/vagrant_server/server.proto", :syntax => :proto3) do add_message "hashicorp.vagrant.RubyVagrantClientInfoResponse" do optional :addr_network, :string, 1 optional :addr_string, :string, 2 @@ -43,26 +44,19 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :data_source, :message, 7, "hashicorp.vagrant.Job.DataSource" end add_message "hashicorp.vagrant.Machine" do - optional :machine, :message, 1, "google.protobuf.Any" + optional :datadir, :message, 1, "hashicorp.vagrant.sdk.Args.DataDir.Machine" optional :resource_id, :string, 2 optional :id, :string, 3 optional :name, :string, 4 optional :project, :message, 5, "hashicorp.vagrant.Ref.Project" optional :status, :message, 6, "hashicorp.vagrant.Status" - optional :box, :message, 7, "hashicorp.vagrant.Box" + optional :box, :message, 7, "hashicorp.vagrant.sdk.Box" optional :uuid, :string, 8 optional :uid, :string, 9 - optional :state, :enum, 10, "hashicorp.vagrant.Operation.PhysicalState" - optional :remote_enabled, :bool, 11 - optional :data_source, :message, 12, "hashicorp.vagrant.Job.DataSource" - end - add_message "hashicorp.vagrant.Box" do - optional :name, :string, 1 - optional :provider, :string, 2 - optional :version, :string, 3 - optional :directory, :string, 4 - map :metadata, :string, :string, 5 - optional :metadata_url, :string, 6 + optional :state, :message, 10, "hashicorp.vagrant.sdk.MachineState" + optional :physical_state, :enum, 50, "hashicorp.vagrant.Operation.PhysicalState" + optional :remote_enabled, :bool, 51 + optional :data_source, :message, 52, "hashicorp.vagrant.Job.DataSource" end add_message "hashicorp.vagrant.Ref" do end @@ -262,11 +256,22 @@ Google::Protobuf::DescriptorPool.generated_pool.build do value :BEFORE, 0 value :AFTER, 1 end + add_message "hashicorp.vagrant.Job.Flag" do + optional :long_name, :string, 1 + optional :short_name, :string, 2 + optional :description, :string, 3 + optional :default_value, :string, 4 + optional :type, :enum, 5, "hashicorp.vagrant.Job.Flag.Type" + end + add_enum "hashicorp.vagrant.Job.Flag.Type" do + value :STRING, 0 + value :BOOL, 1 + end add_message "hashicorp.vagrant.Job.Command" do optional :name, :string, 1 optional :synopsis, :string, 2 optional :help, :string, 3 - optional :flags, :string, 4 + repeated :flags, :message, 4, "hashicorp.vagrant.Job.Flag" repeated :subcommands, :message, 5, "hashicorp.vagrant.Job.Command" end add_message "hashicorp.vagrant.Job.RunOp" do @@ -842,7 +847,6 @@ module Hashicorp Basis = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Basis").msgclass Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Project").msgclass Machine = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Machine").msgclass - Box = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Box").msgclass Ref = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Ref").msgclass Ref::Machine = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Ref.Machine").msgclass Ref::Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Ref.Project").msgclass @@ -883,6 +887,8 @@ module Hashicorp Job::Action = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Job.Action").msgclass Job::Hook = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Job.Hook").msgclass Job::Hook::Location = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Job.Hook.Location").enummodule + Job::Flag = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Job.Flag").msgclass + Job::Flag::Type = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Job.Flag.Type").enummodule Job::Command = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Job.Command").msgclass Job::RunOp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Job.RunOp").msgclass Job::RunResult = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.Job.RunResult").msgclass diff --git a/lib/vagrant/proto/gen/internal/server/proto/server_services_pb.rb b/lib/vagrant/protobufs/proto/vagrant_server/server_services_pb.rb similarity index 98% rename from lib/vagrant/proto/gen/internal/server/proto/server_services_pb.rb rename to lib/vagrant/protobufs/proto/vagrant_server/server_services_pb.rb index 052ed6199..6eee38dbf 100644 --- a/lib/vagrant/proto/gen/internal/server/proto/server_services_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_server/server_services_pb.rb @@ -1,8 +1,8 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# Source: internal/server/proto/server.proto for package 'hashicorp.vagrant' +# Source: proto/vagrant_server/server.proto for package 'hashicorp.vagrant' require 'grpc' -require 'internal/server/proto/server_pb' +require 'proto/vagrant_server/server_pb' module Hashicorp module Vagrant