From 03ecb877e6f84b669d65c746019287dd91c86791 Mon Sep 17 00:00:00 2001 From: sophia Date: Fri, 1 Apr 2022 12:02:40 -0500 Subject: [PATCH] Update box metadata Name endpoint to boxName --- lib/vagrant/box_metadata/remote.rb | 5 +++-- .../protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb | 2 +- plugins/commands/serve/client/box_metadata.rb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/vagrant/box_metadata/remote.rb b/lib/vagrant/box_metadata/remote.rb index 79b6bf6ff..6593109fa 100644 --- a/lib/vagrant/box_metadata/remote.rb +++ b/lib/vagrant/box_metadata/remote.rb @@ -24,11 +24,12 @@ module Vagrant end @client = Vagrant.plugin("2").remote_manager.core_plugin_manager.get_plugin("boxmetadata") @client.load_metadata(url) + @name = @client.name end def version(version, **opts) providers = nil - providers = Array(opts[:provider]).map(&:to_sym) if opts[:provider] + providers = Array(opts[:provider]) || [] v = @client.version(version, providers) @logger.debug("found version for #{version}, #{providers}: #{v}") @@ -65,7 +66,7 @@ module Vagrant def providers @logger.debug("searching for providers with ver #{@version}") - @client.providers(@version) + @client.list_providers(@version) end class Provider diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb index 44cfa92a6..9ffc6eafc 100644 --- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb @@ -593,7 +593,7 @@ module Hashicorp self.unmarshal_class_method = :decode self.service_name = 'hashicorp.vagrant.sdk.BoxMetadataService' - rpc :Name, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::BoxMetadata::NameResponse + rpc :BoxName, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::BoxMetadata::NameResponse rpc :LoadMetadata, ::Hashicorp::Vagrant::Sdk::BoxMetadata::LoadMetadataRequest, ::Google::Protobuf::Empty rpc :Version, ::Hashicorp::Vagrant::Sdk::BoxMetadata::VersionQuery, ::Hashicorp::Vagrant::Sdk::BoxMetadata::VersionResponse rpc :ListVersions, ::Hashicorp::Vagrant::Sdk::BoxMetadata::ListVersionsQuery, ::Hashicorp::Vagrant::Sdk::BoxMetadata::ListVersionsResponse diff --git a/plugins/commands/serve/client/box_metadata.rb b/plugins/commands/serve/client/box_metadata.rb index 8abd9c2c7..9c79e5969 100644 --- a/plugins/commands/serve/client/box_metadata.rb +++ b/plugins/commands/serve/client/box_metadata.rb @@ -3,7 +3,7 @@ module VagrantPlugins class Client class BoxMetadata < Client def name - client.name(Empty.new) + client.box_name(Empty.new).name end # @param [String] url for the metadata