beaker-task_helper 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2198b0d254cb1b20c69583b7c46f6406f8e17cd32c988f7c1c90cb90bb013ac
-  data.tar.gz: 7448e26fb7aa3c7b2cd5b0f053643e2fe3d45192856a7089d963d4fc97a64dd7
+  metadata.gz: 1bde2b067d8b91239fecd8d0575bb0f1aead07bbecab43e0e94fe9a810540bb3
+  data.tar.gz: d726f66dfaa8ba05c27f2984f0816ee9f4615b04ae043e006bc47b2963bdc293
 SHA512:
-  metadata.gz: 133052711d275ea2d7466d1e3088fcebb0b74e2b9e6947bdfdb7ece34851c6a2f298cd57599d1b93600870dd0d1bc9ba95512e9722b302dee221be2713a3d8b7
-  data.tar.gz: 8d139cb50771973e933a14920fd508e4061baddb8ede1a741a0f543552bb027a21a28f33502907cfe64d75cd0734f4a78081e40ac86684b78171f32e7570b404
+  metadata.gz: 069c72b69f6d2aacdeaeb889b3582e2e1828498b76b5401fbb6622b95ed9cab4ae15ce07381c13c0613b242f880e593e7d98776e9c305b014df901e4a0e8accf
+  data.tar.gz: 734f52539d22377301826cb19215ff0e5e1f1d816e4a9ea08d62ba9afe7f5c318657c6caa150eba1da467be9808f950c2483cf85ec5883d50a0514d8974f33dd

data/CHANGELOG.md

@@ -1,4 +1,15 @@
 # Change Log
+### 1.8.0
+### Changed
+- Updated the helper to be compatible with [Bolt 2.0 changes](https://github.com/puppetlabs/bolt/blob/master/CHANGELOG.md). *Bolt 2.0 introduced some [backwards-incompatible changes](https://github.com/puppetlabs/bolt/blob/master/CHANGELOG.md#bolt-200-2020-02-19) that you should be aware of before upgrading to this version.*
+
+### 1.7.1-4
+### Fixed
+- `.ssh` directory path on OSX 10.12/10.13/10.14 and Solaris 10
+- Puppet 6 collection handling fix
+- PE `puppet access login` fixes
+
+
 ## 1.7.0
 ### Added
 - (maint) - Work around for [BOLT-845](https://tickets.puppetlabs.com/browse/BOLT-845), installing ffi on el5 machines).

data/lib/beaker-task_helper.rb

@@ -64,6 +64,14 @@ INSTALL_BOLT_PP
     ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i
   end
 
+  def target_flag
+    if version_is_less('1.18.0', BOLT_VERSION)
+      '--targets'
+    else
+      '--nodes'
+    end
+  end
+
   def run_puppet_access_login(user:, password: '~!@#$%^*-/ aZ', lifetime: '5y')
     peconf_password = get_unwrapped_pe_conf_value("console_admin_password")
     password = peconf_password if peconf_password != nil && peconf_password != ""
@@ -141,7 +149,7 @@ INSTALL_BOLT_PP
     end
 
     bolt_full_cli = "#{bolt_path} task run #{task_name} #{check} -m #{module_path} " \
-                    "--nodes #{host} --password #{password}"
+                    "#{target_flag} #{host} --password #{password}"
     bolt_full_cli << " --format #{format}" if format != 'human'
     bolt_full_cli << if params.class == Hash
                        " --params '#{params.to_json}'"
@@ -157,7 +165,7 @@ INSTALL_BOLT_PP
   end
 
   def run_puppet_task(task_name:, params: nil, host: '127.0.0.1', format: 'human')
-    args = ['task', 'run', task_name, '--nodes', host]
+    args = ['task', 'run', task_name, target_flag, host]
     if params.class == Hash
       args << '--params'
       args << params.to_json
@@ -178,7 +186,7 @@ INSTALL_BOLT_PP
   end
 
   def task_summary_line(total_hosts: 1, success_hosts: 1)
-    "Job completed. #{success_hosts}/#{total_hosts} nodes succeeded|Ran on #{total_hosts} node"
+    "Job completed. #{success_hosts}/#{total_hosts} targets succeeded|Ran on #{total_hosts} target"
   end
 end
 

data/lib/beaker-task_helper/inventory.rb

@@ -3,6 +3,14 @@ require 'beaker'
 module Beaker
   module TaskHelper
     module Inventory
+      def target_key
+        if version_is_less('1.18.0', BOLT_VERSION)
+          'targets'
+        else
+          'nodes'
+        end
+      end
+
       # This attempts to make a bolt inventory hash from beakers hosts
       # roles should be targetable by bolt as groups
       def hosts_to_inventory
@@ -12,10 +20,10 @@ module Beaker
           if group_name =~ %r{\A[a-z0-9_]+\Z}
             group = groups.find { |g| g['name'] == group_name }
             unless group
-              group = { 'name' => group_name, 'nodes' => [] }
+              group = { 'name' => group_name, target_key => [] }
               groups << group
             end
-            group['nodes'] << node
+            group[target_key] << node
           else
             puts "invalid group name #{group_name} skipping"
           end
@@ -66,7 +74,7 @@ module Beaker
           }
         end
 
-        { 'nodes' => nodes,
+        { target_key => nodes,
           'groups' => groups,
           'config' => {
             'ssh' => {

data/lib/beaker-task_helper/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module TaskHelper
-    VERSION = '1.7.4'.freeze
+    VERSION = '1.8.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-task_helper
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop