vagrant-bolt 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990a16a93781adb1b28be300b0ea508f803ff3c0bc9be52116248e32de342b37
-  data.tar.gz: 7040a8261b3361000aa348c33655ef305450d143a0242258ba8e43a02038e027
+  metadata.gz: 534ab9c0b5855064fd04ab2ff43924dd4fcf64360d9505deb9fa1c87fa80dd87
+  data.tar.gz: f0a2dbbaf6dc37a1dcb3bd014eacc01b7b3b2ea0e3fab04089546490b206463e
 SHA512:
-  metadata.gz: 4e69a5dc28b0091ade803b1f2e8fa350b9684b4ef55ebfa7d52b3a02fd8bbabafacff0a54bf9522cdd71a0c65d30de4ec596fbc0c4044c57545e16a1b72e494d
-  data.tar.gz: 5ba5d41497a76f67ae8092edf8928e584331813d9103852193008fdd40456b03b23999e05ae03e1a18d7e4cf35417f87a1f6cafd2b498ed872c973b5f36f9d28
+  metadata.gz: de73c711587dbff8917abfed452aef34ba2fabca22f67d79b291ec9a5548ac279617065e9d8e7cadde3ee05b57d3d79e5781b53d0f06bd1e97ec8b8ff671590d
+  data.tar.gz: 8afd8928752874c3d93bf64cc7de893542138a8ee5a7d0b4ac4617410a0f505cb70d8f7ad7aed9df2fc6a473aebab5817e21efb7bade5cfdcbcf19cba4e80f38

data/.gitignore

@@ -15,3 +15,4 @@ Gemfile.local
 /site-modules
 *.box
 *.rerun.json
+.resource_types

data/.rubocop.yml

@@ -96,14 +96,6 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
-Metrics/MethodLength:
-  Enabled: true
-  ExcludedMethods:
-    - initialize
-    - finalize!
-    - validate
-    - to_proc
-  Max: 25
 Metrics/ClassLength:
   Enabled: false
 Metrics/ModuleLength:

data/.travis.yml

@@ -23,6 +23,6 @@ matrix:
   fast_finish: true
   include:
     - rvm: 2.4.4
-      env: TEST_VAGRANT_VERSION=v2.2.2
+      env: TEST_VAGRANT_VERSION=v2.2.7
     - rvm: 2.5.0
       env: TEST_VAGRANT_VERSION=HEAD

data/CHANGELOG.md

@@ -1,6 +1,16 @@
-# Change Log
+# Changelog
+
+## [v0.2.0](https://github.com/oscar-stack/vagrant-bolt/tree/v0.2.0) (2020-02-26)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.2...v0.2.0)
+
+**Merged pull requests:**
+
+- Change nodes to targets in config [\#14](https://github.com/oscar-stack/vagrant-bolt/pull/14) ([jarretlavallee](https://github.com/jarretlavallee))
+- Update to Bolt inventory v2 [\#12](https://github.com/oscar-stack/vagrant-bolt/pull/12) ([jarretlavallee](https://github.com/jarretlavallee))
 
 ## [v0.1.2](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.2) (2019-10-17)
+
 [Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.1...v0.1.2)
 
 **Merged pull requests:**
@@ -9,6 +19,7 @@
 - Fix changelog version tag [\#10](https://github.com/oscar-stack/vagrant-bolt/pull/10) ([jarretlavallee](https://github.com/jarretlavallee))
 
 ## [v0.1.1](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.1) (2019-07-01)
+
 [Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/v0.1.0...v0.1.1)
 
 **Merged pull requests:**
@@ -18,6 +29,9 @@
 - Add connect\_timeout option to inventory [\#7](https://github.com/oscar-stack/vagrant-bolt/pull/7) ([jarretlavallee](https://github.com/jarretlavallee))
 
 ## [v0.1.0](https://github.com/oscar-stack/vagrant-bolt/tree/v0.1.0) (2018-12-11)
+
+[Full Changelog](https://github.com/oscar-stack/vagrant-bolt/compare/4574482459a0f320bb6b25557199a1612b19ea72...v0.1.0)
+
 **Merged pull requests:**
 
 - \(SUP-874\) Add a command line interface [\#6](https://github.com/oscar-stack/vagrant-bolt/pull/6) ([jarretlavallee](https://github.com/jarretlavallee))
@@ -29,4 +43,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 require 'rubygems/version'
 
-vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.2.2'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.2.7'
 
 group :plugins do
   gemspec
@@ -31,7 +31,7 @@ group :test do
 end
 
 group :system_tests do
-  gem 'bolt', ">=1.5.0"
+  gem 'bolt', "~> 1.48.0"
 end
 
 

data/README.md

@@ -177,13 +177,13 @@ VagrantBolt.task('facts', env, machine, user: 'ubuntu', password: 'testpassword'
 Run the `facts` plan on `server1` and `server2`.
 
 ~~~ruby
-VagrantBolt.plan('facts', env, machine, nodes: [:server1, :server2])
+VagrantBolt.plan('facts', env, machine, targets: [:server1, :server2])
 ~~~
 
-Run the `hostname` command on all nodes.
+Run the `hostname` command on all targets.
 
 ~~~ruby
-VagrantBolt.command('/bin/hostname', env, machine, nodes: 'all')
+VagrantBolt.command('/bin/hostname', env, machine, targets: 'all')
 ~~~
 
 Run the `service::linux` task as `root` to restart `cron` with a specific path to the bolt executable. This configuration specifies params for the `service::linux` task.
@@ -220,20 +220,20 @@ The settings available in the triggers and the provisioner are the same.
 * `boltdir`
   * Description: A string containing the bolt working directory
   * Default: The vagrant root
-* `node_list`
-  * Description: A string containing bolt node list in URI format
-    * This will override `nodes` and `excludes`
-  * Default: `%{protocol}://%{ssh_ip}:%{ssh_port}` if `nodes` is not specified
-* `nodes`
+* `target_list`
+  * Description: A string containing bolt target list in URI format
+    * This will override `targets` and `excludes`
+  * Default: `%{protocol}://%{ssh_ip}:%{ssh_port}` if `targets` is not specified
+* `targets`
   * Description: An array of machine names to run the task or plan on
-    * The `node_list` will override this setting.
+    * The `target_list` will override this setting.
     * A special `ALL` string can be used instead of an array to use all active machines in the environment
   * Valid Values: An array of machine symbols or the string "ALL"
   * Default: `[]`
 * `excludes`
   * Description: An array of machine names to not run the task on
-    * The `node_list` will override this setting.
-    * This setting will take precidence over `nodes`
+    * The `target_list` will override this setting.
+    * This setting will take precidence over `targets`
   * Valid Values: An array of machine symbols
   * Default: `[]`
 * `params`
@@ -277,7 +277,14 @@ The settings available in the triggers and the provisioner are the same.
 * `vars`
   * Description: A hash containing arbitrary data that may be passed to run_* functions or used for logic in plans
 * `facts`
-  * Description: A hash containing observed information about the node including what can be collected by Facter
+  * Description: A hash containing observed information about the target including what can be collected by Facter
+
+**Deprecated Parameters**
+
+* `node_list`
+  * Replaced by `target_list`
+* `nodes`
+  * Replaced by `targets`
 
 Config Builder
 --------------
@@ -373,7 +380,7 @@ The command can be used to deploy the Puppetfile, for example.
 vagrant bolt puppetfile install
 ~~~
 
-It can be used to run ad-hoc tasks on a node by specifying the node by its machine name.
+It can be used to run ad-hoc tasks on a target by specifying the target by its machine name.
 
 ~~~shell
 vagrant bolt -u task run facts -n server
@@ -390,7 +397,7 @@ vagrant bolt command run 'date' -n agent,master
 Other Use Cases
 ---------------
 
-There are some other use cases for Vagrant Bolt. One of which is to not use the triggers or provisioning to run bolt commands on the nodes, but to manage the inventory file for manual testing. This can easily be accomplished by using a trigger to manage the `inventory.yaml` file and specifying the configuration for the nodes in the config based on the options above. Below is an example trigger that will manage a `./inventory.yaml` file for use with external bolt commands.
+There are some other use cases for Vagrant Bolt. One of which is to not use the triggers or provisioning to run bolt commands on the targets, but to manage the inventory file for manual testing. This can easily be accomplished by using a trigger to manage the `inventory.yaml` file and specifying the configuration for the targets in the config based on the options above. Below is an example trigger that will manage a `./inventory.yaml` file for use with external bolt commands.
 
 ~~~ruby
 require 'vagrant-bolt'

data/acceptance/components/bolt_spec.rb

@@ -24,7 +24,7 @@ shared_examples 'provider/virtualbox' do |provider, options|
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt task run 'facts'})
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt plan run 'facts'})
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run})
-      expect(@result.stdout.scan(%r{Successful on 1 node}).size).to eq(3)
+      expect(@result.stdout.scan(%r{Successful on 1 target}).size).to eq(3)
     end
   end
 
@@ -39,7 +39,7 @@ shared_examples 'provider/virtualbox' do |provider, options|
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt task run 'facts'})
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt plan run 'facts'})
       expect(@result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run})
-      expect(@result.stdout.scan(%r{Successful on 1 node}).size).to eq(3)
+      expect(@result.stdout.scan(%r{Successful on 1 target}).size).to eq(3)
     end
   end
 
@@ -50,18 +50,18 @@ shared_examples 'provider/virtualbox' do |provider, options|
 
     it 'runs a task, plan, and command' do
       expect(@result.exit_code).to eq(0)
-      result = assert_execute('vagrant', 'bolt', 'task', 'run', 'facts', '-n', 'server')
+      result = assert_execute('vagrant', 'bolt', 'task', 'run', 'facts', '-t', 'server')
       expect(result.exit_code).to eq(0)
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: '\/[^\ ]+bolt' 'task' 'run' 'facts'})
-      expect(result.stdout.scan(%r{Successful on 1 node}).size).to eq(1)
-      result = assert_execute('vagrant', 'bolt', 'plan', 'run', 'facts', '-n', 'server')
+      expect(result.stdout.scan(%r{Successful on 1 target}).size).to eq(1)
+      result = assert_execute('vagrant', 'bolt', 'plan', 'run', 'facts', '-t', 'server')
       expect(result.exit_code).to eq(0)
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: '\/[^\ ]+bolt' 'plan' 'run' 'facts'})
-      expect(result.stdout.scan(%r{Successful on 1 node}).size).to eq(1)
-      result = assert_execute('vagrant', 'bolt', 'command', 'run', 'hostname', '-n', 'server')
+      expect(result.stdout.scan(%r{Successful on 1 target}).size).to eq(1)
+      result = assert_execute('vagrant', 'bolt', 'command', 'run', 'hostname', '-t', 'server')
       expect(result.exit_code).to eq(0)
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: '\/[^\ ]+bolt' 'command' 'run'})
-      expect(result.stdout.scan(%r{Successful on 1 node}).size).to eq(1)
+      expect(result.stdout.scan(%r{Successful on 1 target}).size).to eq(1)
     end
   end
 
@@ -79,14 +79,14 @@ shared_examples 'provider/virtualbox' do |provider, options|
       # Check for root level triggers
       result = assert_execute('vagrant', 'provision')
       expect(result.exit_code).to eq(0)
-      # Ensure that the trigger is run on both nodes
+      # Ensure that the trigger is run on both targets
       expect(result.stdout.scan(%r{server[12]:\s+allnodetest}).size).to eq(4)
-      # Ensure that 'nodes = all' includes both nodes
+      # Ensure that 'targets = all' includes both targets
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run[^\n]+allnodetest[^\n]+server[12],server[12]})
       # Ensure that the root level `run_as` is used
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run[^\n]+allnodetest[^\n]+--run-as 'root'})
       ## Configtest
-      # Ensure excludes overrides nodes
+      # Ensure excludes overrides targets
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run[^\n]+configtest[^\n]+server2})
       # Ensure verbose and debug flags are correctly handled
       expect(result.stdout).to match(%r{Bolt: Running bolt command locally: \/[^\ ]+bolt command run[^\n]+configtest[^\n]+--verbose})

data/acceptance/skeletons/advanced/Vagrantfile

@@ -6,7 +6,7 @@ Vagrant.configure('2') do |config|
   # Run a trigger on all nodes after provision
   config.trigger.after :provision do |trigger|
     trigger.ruby do |env, machine|
-      VagrantBolt.command('/bin/echo "allnodetest"', env, machine, nodes: 'all')
+      VagrantBolt.command('/bin/echo "allnodetest"', env, machine, targets: 'all')
     end
   end
   config.vm.define 'server1' do |node|

data/acceptance/skeletons/base/Vagrantfile

@@ -6,6 +6,7 @@ Vagrant.configure('2') do |config|
     node.vm.provision :bolt do |bolt|
       bolt.command = :task
       bolt.name    = "facts"
+      bolt.targets = ['server']
     end
   end
 end

data/lib/vagrant-bolt/config/bolt.rb

@@ -10,6 +10,7 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   attr_accessor :name
 
   # @!attribute [rw] nodes
+  # DEPRECATED. Use `targets` instead.
   # Note: The `node_list` will override this setting.
   # @return [Array<String, Symbol>, "ALL"] The nodes to run the task or plan on.
   # Valid values are an array of machine names or the string "ALL".
@@ -17,14 +18,15 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
 
   # @!attribute [rw] excludes
   # Note: The `node_list` will override this setting.
-  # Note: This will be merged with `nodes`, with `excludes` taking precidence.
-  # @return [Array<String, Symbol>] The nodes to exclude from running this task or plan on.
+  # Note: This will be merged with `targets`, with `excludes` taking precidence.
+  # @return [Array<String, Symbol>] The targets to exclude from running this task or plan on.
   # Valid values are an array of machine names.
   attr_accessor :excludes
 
   # @!attribute [rw] node_list
+  # DEPRECATED. Use `target_list` instead.
   # This setting overrides `nodes` and needs to be in the `protocol://ipaddress:port` URI format.
-  # @return [String] The bolt node list. This defaults to the currnet node.
+  # @return [String] The bolt node list. This defaults to the currnet machine.
   attr_accessor :node_list
 
   # @!attribute [rw] params
@@ -39,6 +41,17 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   # @return [Boolean] If the command should be run with noop. Only valid with tasks and apply.
   attr_accessor :noop
 
+  # @!attribute [rw] targets
+  # Note: The `target_list` will override this setting.
+  # @return [Array<String, Symbol>, "ALL"] The targets to run the task or plan on.
+  # Valid values are an array of machine names or the string "ALL".
+  attr_accessor :targets
+
+  # @!attribute [rw] target_list
+  # This setting overrides `targets` and needs to be in the `protocol://ipaddress:port` URI format.
+  # @return [String] The bolt target list. This defaults to the currnet machine.
+  attr_accessor :target_list
+
   def initialize
     super
     @args         = UNSET_VALUE
@@ -48,6 +61,8 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
     @node_list    = UNSET_VALUE
     @params       = UNSET_VALUE
     @command      = UNSET_VALUE
+    @targets      = []
+    @target_list  = UNSET_VALUE
   end
 
   def finalize!
@@ -73,15 +88,18 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
     @params         = nil if @params == UNSET_VALUE
     @command        = nil if @command == UNSET_VALUE
     @noop           = nil if @noop == UNSET_VALUE
+    # Use nodes if targets is not specified.
+    @targets        = @nodes if @targets.empty?
+    @target_list    = @node_list if (@target_list == UNSET_VALUE) || @target_list.nil?
   end
 
   def merge(other)
     super.tap do |result|
       new_excludes = (excludes + other.excludes.dup).flatten.uniq
       result.instance_variable_set(:@excludes, new_excludes.to_a)
-      unless nodes.to_s.casecmp("all").zero?
-        new_nodes = (nodes + other.nodes.dup).flatten.uniq
-        result.instance_variable_set(:@nodes, new_nodes.to_a)
+      unless targets.to_s.casecmp("all").zero?
+        new_targets = (targets + other.targets.dup).flatten.uniq
+        result.instance_variable_set(:@targets, new_targets.to_a)
       end
     end
   end
@@ -90,9 +108,9 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
     errors = _detected_errors
     errors << I18n.t('vagrant-bolt.config.bolt.errors.invalid_command', command: @command.to_s) if !@command.nil? && !['task', 'plan', 'command'].include?(@command.to_s)
 
-    if @nodes.nil? || (!(@nodes.is_a? Array) && !@nodes.to_s.casecmp("all").zero?)
+    if @targets.nil? || (!(@targets.is_a? Array) && !@targets.to_s.casecmp("all").zero?)
       errors << I18n.t('vagrant-bolt.config.bolt.errors.invalid_data_command',
-                       item: 'nodes',
+                       item: 'targets',
                        command: 'array')
     end
 
@@ -121,8 +139,10 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   def blacklist
     [
       'nodes',
+      'targets',
       'excludes',
       'node_list',
+      'target_list',
       'bolt_exe',
       'args',
       'command',

data/lib/vagrant-bolt/config_builder/config.rb

@@ -37,21 +37,23 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   def_model_attribute :name
 
   # @!attribute [rw] nodes
+  # DEPRECATED. Use `targets` instead.
   # Note: The `node_list` will override this setting.
   # @return [Array<String, Symbol>, "ALL"] The nodes to run the task or plan on.
   # Valid values are an array of machine names or the string "ALL".
   def_model_attribute :nodes
 
   # @!attribute [rw] excludes
-  # Note: The `node_list` will override this setting.
-  # Note: This will be merged with `nodes`, with `excludes` taking precidence.
-  # @return [Array<String, Symbol>] The nodes to exclude from running this task or plan on.
+  # Note: The `target_list` will override this setting.
+  # Note: This will be merged with `targets`, with `excludes` taking precidence.
+  # @return [Array<String, Symbol>] The targets to exclude from running this task or plan on.
   # Valid values are an array of machine names.
   def_model_attribute :excludes
 
   # @!attribute [rw] node_list
+  # DEPRECATED. Use `target_list` instead.
   # This setting overrides `nodes` and needs to be in the `protocol://ipaddress:port` URI format
-  # @return [String] The bolt node list. This defaults to the currnet node.
+  # @return [String] The bolt node list. This defaults to the current node.
   def_model_attribute :node_list
 
   # @!attribute [rw] noop
@@ -98,6 +100,17 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   # @return [Boolean] If the connection should verify SSL on with WinRM (Windows)
   def_model_attribute :ssl_verify
 
+  # @!attribute [rw] targets
+  # Note: The `target_list` will override this setting.
+  # @return [Array<String, Symbol>, "ALL"] The targets to run the task or plan on.
+  # Valid values are an array of machine names or the string "ALL".
+  def_model_attribute :targets
+
+  # @!attribute [rw] target_list
+  # This setting overrides `targets` and needs to be in the `protocol://ipaddress:port` URI format
+  # @return [String] The bolt target list. This defaults to the current target.
+  def_model_attribute :target_list
+
   # @!attribute [rw] tmpdir
   # @return [String] The directory to upload and execute temporary files on the target
   def_model_attribute :tmpdir
@@ -144,6 +157,8 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
       with_attr(:sudo_password)   { |val| bolt.sudo_password   = val }
       with_attr(:ssl)             { |val| bolt.ssl             = val }
       with_attr(:ssl_verify)      { |val| bolt.ssl_verify      = val }
+      with_attr(:targets)         { |val| bolt.targets         = val }
+      with_attr(:target_list)     { |val| bolt.target_list     = val }
       with_attr(:tmpdir)          { |val| bolt.tmpdir          = val }
       with_attr(:verbose)         { |val| bolt.verbose         = val }
       with_attr(:facts)           { |val| bolt.facts           = val }

data/lib/vagrant-bolt/config_builder/monkey_patches.rb

@@ -29,7 +29,7 @@ module VagrantBolt::ConfigBuilder::MonkeyPatches
 
   def eval_bolt_triggers_root(vm_root_config)
     # Configure the vm bolt object if the options exist
-    triggers = attr(:bolt_triggers) || [] # rubocop:disable Style/Attr
+    triggers = attr(:bolt_triggers) || []
     triggers.each do |config|
       f = VagrantBolt::ConfigBuilder::Triggers.new_from_hash(config)
       f.call(vm_root_config)
@@ -47,7 +47,7 @@ ConfigBuilder::Model::VM.prepend(VagrantBolt::ConfigBuilder::MonkeyPatches)
 # Allow for the role filter to handle bolt configs and bolt_triggers
 # @!visibility private
 module VagrantBolt::ConfigBuilder::MonkeyPatches::FilterRoles
-  def merge_nodes!(left, right)
+  def merge_targets!(left, right)
     super.tap do |result|
       array_keys = ['bolt_triggers']
       array_keys.each do |key|

data/lib/vagrant-bolt/config_builder/provisioner.rb

@@ -37,6 +37,7 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   def_model_attribute :name
 
   # @!attribute [rw] nodes
+  # DEPRECATED. Use `targets` instead.
   # Note: The `node_list` will override this setting.
   # @return [Array<String, Symbol>, "ALL"] The nodes to run the task or plan on.
   # Valid values are an array of machine names or the string "ALL".
@@ -47,9 +48,9 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   def_model_attribute :noop
 
   # @!attribute [rw] excludes
-  # Note: The `node_list` will override this setting.
-  # Note: This will be merged with `nodes`, with `excludes` taking precidence.
-  # @return [Array<String, Symbol>] The nodes to exclude from running this task or plan on.
+  # Note: The `target_list` will override this setting.
+  # Note: This will be merged with `targets`, with `excludes` taking precidence.
+  # @return [Array<String, Symbol>] The targets to exclude from running this task or plan on.
   # Valid values are an array of machine names.
   def_model_attribute :excludes
 
@@ -98,6 +99,17 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   # @return [Boolean] If the connection should verify SSL on with WinRM (Windows)
   def_model_attribute :ssl_verify
 
+  # @!attribute [rw] targets
+  # Note: The `target_list` will override this setting.
+  # @return [Array<String, Symbol>, "ALL"] The targets to run the task or plan on.
+  # Valid values are an array of machine names or the string "ALL".
+  def_model_attribute :targets
+
+  # @!attribute [rw] target_list
+  # This setting overrides `targets` and needs to be in the `protocol://ipaddress:port` URI format
+  # @return [String] The bolt target list. This defaults to the current target.
+  def_model_attribute :target_list
+
   # @!attribute [rw] tmpdir
   # @return [String] The directory to upload and execute temporary files on the target
   def_model_attribute :tmpdir

data/lib/vagrant-bolt/runner.rb

@@ -16,12 +16,12 @@ class VagrantBolt::Runner
   # @param [Symbol, String] command The command of bolt to run; task or plan
   # @param [String] name The name of the bolt task or plan to run
   # @param [Hash] args A optional hash of bolt config overrides. No merging will be done with the overrides
-  # @example run('task', 'facts', {node_list: "machinename"})
+  # @example run('task', 'facts', {targets: ["machinename"]})
   def run(command, name, **args)
     @boltconfig = setup_overrides(command, name, **args)
-    # Don't run anything if there are nodes to run it on
-    # TODO: Gate this in a more efficient manner. It is possible to run plans without a node list.
-    return if @boltconfig.node_list.nil?
+    # Don't run anything if there are targets to run it on
+    # TODO: Gate this in a more efficient manner. It is possible to run plans without a target list.
+    return if @boltconfig.target_list.nil?
 
     @inventory_path = VagrantBolt::Util::Bolt.update_inventory_file(@env)
     validate
@@ -44,10 +44,10 @@ class VagrantBolt::Runner
     config = VagrantBolt::Util::Config.merge_config(config, @env.vagrantfile.config.bolt)
     # Add any additional arguments to the config object
     config.set_options(args) unless args.nil?
-    # Configure the node_list based on the config
-    config.node_list ||= [config.nodes - config.excludes].flatten.join(',') unless config.nodes.empty? || config.nodes.to_s.casecmp("all").zero?
-    config.node_list ||= [VagrantBolt::Util::Machine.nodes_in_environment(@env).map(&:name) - config.excludes].flatten.join(',') if config.nodes.to_s.casecmp("all").zero?
-    config.node_list ||= @machine.name.to_s unless config.excludes.include?(@machine.name.to_s)
+    # Configure the target_list based on the config
+    config.target_list ||= [config.targets - config.excludes].flatten.join(',') unless config.targets.empty? || config.targets.to_s.casecmp("all").zero?
+    config.target_list ||= [VagrantBolt::Util::Machine.machines_in_environment(@env).map(&:name) - config.excludes].flatten.join(',') if config.targets.to_s.casecmp("all").zero?
+    config.target_list ||= @machine.name.to_s unless config.excludes.include?(@machine.name.to_s)
 
     # Ensure these are absolute paths to allow for running vagrant commands outside of the root dir
     config.modulepath = VagrantBolt::Util::Config.relative_path(config.modulepath, @env.root_path)

data/lib/vagrant-bolt/util/bolt.rb

@@ -36,7 +36,7 @@ module VagrantBolt::Util
       end
 
       command << "--inventoryfile \'#{inventory_path}\'" unless inventory_path.nil?
-      command << "--nodes \'#{config.node_list}\'" unless config.node_list.nil?
+      command << "--targets \'#{config.target_list}\'" unless config.target_list.nil?
       command << config.args unless config.args.nil?
       command.flatten.join(" ")
     end
@@ -45,12 +45,12 @@ module VagrantBolt::Util
     # @param env [Object] The env object
     # @return [Hash] The hash of config options for the inventory.yaml
     def self.generate_inventory_hash(env)
-      inventory = { 'nodes' => [] }
+      inventory = { 'version' => 2, 'targets' => [] }
       inventory.merge!(env.vagrantfile.config.bolt.inventory_config.compact)
-      VagrantBolt::Util::Machine.nodes_in_environment(env).each do |vm|
+      VagrantBolt::Util::Machine.machines_in_environment(env).each do |vm|
         next unless VagrantBolt::Util::Machine.running?(vm)
 
-        inventory['nodes'] << generate_node_hash(vm)
+        inventory['targets'] << generate_node_hash(vm)
       end
       inventory.compact
     end
@@ -70,7 +70,7 @@ module VagrantBolt::Util
       transport = VagrantBolt::Util::Machine.windows?(machine) ? 'winrm' : 'ssh'
       node_hash['config'][transport] = machine_transport_hash(machine, machine_config, ssh_info).compact
       node_hash['config']['transport'] = transport
-      node_hash['name'] = "#{transport}://#{ssh_info[:host]}:#{node_hash['config'][transport]['port']}"
+      node_hash['uri'] = "#{transport}://#{ssh_info[:host]}:#{node_hash['config'][transport]['port']}"
       machine_config.each do |key, value|
         next if key == 'config' || value.nil? || value.empty?
 

data/lib/vagrant-bolt/util/machine.rb

@@ -32,7 +32,7 @@ module VagrantBolt::Util
     # Generate a list of active machines in the environment
     # @param env [Object] The Environment
     # @return [Array<Object>]
-    def self.nodes_in_environment(env)
+    def self.machines_in_environment(env)
       env.active_machines.map { |vm|
         begin
           env.machine(*vm)

data/lib/vagrant-bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VagrantBolt
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/spec/unit/config/bolt_spec.rb

@@ -72,6 +72,7 @@ describe VagrantBolt::Config::Bolt do
   context "defaults" do
     expected_values = {
       nodes: [],
+      targets: [],
       excludes: [],
     }
     expected_values.each do |val, expected|
@@ -86,6 +87,7 @@ describe VagrantBolt::Config::Bolt do
       "command",
       "params",
       "node_list",
+      "target_list",
       "user",
       "password",
       "port",

data/spec/unit/runner/runner_spec.rb

@@ -46,7 +46,7 @@ describe VagrantBolt::Runner do
 
   context 'setup_overrides' do
     before(:each) do
-      allow(VagrantBolt::Util::Machine).to receive(:nodes_in_environment).with(iso_env).and_return([machine, machine2])
+      allow(VagrantBolt::Util::Machine).to receive(:machines_in_environment).with(iso_env).and_return([machine, machine2])
     end
     it 'adds the command and name to the config' do
       result = subject.send(:setup_overrides, 'task', 'foo')
@@ -54,31 +54,47 @@ describe VagrantBolt::Runner do
       expect(result.name).to eq('foo')
     end
 
-    it 'uses the server name for the nodes' do
+    it 'uses the server name for the targets' do
       result = subject.send(:setup_overrides, 'task', 'foo')
-      expect(result.node_list).to eq('server')
+      expect(result.target_list).to eq('server')
     end
 
-    it 'allows for using multiple nodes' do
+    it 'allows for using multiple targets' do
+      config.targets = ['server', 'server2']
+      config.finalize!
+      result = subject.send(:setup_overrides, 'task', 'foo')
+      expect(result.target_list).to eq('server,server2')
+    end
+
+    it 'allows for using nodes parameter' do
       config.nodes = ['server', 'server2']
       config.finalize!
       result = subject.send(:setup_overrides, 'task', 'foo')
-      expect(result.node_list).to eq('server,server2')
+      expect(result.target_list).to eq('server,server2')
     end
 
-    it 'adds all nodes when "all" is specified' do
-      config.nodes = 'all'
+    it 'adds all targets when "all" is specified' do
+      config.targets = 'all'
       config.finalize!
       result = subject.send(:setup_overrides, 'task', 'foo')
-      expect(result.node_list).to eq('server,server2')
+      expect(result.target_list).to eq('server,server2')
     end
 
     it 'does not override specified ssh settings' do
+      config.target_list = 'ssh://test:22'
+      config.user = 'root'
+      config.finalize!
+      result = subject.send(:setup_overrides, 'task', 'foo')
+      expect(result.target_list).to eq('ssh://test:22')
+      expect(result.user).to eq('root')
+    end
+
+    it 'target_list defaults to node_list' do
       config.node_list = 'ssh://test:22'
       config.user = 'root'
       config.finalize!
       result = subject.send(:setup_overrides, 'task', 'foo')
-      expect(result.node_list).to eq('ssh://test:22')
+      expect(result.target_list).to eq('ssh://test:22')
       expect(result.user).to eq('root')
     end
 
@@ -111,9 +127,9 @@ describe VagrantBolt::Runner do
     it 'creates a shell execution' do
       config.bolt_exe = 'bolt'
       config.boltdir = '.'
-      config.node_list = 'ssh://test:22'
+      config.target_list = 'ssh://test:22'
       config.finalize!
-      command = "bolt task run 'foo' --boltdir '.' --inventoryfile '#{inventory_path}' --nodes 'ssh://test:22'"
+      command = "bolt task run 'foo' --boltdir '.' --inventoryfile '#{inventory_path}' --targets 'ssh://test:22'"
       expect(Vagrant::Util::Subprocess).to receive(:execute).with('bash', '-c', command, options).and_return(subprocess_result)
       subject.run('task', 'foo')
     end

data/spec/unit/util/bolt_spec.rb

@@ -39,7 +39,7 @@ describe VagrantBolt::Util::Bolt do
           },
           "transport" => "ssh",
         },
-        "name" => "ssh://machine:22",
+        "uri" => "ssh://machine:22",
         "facts" => { 'a' => 'b' },
         "vars" => { 'foo' => 'bar' },
         "features" => ['foo'],
@@ -48,8 +48,9 @@ describe VagrantBolt::Util::Bolt do
     let(:config_hash) { { 'config' => { 'a' => 'b' } } }
     let(:node_hash) do
       {
-        'nodes' => [machine_hash],
+        'targets' => [machine_hash],
         'config' => config_hash['config'],
+        'version' => 2,
       }
     end
     before(:each) do
@@ -70,7 +71,7 @@ describe VagrantBolt::Util::Bolt do
       allow(env).to receive_message_chain("vagrantfile.config.bolt.inventory_config").and_return(config_hash)
       allow(env).to receive(:active_machines).and_return(['machine'])
       allow(env).to receive(:machine).and_return(machine)
-      allow_any_instance_of(VagrantBolt::Util::Machine).to receive(:nodes_in_environment).with(env).and_return([machine])
+      allow_any_instance_of(VagrantBolt::Util::Machine).to receive(:machines_in_environment).with(env).and_return([machine])
       allow_any_instance_of(VagrantBolt::Util::Machine).to receive(:running?).with(machine).and_return(true)
     end
 
@@ -95,7 +96,7 @@ describe VagrantBolt::Util::Bolt do
       config.node_list = 'ssh://test:22'
       config.user = 'user'
       config.finalize!
-      expected = "bolt task run 'foo' --user \'user\' --inventoryfile '#{inventory_path}' --nodes \'ssh://test:22\'"
+      expected = "bolt task run 'foo' --user \'user\' --inventoryfile '#{inventory_path}' --targets \'ssh://test:22\'"
       expect(subject.generate_bolt_command(config, inventory_path)).to eq(expected)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bolt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jarret Lavallee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies: []
 description: "  Vagrant provisioning with Puppet Bolt\n"
 email:
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Vagrant provisioning with Puppet Bolt