Use seed util module for clients/services

This commit is contained in:
Chris Roberts 2021-12-02 13:49:15 -08:00 committed by Paul Hinze
parent 262a4fa099
commit 167b8bf70d
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
5 changed files with 10 additions and 11 deletions

View File

@ -8,6 +8,7 @@ module VagrantPlugins
prepend Util::HasLogger
include CapabilityPlatform
include Util::HasSeeds::Client
# @return [<String>] parents
def parents

View File

@ -8,6 +8,7 @@ module VagrantPlugins
prepend Util::HasLogger
include CapabilityPlatform
include Util::HasSeeds::Client
# @return [<String>] parents
def parents

View File

@ -7,6 +7,7 @@ module VagrantPlugins
def self.included(klass)
klass.include(Util::ServiceInfo)
klass.include(Util::HasSeeds::Service)
klass.prepend(Util::HasMapper)
klass.prepend(Util::HasBroker)
klass.prepend(Util::HasLogger)
@ -22,16 +23,6 @@ module VagrantPlugins
@default_args = default_args
end
# TODO(spox): request scoping for seed values - needs investigation
def seed(req, ctx)
@seeds = req.arguments.to_a
Empty.new
end
def seeds(req, ctx)
SDK::Args::Direct.new(arguments: @seeds)
end
def has_capability_spec(*_)
SDK::FuncSpec.new(
name: "has_capability_spec",
@ -54,7 +45,7 @@ module VagrantPlugins
with_info(ctx) do |info|
cap_name = mapper.funcspec_map(req)
plugin_name = info.plugin_name
logger.debug("checking for #{cap_name} capability in #{plugin_name}")
logger.debug("checking for #{cap_name.inspect} capability in #{plugin_name}")
caps_registry = @capabilities[plugin_name.to_sym]
has_cap = caps_registry.key?(cap_name.to_sym)
@ -93,6 +84,10 @@ module VagrantPlugins
caps_registry = capabilities[plugin_name]
target_cap = caps_registry.get(cap_name)
if target_cap.nil?
raise "Failed to locate requested capability `#{cap_name.inspect}' on plugin #{plugin_name}"
end
args = mapper.funcspec_map(
req.func_args,
expect: default_args.keys + [Types::Direct]

View File

@ -5,6 +5,7 @@ module VagrantPlugins
module Service
class CommandService < SDK::CommandService::Service
include Util::ServiceInfo
include Util::HasSeeds::Service
prepend Util::HasMapper
prepend Util::HasBroker

View File

@ -7,6 +7,7 @@ module VagrantPlugins
module Service
class ProviderService < SDK::ProviderService::Service
include Util::ServiceInfo
include Util::HasSeeds::Service
prepend Util::HasMapper
prepend Util::HasBroker