bolt 0.18.1 → 0.18.2

data/modules/aggregate/plans/count.pp

@@ -16,11 +16,11 @@ plan aggregate::count(
   }
 
   if ($type_count == 0) {
-    fail_plan("Must specify a command, script, or task to run", 'canary/invalid-params')
+    fail_plan("Must specify a command, script, or task to run", 'aggregate/invalid-params')
   }
 
   if ($type_count > 1) {
-    fail_plan("Must specify only one command, script, or task to run", 'canary/invalid-params')
+    fail_plan("Must specify only one command, script, or task to run", 'aggregate/invalid-params')
   }
 
   $res = if ($task) {

data/modules/aggregate/plans/nodes.pp

@@ -16,11 +16,11 @@ plan aggregate::nodes(
   }
 
   if ($type_count == 0) {
-    fail_plan("Must specify a command, script, or task to run", 'canary/invalid-params')
+    fail_plan("Must specify a command, script, or task to run", 'aggregate/invalid-params')
   }
 
   if ($type_count > 1) {
-    fail_plan("Must specify only one command, script, or task to run", 'canary/invalid-params')
+    fail_plan("Must specify only one command, script, or task to run", 'aggregate/invalid-params')
   }
 
   $res = if ($task) {

data/modules/facts/lib/puppet/functions/facts/group_by.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# A simple wrapper of the ruby's group_by function.
+Puppet::Functions.create_function(:'facts::group_by') do
+  dispatch :native_group_by do
+    param 'Iterable', :collection
+    block_param
+    return_type 'Hash'
+  end
+
+  def native_group_by(collection, &block)
+    collection.group_by(&block)
+  end
+end

data/modules/facts/plans/info.pp

@@ -0,0 +1,15 @@
+# A plan that prints basic OS information for the specified nodes. It first
+# runs the facts::retrieve plan to retrieve facts from the nodes, then
+# compiles the desired OS information from the os fact value of each nodes.
+#
+# The $nodes parameter is a list of the nodes for which to print the OS
+# information.
+plan facts::info(TargetSpec $nodes) {
+  run_plan(facts::retrieve, nodes => $nodes).reduce([]) |$info, $r| {
+    if ($r.ok) {
+      $info + "${r.target.name}: ${r[os][name]} ${r[os][release][full]} (${r[os][family]})"
+    } else {
+      $info # don't include any info for nodes which failed
+    }
+  }
+}

data/modules/facts/plans/init.pp

@@ -0,0 +1,16 @@
+# A plan that stores facts retrieved by the facts::retrieve plan
+# from the specified nodes into the inventory.
+#
+# The $nodes parameter is a list of nodes to retrieve the facts for.
+plan facts(TargetSpec $nodes) {
+  $result_set = run_plan(facts::retrieve, nodes => $nodes)
+
+  $result_set.each |$result| {
+    # Store facts for nodes from which they were succefully retrieved
+    if ($result.ok) {
+      add_facts($result.target, $result.value)
+    }
+  }
+
+  $result_set
+}

data/modules/facts/plans/retrieve.pp

@@ -0,0 +1,32 @@
+# A plan that retrieves facts from the specified nodes by running
+# an appropriate facts::* task on each. Care is taken to run a
+# facts::* task corresponding to the node's platfrom on each
+# node.
+#
+# The $nodes parameter is a list of the nodes to retrieve the facts
+# from.
+plan facts::retrieve(TargetSpec $nodes) {
+  $targets = get_targets($nodes)
+
+  # Build a mapping from the names of the tasks to run to the lists of
+  # targets to run the tasks on
+  $task_targets = $targets.facts::group_by |$target| {
+    $target.protocol ? {
+      'ssh'   => 'facts::bash',
+      'winrm' => 'facts::powershell',
+      'pcp'   => 'facts::ruby',
+      'local' => 'facts::bash',
+    }
+  }
+
+  # Return a single result set composed of results from the result sets
+  # returned by the individual task runs.
+  ResultSet(
+    $task_targets.map |$task, $targets| {
+      run_task($task, $targets, '_catch_errors' => true)
+    }.reduce([]) |$results, $result_set| {
+      # Collect the results from the individual result sets
+      $results + $result_set.results
+    }
+  )
+}

data/modules/facts/tasks/bash.sh

@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+# Delegate to facter if available
+command -v facter > /dev/null 2>&1 && exec facter --json
+
+minor () {
+    minor="${*#*.}"
+    [ "$minor" == "$*" ] || echo "${minor%%.*}"
+}
+
+# Determine the OS name
+if [ -f /etc/redhat-release ]; then
+    if egrep -iq centos /etc/redhat-release; then
+        name=CentOS
+    elif egrep -iq 'Fedora release' /etc/redhat-release; then
+        name=Fedora
+    fi
+    release=$(sed -r -e 's/^.* release ([0-9]+(\.[0-9]+)?).*$/\1/' \
+                  /etc/redhat-release)
+fi
+
+if [ -z "${name}" ]; then
+    LSB_RELEASE=$(command -v lsb_release)
+    if [ -n "$LSB_RELEASE" ]; then
+        if [ -z "$name" ]; then
+            name=$($LSB_RELEASE -i | sed -re 's/^.*:[ \t]*//')
+        fi
+        release=$($LSB_RELEASE -r | sed -re 's/^.*:[ \t]*//')
+    fi
+fi
+
+if [ -z "${name}" ]; then
+    name=$(uname)
+    release=$(uname -r)
+fi
+
+case $name in
+    RedHat|Fedora|CentOS|Scientific|SLC|Ascendos|CloudLinux)
+        family=RedHat;;
+    HuaweiOS|LinuxMint|Ubuntu|Debian)
+        family=Debian;;
+    *)
+        family=$name;;
+esac
+
+# Print it all out
+if [ -z "$name" ]; then
+    cat <<JSON
+{
+  "_error": {
+    "kind": "facts/noname",
+    "msg": "Could not determine OS name"
+  }
+}
+JSON
+else
+    cat <<JSON
+{
+  "os": {
+    "name": "${name}",
+JSON
+    [ -n "$release" ] && cat <<JSON
+    "release": {
+      "full": "${release}",
+      "major": "${release%%.*}",
+      "minor": "`minor "${release}"`"
+    },
+JSON
+    cat <<JSON
+    "family": "${family}"
+  }
+}
+JSON
+fi

data/modules/facts/tasks/powershell.ps1

@@ -0,0 +1,61 @@
+#!powershell.exe
+
+# Delegate to facter if available
+if (Get-Command facter -ErrorAction SilentlyContinue) {
+    facter --json
+}
+else {
+    if ([System.Environment]::OSVersion.Platform -gt 2) {
+        # [System.PlatformID]::Win32NT
+        @'
+{
+  "_error": {
+    "kind": "facts/noname",
+    "msg": "Could not determine OS name"
+  }
+}
+'@
+    }
+    else {
+        $release = [System.Environment]::OSVersion.Version.ToString() -replace '\.[^.]*\z'
+        $version = $release -replace '\.[^.]*\z'
+
+        # This fails for regular users unless explicitly enabled
+        $os = Get-CimInstance Win32_OperatingSystem -ErrorAction SilentlyContinue
+        $consumerrel = $os.ProductType -eq '1'
+
+        if ($version -eq '10.0') {
+            $release = if ($consumerrel) { '10' } else { '2016' }
+        }
+        elseif ($version -eq '6.3') {
+            $release = if ($consumerrel) { '8.1' } else { '2012 R2' }
+        }
+        elseif ($version -eq '6.2') {
+            $release = if ($consumerrel) { '8' } else { '2012' }
+        }
+        elseif ($version -eq '6.1') {
+            $release = if ($consumerrel) { '7' } else { '2008 R2' }
+        }
+        elseif ($version -eq '6.0') {
+            $release = if ($consumerrel) { 'Vista' } else { '2008' }
+        }
+        elseif ($version -eq '5.2') {
+            $release = if ($consumerrel) { 'XP' } else {
+                if ($os.OtherTypeDescription -eq 'R2') { '2003 R2' } else { '2003' }
+            }
+        }
+
+        @"
+{
+  "os": {
+    "name": "windows",
+    "release": {
+      "full": "$release",
+      "major": "$release"
+    },
+    "family": "windows"
+  }
+}
+"@
+    }
+}

data/modules/facts/tasks/ruby.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+def facter_executable
+  if ENV.key? 'Path'
+    ENV['Path'].split(';').each do |p|
+      if p =~ /Puppet\\bin\\?$/
+        return File.join(p, 'facter')
+      end
+    end
+    'C:\Program Files\Puppet Labs\Puppet\bin\facter'
+  else
+    '/opt/puppetlabs/puppet/bin/facter'
+  end
+end
+
+# Delegate to facter
+exec(facter_executable, '--json')

data/modules/puppetdb_fact/plans/init.pp

@@ -7,4 +7,4 @@ plan puppetdb_fact(TargetSpec $nodes) {
   }
 
   return $pdb_facts
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -367,6 +367,7 @@ files:
 - lib/bolt/transport/winrm.rb
 - lib/bolt/transport/winrm/connection.rb
 - lib/bolt/util.rb
+- lib/bolt/util/on_access.rb
 - lib/bolt/version.rb
 - lib/bolt_ext/puppetdb_inventory.rb
 - modules/aggregate/lib/puppet/functions/aggregate/count.rb
@@ -377,6 +378,13 @@ files:
 - modules/canary/lib/puppet/functions/canary/random_split.rb
 - modules/canary/lib/puppet/functions/canary/skip.rb
 - modules/canary/plans/init.pp
+- modules/facts/lib/puppet/functions/facts/group_by.rb
+- modules/facts/plans/info.pp
+- modules/facts/plans/init.pp
+- modules/facts/plans/retrieve.pp
+- modules/facts/tasks/bash.sh
+- modules/facts/tasks/powershell.ps1
+- modules/facts/tasks/ruby.rb
 - modules/puppetdb_fact/plans/init.pp
 - vendored/facter/lib/facter.rb
 - vendored/facter/lib/facter/Cfkey.rb