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

Fixes from rebase

Browse Source
This commit is contained in:
sophia 2021-01-20 16:17:56 -06:00 committed by Paul Hinze
parent 3c360722df
commit f68d470dc9
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
2 changed files with 61 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
plugins/commands/serve/service/internal_service.rb
View File

@ -1,4 +1,13 @@
require "vagrant/plugin/v2/plugin"
require "vagrant/vagrantfile"
require "vagrant/box_collection"
require "vagrant/config"
require "pathname"
require 'vagrant/proto/gen/ruby-server_pb'
require 'vagrant/proto/gen/ruby-server_services_pb'
require 'google/protobuf/well_known_types'
module VagrantPlugins
module CommandServe
@ -22,6 +31,58 @@ module VagrantPlugins
plugins: plugins
)
end
def parse_vagrantfile(req, _unused_call)
vagrantfile_path = req.path
raw = File.read(vagrantfile_path)
# Load up/parse the vagrantfile
config_loader = Vagrant::Config::Loader.new(
Vagrant::Config::VERSIONS, Vagrant::Config::VERSIONS_ORDER)
config_loader.set(:root, vagrantfile_path)
v = Vagrant::Vagrantfile.new(config_loader, [:root])
sc = v.config.ssh
ssh_config = Hashicorp::Vagrant::Sdk::SSHInfo.new(
port: sc.guest_port.to_s, ssh_command: sc.shell
)
wc = v.config.winrm
winrm_config = Hashicorp::Vagrant::Sdk::WinrmInfo.new(
username: wc.username, password: wc.password, host: wc.host,
port: wc.port, guest_port: wc.guest_port)
communicators = [
Hashicorp::Vagrant::Communicator.new(
name: "ssh", config: Google::Protobuf::Any.pack(ssh_config)
),
Hashicorp::Vagrant::Communicator.new(
name: "winrm", config: Google::Protobuf::Any.pack(winrm_config)
),
]
machine_configs = []
# Get the config for each machine
v.machine_names.each do |mach|
machine_info = v.machine_config(mach, nil, nil)
root_config = machine_info[:config]
config = root_config.vm
machine_configs << Hashicorp::Vagrant::MachineConfig.new(
name: mach.to_s,
box: config.box,
provisioners: []
)
end
vagrantfile = Hashicorp::Vagrant::Vagrantfile.new(
path: vagrantfile_path,
raw: raw,
current_version: Vagrant::Config::CURRENT_VERSION,
machine_configs: machine_configs,
communicators: communicators,
)
Hashicorp::Vagrant::ParseVagrantfileResponse.new(
vagrantfile: vagrantfile
)
end
end
end
end

102
plugins/commands/serve/service/ruby_vagrant_service.rb
View File

@ -1,102 +0,0 @@
require "vagrant/plugin/v2/plugin"
require "vagrant/vagrantfile"
require "vagrant/box_collection"
require "vagrant/config"
require 'pp'
require "pathname"
require 'vagrant/proto/gen/ruby-server_pb'
require 'vagrant/proto/gen/ruby-server_services_pb'
require 'google/protobuf/well_known_types'
module VagrantPlugins
module CommandServe
module Serve
class RubyVagrantService < Hashicorp::Vagrant::RubyVagrant::Service
LOG = Logger.new('/tmp/vagrant-ruby.txt')
def get_plugins(req, _unused_call)
plugins = []
plugin_manager = Vagrant::Plugin::V2::Plugin.manager
plugin_manager.commands.each do |k, v|
plugins << Hashicorp::Vagrant::Plugin.new(name: k, type: Hashicorp::Vagrant::Plugin::Type::COMMAND )
end
plugin_manager.communicators.each do |k, v|
plugins << Hashicorp::Vagrant::Plugin.new(name: k, type: Hashicorp::Vagrant::Plugin::Type::COMMUNICATOR )
end
plugin_manager.guests.each do |k, v|
plugins << Hashicorp::Vagrant::Plugin.new(name: k, type: Hashicorp::Vagrant::Plugin::Type::GUEST )
end
plugin_manager.hosts.each do |k, v|
plugins << Hashicorp::Vagrant::Plugin.new(name: k, type: Hashicorp::Vagrant::Plugin::Type::HOST )
end
plugin_manager.providers.each do |k, v|
plugins << Hashicorp::Vagrant::Plugin.new(name: k, type: Hashicorp::Vagrant::Plugin::Type::PROVIDER )
end
plugin_manager.provisioners.each do |k, v|
plugins << Hashicorp::Vagrant::Plugin.new(name: k, type: Hashicorp::Vagrant::Plugin::Type::PROVISIONER )
end
plugin_manager.synced_folders.each do |k, v|
plugins << Hashicorp::Vagrant::Plugin.new(name: k, type: Hashicorp::Vagrant::Plugin::Type::SYNCED_FOLDER )
end
Hashicorp::Vagrant::GetPluginsResponse.new(
plugins: plugins
)
end
def parse_vagrantfile(req, _unused_call)
vagrantfile_path = req.path
raw = File.read(vagrantfile_path)
# Load up/parse the vagrantfile
config_loader = Vagrant::Config::Loader.new(
Vagrant::Config::VERSIONS, Vagrant::Config::VERSIONS_ORDER)
config_loader.set(:root, vagrantfile_path)
v = Vagrant::Vagrantfile.new(config_loader, [:root])
sc = v.config.ssh
ssh_config = Hashicorp::Vagrant::Sdk::SSHInfo.new(
port: sc.guest_port.to_s, ssh_command: sc.shell
)
wc = v.config.winrm
winrm_config = Hashicorp::Vagrant::Sdk::WinrmInfo.new(
username: wc.username, password: wc.password, host: wc.host,
port: wc.port, guest_port: wc.guest_port)
communicators = [
Hashicorp::Vagrant::Communicator.new(
name: "ssh", config: Google::Protobuf::Any.pack(ssh_config)
),
Hashicorp::Vagrant::Communicator.new(
name: "winrm", config: Google::Protobuf::Any.pack(winrm_config)
),
]
machine_configs = []
# Get the config for each machine
v.machine_names.each do |mach|
machine_info = v.machine_config(mach, nil, nil)
root_config = machine_info[:config]
config = root_config.vm
machine_configs << Hashicorp::Vagrant::MachineConfig.new(
name: mach.to_s,
box: config.box,
provisioners: []
)
end
vagrantfile = Hashicorp::Vagrant::Vagrantfile.new(
path: vagrantfile_path,
raw: raw,
current_version: Vagrant::Config::CURRENT_VERSION,
machine_configs: machine_configs,
communicators: communicators,
)
Hashicorp::Vagrant::ParseVagrantfileResponse.new(
vagrantfile: vagrantfile
)
end
end
end
end
end