Merge pull request #206 from puppetlabs/upgrade-fix

Use string keys for hash, instead of Target

Author: reidmv

functions/certname.pp

@@ -1,5 +1,11 @@
 function peadm::certname(
-  Variant[Target, Array[Target,0,1], String] $target,
+  Variant[Target,
+          String,
+          Undef,
+          Array[Target,1,1],
+          Array[String,1,1],
+          Array[Undef,1,1],
+          Array[Any,0,0]] $target,
 ) >> Variant[String, Undef] {
   case $target {
     Target: {
@@ -14,12 +20,15 @@ function peadm::certname(
         undef   => $target[0].name
       }
     }
-    Array[Target,0,0]: {
-      undef
-    }
     String: {
       $target
     }
+    Array[String,1,1]: {
+      $target[0]
+    }
+    Undef, Array[Undef,1,1], Array[Any,0,0]: {
+      undef
+    }
     default: {
       fail('Unexpected input type to peadm::certname function')
     }

plans/upgrade.pp

@@ -81,7 +81,7 @@
 
   # Gather certificate extension information from all systems
   $cert_extensions = run_task('peadm::cert_data', $all_targets).reduce({}) |$memo,$result| {
-    $memo + { $result.target => $result['extensions'] }
+    $memo + { $result.target.peadm::certname => $result['extensions'] }
   }
 
   $convert_targets = $cert_extensions.filter |$name,$exts| {
@@ -107,13 +107,13 @@
 
   # Determine which compilers are associated with which DR group
   $compiler_m1_targets = $compiler_targets.filter |$target| {
-    ($cert_extensions.dig($target, peadm::oid('peadm_availability_group'))
-      == $cert_extensions.dig($primary_target[0], peadm::oid('peadm_availability_group')))
+    ($cert_extensions.dig($target.peadm::certname, peadm::oid('peadm_availability_group'))
+      == $cert_extensions.dig($primary_target[0].peadm::certname, peadm::oid('peadm_availability_group')))
   }
 
   $compiler_m2_targets = $compiler_targets.filter |$target| {
-    ($cert_extensions.dig($target, peadm::oid('peadm_availability_group'))
-      == $cert_extensions.dig($replica_target[0], peadm::oid('peadm_availability_group')))
+    ($cert_extensions.dig($target.peadm::certname, peadm::oid('peadm_availability_group'))
+      == $cert_extensions.dig($replica_target[0].peadm::certname, peadm::oid('peadm_availability_group')))
   }
 
   $primary_target.peadm::fail_on_transport('pcp')

spec/functions/certname_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-# TODO: test the error case, however due to an issue with boltspec
-# and functions we cannot do this right now.
-# https://github.com/puppetlabs/bolt/issues/1688
 describe 'peadm::certname' do
+  include BoltSpec::BoltContext
+
   let(:target) do
     ['test-vm.puppet.vm']
   end
 
-  xit { is_expected.to run.with_params(target).and_return('some_value') }
+  # TODO: this *should* work, but is failing in TravisCI. Not sure why. It works on my laptop...
+  xit { in_bolt_context { is_expected.to run.with_params(target).and_return('test-vm.puppet.vm') } }
 end