From 4bc2a517484fd72dccda0d99667f474dfc06dd15 Mon Sep 17 00:00:00 2001 From: sophia Date: Thu, 28 Oct 2021 16:06:51 -0500 Subject: [PATCH] Pass communincator command --- .../proto/vagrant_plugin_sdk/plugin_pb.rb | 175 ++---------------- plugins/commands/serve/client/communicator.rb | 8 +- .../service/capability_platform_service.rb | 3 - .../serve/service/communicator_service.rb | 14 +- 4 files changed, 32 insertions(+), 168 deletions(-) diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb index 6a67f5b45..8243fa11b 100644 --- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb @@ -13,10 +13,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build 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.Seeds" do - repeated :typed, :message, 1, "google.protobuf.Any" - map :named, :string, :message, 2, "google.protobuf.Any" - end add_message "hashicorp.vagrant.sdk.Args.DataDir" do end add_message "hashicorp.vagrant.sdk.Args.DataDir.Basis" do @@ -46,12 +42,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.Args.MetadataSet" do map :metadata, :string, :string, 1 end - add_message "hashicorp.vagrant.sdk.Args.Path" do - optional :path, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Args.Folder" do - map :folders, :string, :message, 1, "google.protobuf.Any" - end add_message "hashicorp.vagrant.sdk.Args.TerminalUI" do optional :stream_id, :uint32, 1 optional :network, :string, 2 @@ -105,21 +95,19 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :network, :string, 2 optional :target, :string, 3 end + add_message "hashicorp.vagrant.sdk.Args.Target.Machine.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.Args.Target.Machine.State" do optional :id, :string, 1 optional :short_description, :string, 2 optional :long_description, :string, 3 end - add_message "hashicorp.vagrant.sdk.Args.Box" do - optional :stream_id, :uint32, 1 - optional :network, :string, 2 - optional :target, :string, 3 - end - add_message "hashicorp.vagrant.sdk.Args.BoxCollection" do - optional :stream_id, :uint32, 1 - optional :network, :string, 2 - optional :target, :string, 3 - end add_message "hashicorp.vagrant.sdk.Args.StateBag" do optional :stream_id, :uint32, 1 optional :network, :string, 2 @@ -154,15 +142,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :capability, :string, 1 end add_message "hashicorp.vagrant.sdk.Args.Direct" do - repeated :arguments, :message, 1, "google.protobuf.Any" - end - add_message "hashicorp.vagrant.sdk.Args.Array" do repeated :list, :message, 1, "google.protobuf.Any" end - add_message "hashicorp.vagrant.sdk.Args.Hash" do - map :fields, :string, :message, 1, "google.protobuf.Any" - end - add_message "hashicorp.vagrant.sdk.Args.Null" do + add_message "hashicorp.vagrant.sdk.BoxCollection" do + optional :directory, :string, 1 end add_message "hashicorp.vagrant.sdk.SSHInfo" do optional :host, :string, 1 @@ -453,25 +436,17 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.Communicator.MatchResp" do optional :match, :bool, 1 end - add_message "hashicorp.vagrant.sdk.Communicator.InitResp" do - end add_message "hashicorp.vagrant.sdk.Communicator.ReadyResp" do optional :ready, :bool, 1 end - add_message "hashicorp.vagrant.sdk.Communicator.FileTransferResp" do - end - add_message "hashicorp.vagrant.sdk.Communicator.ExecutionRequest" do - optional :machine, :message, 1, "hashicorp.vagrant.sdk.Args.Target.Machine" - optional :command, :string, 2 - optional :options, :message, 3, "hashicorp.vagrant.sdk.Args.MetadataSet" - end add_message "hashicorp.vagrant.sdk.Communicator.ExecuteResp" do optional :exit_code, :int32, 1 end add_message "hashicorp.vagrant.sdk.Communicator.TestResp" do optional :valid, :bool, 1 end - add_message "hashicorp.vagrant.sdk.Communicator.ResetResp" do + add_message "hashicorp.vagrant.sdk.Communicator.Command" do + optional :command, :string, 1 end add_message "hashicorp.vagrant.sdk.Platform" do end @@ -493,18 +468,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.Platform.Capability.Resp" do optional :result, :message, 1, "google.protobuf.Any" end - add_message "hashicorp.vagrant.sdk.SyncedFolder" do - end - add_message "hashicorp.vagrant.sdk.SyncedFolder.UsableResp" do - optional :usable, :bool, 1 - end add_message "hashicorp.vagrant.sdk.Ref" do end add_message "hashicorp.vagrant.sdk.Ref.Box" do optional :resource_id, :string, 1 - optional :name, :string, 2 - optional :version, :string, 3 - optional :provider, :string, 4 end add_message "hashicorp.vagrant.sdk.Ref.Basis" do optional :resource_id, :string, 1 @@ -522,19 +489,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :project, :message, 2, "hashicorp.vagrant.sdk.Ref.Project" optional :name, :string, 3 end - add_message "hashicorp.vagrant.sdk.Basis" do - end - add_message "hashicorp.vagrant.sdk.Basis.PluginsRequest" do - repeated :types, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Basis.PluginsResponse" do - repeated :plugins, :message, 1, "hashicorp.vagrant.sdk.Basis.Plugin" - end - add_message "hashicorp.vagrant.sdk.Basis.Plugin" do - optional :name, :string, 1 - optional :type, :string, 2 - optional :plugin, :message, 3, "google.protobuf.Any" - end add_message "hashicorp.vagrant.sdk.Target" do end add_message "hashicorp.vagrant.sdk.Target.ResourceIdResponse" do @@ -588,17 +542,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :user_id, :string, 1 end add_message "hashicorp.vagrant.sdk.Target.Machine.SyncedFoldersResponse" do - repeated :synced_folders, :message, 1, "hashicorp.vagrant.sdk.Target.Machine.SyncedFoldersResponse.MachineSyncedFolder" - end - add_message "hashicorp.vagrant.sdk.Target.Machine.SyncedFoldersResponse.MachineSyncedFolder" do - optional :plugin, :message, 1, "hashicorp.vagrant.sdk.Args.SyncedFolder" - optional :folder, :message, 2, "hashicorp.vagrant.sdk.Vagrantfile.SyncedFolder" + repeated :synced_folders, :message, 1, "hashicorp.vagrant.sdk.Args.SyncedFolder" end add_message "hashicorp.vagrant.sdk.Project" do end - add_message "hashicorp.vagrant.sdk.Project.ResourceIdResponse" do - optional :resource_id, :string, 1 - end add_message "hashicorp.vagrant.sdk.Project.TargetRequest" do optional :name, :string, 1 end @@ -641,9 +588,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do end add_message "hashicorp.vagrant.sdk.Vagrantfile" do end - add_message "hashicorp.vagrant.sdk.Vagrantfile.BoxCollection" do - optional :directory, :string, 1 - end add_message "hashicorp.vagrant.sdk.Vagrantfile.GetVagrantfileRequest" do oneof :component do optional :project, :message, 1, "hashicorp.vagrant.sdk.Ref.Project" @@ -657,7 +601,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.Vagrantfile.TargetRequest" do optional :name, :string, 1 optional :provider, :string, 2 - optional :boxes, :message, 3, "hashicorp.vagrant.sdk.Vagrantfile.BoxCollection" + optional :boxes, :message, 3, "hashicorp.vagrant.sdk.BoxCollection" optional :data_path, :string, 4 optional :project, :message, 5, "hashicorp.vagrant.sdk.Args.Project" end @@ -667,7 +611,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.Vagrantfile.TargetConfigRequest" do optional :name, :string, 1 optional :provider, :string, 2 - optional :boxes, :message, 3, "hashicorp.vagrant.sdk.Vagrantfile.BoxCollection" + optional :boxes, :message, 3, "hashicorp.vagrant.sdk.BoxCollection" optional :data_path, :string, 4 optional :validate_provider, :bool, 5 end @@ -774,56 +718,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "hashicorp.vagrant.sdk.TargetIndex.IncludesResponse" do optional :exists, :bool, 1 end - add_message "hashicorp.vagrant.sdk.Box" do - end - add_message "hashicorp.vagrant.sdk.Box.AutomaticUpdateCheckAllowedResponse" do - optional :allowed, :bool, 1 - end - add_message "hashicorp.vagrant.sdk.Box.HasUpdateRequest" do - optional :version, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Box.HasUpdateResponse" do - optional :has_update, :bool, 1 - end - add_message "hashicorp.vagrant.sdk.Box.InUseResponse" do - optional :in_use, :bool, 1 - end - add_message "hashicorp.vagrant.sdk.Box.MetadataUrlResponse" do - optional :metadataUrl, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Box.NameResponse" do - optional :name, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Box.ProviderResponse" do - optional :provider, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Box.VersionResponse" do - optional :version, :string, 1 - end - add_message "hashicorp.vagrant.sdk.Box.EqualityResponse" do - optional :result, :int32, 1 - end - add_message "hashicorp.vagrant.sdk.BoxCollection" do - end - add_message "hashicorp.vagrant.sdk.BoxCollection.AddRequest" do - optional :path, :string, 1 - optional :name, :string, 2 - optional :version, :string, 3 - optional :metadataUrl, :string, 4 - optional :force, :bool, 5 - repeated :providers, :string, 6 - end - add_message "hashicorp.vagrant.sdk.BoxCollection.AllResponse" do - repeated :boxes, :message, 1, "hashicorp.vagrant.sdk.Args.Box" - end - add_message "hashicorp.vagrant.sdk.BoxCollection.CleanRequest" do - optional :name, :string, 1 - end - add_message "hashicorp.vagrant.sdk.BoxCollection.FindRequest" do - optional :name, :string, 1 - optional :version, :string, 2 - repeated :providers, :string, 3 - end end end @@ -831,15 +725,12 @@ module Hashicorp module Vagrant module Sdk Args = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args").msgclass - Args::Seeds = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Seeds").msgclass Args::DataDir = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.DataDir").msgclass Args::DataDir::Basis = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.DataDir.Basis").msgclass Args::DataDir::Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.DataDir.Project").msgclass Args::DataDir::Target = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.DataDir.Target").msgclass Args::DataDir::Component = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.DataDir.Component").msgclass Args::MetadataSet = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.MetadataSet").msgclass - Args::Path = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Path").msgclass - Args::Folder = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Folder").msgclass Args::TerminalUI = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.TerminalUI").msgclass Args::Logger = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Logger").msgclass Args::JobInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.JobInfo").msgclass @@ -851,9 +742,8 @@ module Hashicorp Args::Target::State = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Target.State").msgclass Args::Target::State::State = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Target.State.State").enummodule Args::Target::Machine = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Target.Machine").msgclass + Args::Target::Machine::Box = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Target.Machine.Box").msgclass Args::Target::Machine::State = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Target.Machine.State").msgclass - Args::Box = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Box").msgclass - Args::BoxCollection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.BoxCollection").msgclass Args::StateBag = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.StateBag").msgclass Args::Host = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Host").msgclass Args::Guest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Guest").msgclass @@ -862,9 +752,7 @@ module Hashicorp Args::TargetIndex = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.TargetIndex").msgclass Args::NamedCapability = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.NamedCapability").msgclass Args::Direct = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Direct").msgclass - Args::Array = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Array").msgclass - Args::Hash = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Hash").msgclass - Args::Null = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Null").msgclass + BoxCollection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.BoxCollection").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 @@ -930,13 +818,10 @@ module Hashicorp Command::Arguments::Flag::Type = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Command.Arguments.Flag.Type").enummodule Communicator = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator").msgclass Communicator::MatchResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.MatchResp").msgclass - Communicator::InitResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.InitResp").msgclass Communicator::ReadyResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.ReadyResp").msgclass - Communicator::FileTransferResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.FileTransferResp").msgclass - Communicator::ExecutionRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.ExecutionRequest").msgclass Communicator::ExecuteResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.ExecuteResp").msgclass Communicator::TestResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.TestResp").msgclass - Communicator::ResetResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.ResetResp").msgclass + Communicator::Command = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Communicator.Command").msgclass Platform = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Platform").msgclass Platform::DetectResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Platform.DetectResp").msgclass Platform::ParentResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Platform.ParentResp").msgclass @@ -944,17 +829,11 @@ module Hashicorp Platform::Capability::NamedRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Platform.Capability.NamedRequest").msgclass Platform::Capability::CheckResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Platform.Capability.CheckResp").msgclass Platform::Capability::Resp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Platform.Capability.Resp").msgclass - SyncedFolder = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.SyncedFolder").msgclass - SyncedFolder::UsableResp = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.SyncedFolder.UsableResp").msgclass Ref = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref").msgclass Ref::Box = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref.Box").msgclass Ref::Basis = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref.Basis").msgclass Ref::Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref.Project").msgclass Ref::Target = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Ref.Target").msgclass - Basis = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Basis").msgclass - Basis::PluginsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Basis.PluginsRequest").msgclass - Basis::PluginsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Basis.PluginsResponse").msgclass - Basis::Plugin = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Basis.Plugin").msgclass Target = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Target").msgclass Target::ResourceIdResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Target.ResourceIdResponse").msgclass Target::RecordResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Target.RecordResponse").msgclass @@ -974,9 +853,7 @@ module Hashicorp Target::Machine::ConnectionInfoResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Target.Machine.ConnectionInfoResponse").msgclass Target::Machine::UIDResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Target.Machine.UIDResponse").msgclass Target::Machine::SyncedFoldersResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Target.Machine.SyncedFoldersResponse").msgclass - Target::Machine::SyncedFoldersResponse::MachineSyncedFolder = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Target.Machine.SyncedFoldersResponse.MachineSyncedFolder").msgclass Project = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Project").msgclass - Project::ResourceIdResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Project.ResourceIdResponse").msgclass Project::TargetRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Project.TargetRequest").msgclass Project::TargetNamesResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Project.TargetNamesResponse").msgclass Project::TargetIdsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Project.TargetIdsResponse").msgclass @@ -991,7 +868,6 @@ module Hashicorp Project::TmpResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Project.TmpResponse").msgclass Project::DefaultPrivateKeyResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Project.DefaultPrivateKeyResponse").msgclass Vagrantfile = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Vagrantfile").msgclass - Vagrantfile::BoxCollection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Vagrantfile.BoxCollection").msgclass Vagrantfile::GetVagrantfileRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Vagrantfile.GetVagrantfileRequest").msgclass Vagrantfile::GetVagrantfileResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Vagrantfile.GetVagrantfileResponse").msgclass Vagrantfile::TargetRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Vagrantfile.TargetRequest").msgclass @@ -1013,21 +889,6 @@ module Hashicorp TargetIndex::TargetIdentifier = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.TargetIndex.TargetIdentifier").msgclass TargetIndex::AllResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.TargetIndex.AllResponse").msgclass TargetIndex::IncludesResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.TargetIndex.IncludesResponse").msgclass - Box = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box").msgclass - Box::AutomaticUpdateCheckAllowedResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.AutomaticUpdateCheckAllowedResponse").msgclass - Box::HasUpdateRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.HasUpdateRequest").msgclass - Box::HasUpdateResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.HasUpdateResponse").msgclass - Box::InUseResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.InUseResponse").msgclass - Box::MetadataUrlResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.MetadataUrlResponse").msgclass - Box::NameResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.NameResponse").msgclass - Box::ProviderResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.ProviderResponse").msgclass - Box::VersionResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.VersionResponse").msgclass - Box::EqualityResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Box.EqualityResponse").msgclass - BoxCollection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.BoxCollection").msgclass - BoxCollection::AddRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.BoxCollection.AddRequest").msgclass - BoxCollection::AllResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.BoxCollection.AllResponse").msgclass - BoxCollection::CleanRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.BoxCollection.CleanRequest").msgclass - BoxCollection::FindRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.BoxCollection.FindRequest").msgclass end end end diff --git a/plugins/commands/serve/client/communicator.rb b/plugins/commands/serve/client/communicator.rb index ed54989fa..51f102659 100644 --- a/plugins/commands/serve/client/communicator.rb +++ b/plugins/commands/serve/client/communicator.rb @@ -174,7 +174,9 @@ module VagrantPlugins # opts[k] = val # end - opts_struct = Google::Protobuf::Struct.from_hash(opts) + opts_struct = Google::Protobuf::Struct.from_hash( + opts.transform_keys(&:to_s) + ) SDK::FuncSpec::Args.new( args: [ @@ -184,8 +186,8 @@ module VagrantPlugins value: Google::Protobuf::Any.pack(machine.to_proto) ), SDK::FuncSpec::Value.new( - type: "hashicorp.vagrant.sdk.Args.Command", - value: Google::Protobuf::Any.pack(SDK::Args::Command.new(command: cmd)), + type: "hashicorp.vagrant.sdk.Communicator.Command", + value: Google::Protobuf::Any.pack(SDK::Communicator::Command.new(command: cmd)), ), SDK::FuncSpec::Value.new( type: "", # TODO: what goes here diff --git a/plugins/commands/serve/service/capability_platform_service.rb b/plugins/commands/serve/service/capability_platform_service.rb index fcee1eb2f..12fc83ea9 100644 --- a/plugins/commands/serve/service/capability_platform_service.rb +++ b/plugins/commands/serve/service/capability_platform_service.rb @@ -110,9 +110,6 @@ module VagrantPlugins val = Google::Protobuf::Value.new val.from_ruby(result) - SDK::Platform::Capability::Resp.new( - result: Google::Protobuf::Any.pack(val) - ) end end diff --git a/plugins/commands/serve/service/communicator_service.rb b/plugins/commands/serve/service/communicator_service.rb index e495d62d1..41c456c86 100644 --- a/plugins/commands/serve/service/communicator_service.rb +++ b/plugins/commands/serve/service/communicator_service.rb @@ -212,7 +212,7 @@ module VagrantPlugins name: "", ), SDK::FuncSpec::Value.new( - type: "hashicorp.vagrant.sdk.Args.Command", + type: "hashicorp.vagrant.sdk.Communicator.Command", name: "", ), SDK::FuncSpec::Value.new( @@ -265,7 +265,7 @@ module VagrantPlugins name: "", ), SDK::FuncSpec::Value.new( - type: "hashicorp.vagrant.sdk.Args.Command", + type: "hashicorp.vagrant.sdk.Communicator.Command", name: "", ), SDK::FuncSpec::Value.new( @@ -284,10 +284,13 @@ module VagrantPlugins with_info(ctx) do |info| plugin_name = info.plugin_name logger.debug("Got plugin #{plugin_name}") + logger.debug("got req #{req}") + logger.debug("got req args #{req.args}") - target, cmd, opts = mapper.funcspec_map(req) + # target, cmd, opts = mapper.funcspec_map(req, mapper, broker) + target, cmd = mapper.funcspec_map(req, mapper, broker) logger.debug("Got machine #{target}") - logger.debug("Got opts #{opts}") + # logger.debug("Got opts #{opts}") logger.debug("Got cmd #{cmd}") logger.info("mapping received arguments to guest machine") @@ -295,7 +298,8 @@ module VagrantPlugins logger.debug("Got machine #{machine}") plugin = Vagrant.plugin("2").manager.communicators[plugin_name.to_s.to_sym] - logger.debug("Got plugin #{plugin}") + logger.debug("Got plugin instance #{plugin}") + communicator = plugin.new(machine) logger.debug("communicator: #{communicator}")