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

Use remote plugin module when in server mode

Browse Source
This commit is contained in:
sophia 2021-12-06 13:11:13 -06:00 committed by Paul Hinze
parent e951c4d971
commit d5007d4d85
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
7 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/vagrant
View File

@ -199,9 +199,10 @@ begin
# Doing this prevents Vagrant from attempting to load an
# Environment directly.
if sub_cmd == "serve"
cmd = Vagrant.plugin("2").manager.commands[:serve].first
Vagrant.enable_server_mode!
cmd = Vagrant.plugin("2").manager.commands[:serve].first.call
result = cmd.new([], nil).execute
cmd_call = cmd.call
result = cmd_call.new([], nil).execute
exit(result)
else
# Create the environment, which is the cwd of wherever the

6
lib/vagrant.rb
View File

@ -181,6 +181,8 @@ module Vagrant
c.register([:"2", :provisioner]) { Plugin::V2::Provisioner }
c.register([:"2", :push]) { Plugin::V2::Push }
c.register([:"2", :synced_folder]) { Plugin::V2::SyncedFolder }
c.register(:remote) { Plugin::Remote::Plugin }
end
# Configure a Vagrant environment. The version specifies the version
@ -229,6 +231,10 @@ module Vagrant
# @param [String] component
# @return [Class]
def self.plugin(version, component=nil)
# TODO
if component.nil? && Vagrant.server_mode?
version = "remote"
end
# Build up the key and return a result
key = version.to_s.to_sym
key = [key, component.to_s.to_sym] if component

13
lib/vagrant/plugin/remote/manager.rb
View File

@ -18,25 +18,32 @@ module Vagrant
@registered = {}
end
# This returns all the registered commands.
#
# @return [Registry<Symbol, Array<Proc, Hash>>]
def commands
@registered[:command]
end
# This returns all the registered communicators.
#
# @return [Hash]
def communicators
registered[:communincator]
@registered[:communincator]
end
# This returns all the registered guests.
#
# @return [Hash]
def guests
registered[:guest]
@registered[:guest]
end
# This returns all the registered guests.
#
# @return [Hash]
def hosts
registered[:host]
@registered[:host]
end
# This returns all synced folder implementations.

16
lib/vagrant/plugin/remote/plugin.rb
View File

@ -2,7 +2,21 @@ module Vagrant
module Plugin
module Remote
# This is the wrapper class for all Remote plugins.
class Plugin
class Plugin < Vagrant::Plugin::V2::Plugin
# This returns the manager for all Remote plugins.
#
# @return [Remote::Manager]
def self.manager
@manager ||= Manager.new
end
# Returns the {Components} for this plugin.
#
# @return [Components]
def self.components
@components ||= Vagrant::Plugin::V2::Components.new
end
end
end
end

6
plugins/commands/serve/service/guest_service.rb
View File

@ -8,7 +8,7 @@ module VagrantPlugins
include CapabilityPlatformService
def initialize(*args, **opts, &block)
caps = Vagrant.plugin("2").manager.guest_capabilities
caps = Vagrant::Plugin::V2::Plugin.manager.guest_capabilities
default_args = {
Client::Target => SDK::FuncSpec::Value.new(
type: "hashicorp.vagrant.sdk.Args.Target",
@ -40,7 +40,7 @@ module VagrantPlugins
with_info(ctx) do |info|
plugin_name = info.plugin_name
machine = mapper.funcspec_map(req, expect: Vagrant::Machine)
plugin = Vagrant.plugin("2").manager.guests[plugin_name.to_s.to_sym].to_a.first
plugin = Vagrant::Plugin::V2::Plugin.manager.guests[plugin_name.to_s.to_sym].to_a.first
if !plugin
logger.debug("Failed to locate guest plugin for: #{plugin_name}")
raise "Failed to locate guest plugin for: #{plugin_name.inspect}"
@ -72,7 +72,7 @@ module VagrantPlugins
def parent(req, ctx)
with_info(ctx) do |info|
plugin_name = info.plugin_name
guest_hash = Vagrant.plugin("2").manager.guests[plugin_name.to_s.to_sym].to_a
guest_hash = Vagrant::Plugin::V2::Plugin.manager.guests[plugin_name.to_s.to_sym].to_a
plugin = guest_hash.first
if !plugin
raise "Failed to locate guest plugin for: #{plugin_name.inspect}"

6
plugins/commands/serve/service/host_service.rb
View File

@ -8,7 +8,7 @@ module VagrantPlugins
include CapabilityPlatformService
def initialize(*args, **opts, &block)
caps = Vagrant.plugin("2").manager.host_capabilities
caps =Vagrant::Plugin::V2::Plugin.manager.host_capabilities
default_args = {
Vagrant::Environment => SDK::FuncSpec::Value.new(
type: "hashicorp.vagrant.sdk.Args.Project",
@ -39,7 +39,7 @@ module VagrantPlugins
with_info(ctx) do |info|
plugin_name = info.plugin_name
statebag = mapper.funcspec_map(req, expect: Client::StateBag)
plugin = Vagrant.plugin("2").manager.hosts[plugin_name.to_s.to_sym].to_a.first
plugin = Vagrant::Plugin::V2::Plugin.manager.hosts[plugin_name.to_s.to_sym].to_a.first
if !plugin
raise "Failed to locate host plugin for: #{plugin_name.inspect}"
end
@ -70,7 +70,7 @@ module VagrantPlugins
def parent(req, ctx)
with_info(ctx) do |info|
plugin_name = info.plugin_name
host_hash = Vagrant.plugin("2").manager.hosts[plugin_name.to_s.to_sym].to_a
host_hash = Vagrant::Plugin::V2::Plugin.manager.hosts[plugin_name.to_s.to_sym].to_a
plugin = host_hash.first
if !plugin
raise "Failed to locate host plugin for: #{plugin_name.inspect}"

2
plugins/commands/serve/service/synced_folder_service.rb
View File

@ -155,7 +155,7 @@ module VagrantPlugins
private
def get_synced_folder_plugin(plugin_name)
synced_folders = Vagrant.plugin("2").manager.synced_folders
synced_folders = Vagrant::Plugin::V2::Plugin.manager.synced_folders
logger.debug("got synced folders #{synced_folders}")
plugin = [plugin_name.to_s.to_sym].to_a.first
logger.debug("got plugin #{plugin}")