beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove command metadata from service info

Browse Source
This commit is contained in:
sophia 2021-04-22 13:17:04 -05:00 committed by Paul Hinze
parent 0e618a4fd1
commit b4f0ef56df
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/commands/serve/service.rb
View File

@ -30,18 +30,15 @@ module VagrantPlugins
attr_reader :vagrant_service_endpoint
# @return [String] Name of requested plugin
attr_reader :plugin_name
# @return [String[], nil] Name of subcommand for command plugins
attr_reader :command
CLIENT_LOCK = Mutex.new
def initialize(basis: nil, project: nil, machine: nil, vagrant_service_endpoint: nil, plugin_name: nil, command: nil)
def initialize(basis: nil, project: nil, machine: nil, vagrant_service_endpoint: nil, plugin_name: nil)
@basis = basis
@project = project
@machine = machine
@vagrant_service_endpoint = vagrant_service_endpoint
@plugin_name = plugin_name
@command = command
end
def self.info
@ -66,23 +63,12 @@ module VagrantPlugins
end
def self.with_info(context)
cmd_meta = context.metadata["command"]
if cmd_meta.nil?
command = []
else
if cmd_meta.is_a?(String)
command = context.metadata["command"].split(" ")
else
command = context.metadata["command"]
end
end
info = new(
basis: context.metadata["basis_resource_id"],
project: context.metadata["project_resource_id"],
machine: context.metadata["machine_resource_id"],
vagrant_service_endpoint: context.metadata["vagrant_service_endpoint"],
plugin_name: context.metadata["plugin_name"],
command: command,
)
Thread.current.thread_variable_set(:service_info, info)
return if !block_given?

3
plugins/commands/serve/service/command_service.rb
View File

@ -18,7 +18,8 @@ module VagrantPlugins
def command_info(req, ctx)
ServiceInfo.with_info(ctx) do |info|
command_info = collect_command_info(info.plugin_name, info.command)
subcommand = req.command_string.to_a[1..]
command_info = collect_command_info(info.plugin_name, subcommand)
LOGGER.info("command info, #{command_info}")
SDK::Command::CommandInfoResp.new(
command_info: command_info,