From 7aaeaf2e4637ecd6d8689ff9db4a1b2d87ec9be2 Mon Sep 17 00:00:00 2001 From: sophia Date: Wed, 17 Nov 2021 16:08:09 -0600 Subject: [PATCH] Update protos --- internal/server/singleprocess/service_box.go | 2 +- lib/vagrant/box_collection/remote.rb | 3 +-- lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb | 4 ++-- plugins/commands/serve/client/box.rb | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/internal/server/singleprocess/service_box.go b/internal/server/singleprocess/service_box.go index d85693e55..11c65b5fd 100644 --- a/internal/server/singleprocess/service_box.go +++ b/internal/server/singleprocess/service_box.go @@ -24,7 +24,7 @@ func (s *service) DeleteBox( req *vagrant_server.DeleteBoxRequest, ) (empt *empty.Empty, err error) { err = s.state.BoxDelete(req.Box) - return + return &empty.Empty{}, nil } func (s *service) GetBox( diff --git a/lib/vagrant/box_collection/remote.rb b/lib/vagrant/box_collection/remote.rb index 5d77768e7..ab04a232b 100644 --- a/lib/vagrant/box_collection/remote.rb +++ b/lib/vagrant/box_collection/remote.rb @@ -24,8 +24,7 @@ module Vagrant # @return [Vagrant::Box] def add(path, name, version, **opts) client.add( - path, name, version, force=opts[:force], - metadata_url=opts[:metadata_url], provider=opts[:providers] + path, name, version, opts[:force], opts[:metadata_url], opts[:providers] ) end 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 b0cc46056..e9b92bd39 100644 --- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb @@ -743,10 +743,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :version, :string, 1 end add_message "hashicorp.vagrant.sdk.Box.HasUpdateResponse" do - optional :hasUpdate, :bool, 1 + optional :has_update, :bool, 1 end add_message "hashicorp.vagrant.sdk.Box.InUseResponse" do - optional :inUse, :bool, 1 + optional :in_use, :bool, 1 end add_message "hashicorp.vagrant.sdk.Box.MetadataUrlResponse" do optional :metadataUrl, :string, 1 diff --git a/plugins/commands/serve/client/box.rb b/plugins/commands/serve/client/box.rb index 534e6dc57..af0b3c01f 100644 --- a/plugins/commands/serve/client/box.rb +++ b/plugins/commands/serve/client/box.rb @@ -21,14 +21,14 @@ module VagrantPlugins res = client.has_update(SDK::Box::HasUpdateRequest.new( version: version )) - res.hasUpdate + res.has_update end # @param [Sdk::Args::TargetIndex] index # @return [Bool] is in use def in_use(index) res = client.in_use(index) - res.inUse + res.in_use end # @param [String] path