06ad1b4565
This is a pass through test failures and deprecation warnings: * Make all ambiguous `.with(..., key: val)` use explicit hashes to prevent test failures for argument mismatch in Ruby 3.0 * Scope down all unbounded `raise_error` to address warnings (remove one test that was revealed to be referencing a nonexistent variable once the raise_error was scoped.) * Update all `any_instance` usage to new syntax to address warnings * Allow the service cache to be cleared and do so between some tests * Fix a small bug in with_plugin's plugin not found code path (revealed by a scoped and_raise)
71 lines
2.4 KiB
Ruby
71 lines
2.4 KiB
Ruby
module VagrantPlugins
|
|
module CommandServe
|
|
module Util
|
|
# Adds service info helper to be used with services
|
|
module ServiceInfo
|
|
# Call block and yield information about
|
|
# the incoming request based on provided
|
|
# context.
|
|
#
|
|
# @param context [GRPC::Context] Request context
|
|
# @param broker [Broker]
|
|
# @yieldparam [ServiceInfo]
|
|
def with_info(context, broker:, &block)
|
|
if broker.nil?
|
|
raise "NO BROKER FOR INFO"
|
|
end
|
|
if !context.metadata["plugin_name"]
|
|
raise KeyError,
|
|
"plugin name not defined (metadata content: #{context.metadata.inspect})"
|
|
end
|
|
|
|
info = Service::ServiceInfo.new(
|
|
plugin_name: context.metadata["plugin_name"],
|
|
broker: broker
|
|
)
|
|
if context.metadata["plugin_manager"] && info.broker
|
|
activated = true
|
|
Service::ServiceInfo.manager_tracker.activate do
|
|
client = Client::PluginManager.load(
|
|
context.metadata["plugin_manager"],
|
|
broker: info.broker
|
|
)
|
|
Vagrant.plugin("2").enable_remote_manager(client)
|
|
end
|
|
end
|
|
Thread.current.thread_variable_set(:service_info, info)
|
|
yield info if block_given?
|
|
ensure
|
|
if activated
|
|
Service::ServiceInfo.manager_tracker.deactivate do
|
|
Vagrant.plugin("2").disable_remote_manager
|
|
end
|
|
end
|
|
Thread.current.thread_variable_set(:service_info, nil)
|
|
end
|
|
|
|
# Call given block and yield local plugin class
|
|
# and information about the incoming request based
|
|
# on provided context.
|
|
#
|
|
# @param context [GRPC::Context] Request context
|
|
# @param plugins [Symbol] Type of plugins (:providers, :provisioners, etc.)
|
|
# @param broker [Broker]
|
|
def with_plugin(context, plugins, broker:, &block)
|
|
with_info(context, broker: broker) do |info|
|
|
plugin = Array(
|
|
Vagrant.plugin("2").
|
|
local_manager.
|
|
send(plugins)[info.plugin_name]
|
|
).first
|
|
if !plugin
|
|
raise NameError, "Failed to locate plugin '#{info.plugin_name}' within #{plugins} plugins"
|
|
end
|
|
yield plugin, info if block_given?
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|