From 93f3c70dd0280dbecbf2ba5a1221b332b7b8594e Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 2 Feb 2021 15:02:11 -0800 Subject: [PATCH] Update load path modifications and requires for new proto path --- plugins/commands/serve/command.rb | 19 +++++++++---------- .../serve/service/internal_service.rb | 2 -- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/plugins/commands/serve/command.rb b/plugins/commands/serve/command.rb index ad02f82a7..f4009e6a8 100644 --- a/plugins/commands/serve/command.rb +++ b/plugins/commands/serve/command.rb @@ -1,14 +1,13 @@ -$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/proto/gen").to_s -$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/proto/gen/plugin").to_s +$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs").to_s +$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s +$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto/vagrant_plugin_sdk").to_s -require 'vagrant/proto/gen/internal/server/proto/server_pb' -require 'vagrant/proto/gen/internal/server/proto/server_services_pb' -require 'vagrant/proto/gen/ruby-server_pb' -require 'vagrant/proto/gen/ruby-server_services_pb' -require 'vagrant/proto/gen/plugin/plugin_pb' -require 'vagrant/proto/gen/plugin/plugin_services_pb' -require 'vagrant/proto/gen/plugin/core_pb' -require 'vagrant/proto/gen/plugin/core_services_pb' +require 'vagrant/protobufs/proto/vagrant_server/server_pb' +require 'vagrant/protobufs/proto/vagrant_server/server_services_pb' +require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb' +require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb' +require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb' +require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb' require "optparse" require 'grpc' diff --git a/plugins/commands/serve/service/internal_service.rb b/plugins/commands/serve/service/internal_service.rb index c5d2074e0..9cb58cee8 100644 --- a/plugins/commands/serve/service/internal_service.rb +++ b/plugins/commands/serve/service/internal_service.rb @@ -5,8 +5,6 @@ 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