From 28c0f6085c85db35323ac1e92a2d21d4404cecb9 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Tue, 6 Aug 2019 16:18:58 -0700 Subject: [PATCH] Attempt to validate top scope provisioner options --- plugins/kernel_v2/config/vm.rb | 7 +++++++ plugins/kernel_v2/config/vm_provisioner.rb | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index fc8b5d5b2..2cf4a9c75 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -760,6 +760,13 @@ module VagrantPlugins next end + require 'pry' + binding.pry + #provisioner_errors = vm_provisioner.validate(machine) + #if provisioner_errors + # errors = Vagrant::Config::V2::Util.merge_errors(errors, provisioner_errors) + #end + if vm_provisioner.config provisioner_errors = vm_provisioner.config.validate(machine) if provisioner_errors diff --git a/plugins/kernel_v2/config/vm_provisioner.rb b/plugins/kernel_v2/config/vm_provisioner.rb index a6f98d9cf..4f49bed80 100644 --- a/plugins/kernel_v2/config/vm_provisioner.rb +++ b/plugins/kernel_v2/config/vm_provisioner.rb @@ -3,7 +3,7 @@ require 'log4r' module VagrantPlugins module Kernel_V2 # Represents a single configured provisioner for a VM. - class VagrantConfigProvisioner + class VagrantConfigProvisioner < Vagrant.plugin("2", :config) # Defaults VALID_BEFORE_AFTER_TYPES = [:each, :all].freeze @@ -53,7 +53,7 @@ module VagrantPlugins # @return [String] attr_accessor :after - def initialize(name, type) + def initialize(name, type, before=nil, after=nil) @logger = Log4r::Logger.new("vagrant::config::vm::provisioner") @logger.debug("Provisioner defined: #{name}") @@ -64,8 +64,8 @@ module VagrantPlugins @preserve_order = false @run = nil @type = type - @before = nil - @after = nil + @before = before #these aren't being properly set + @after = after # Attempt to find the provisioner... if !Vagrant.plugin("2").manager.provisioners[type]