(GH-701) Stop using scope.lookupvar() in templates

[Phil-Friderici]

Add tests for existing functionality as preparation and to proof backward compatibility.

[Phil-Friderici]

I have separated the commits to proof that the existing functionality is not changed. If prefered I can squash them into one commit.

[Phil-Friderici]

ready for review

[ghoneycutt]

Please squash into one commit. Thanks!

[jeffmccune]

This looks good to me. The tests are great! Only question is why scope.lookup var is being left in sensu-client.erb and sensu-windows-package-version.erb?

[jeffmccune]

This is great, thanks! Please make a similar change to sensu-client.erb and sensu-windows-package-version.erb, or mention why they need to be preserved as they are in the commit message.

Please squash into one commit.

[Phil-Friderici]

Thanks for the positive feedback, will do the same for the other templates as well :)

[Phil-Friderici]

Here we go:

• all appearances of scope.lookupcvar() have been removed
• all commits squashed into one

ready for merge ;)

[ghoneycutt]

good catch!

[Phil-Friderici]

same is true for sensu-version.erb. I have created the issue #731 to get it changed later on too.

[ghoneycutt]

@Phil-Friderici looks like we still have a few

sensu-puppet$ grep -ri scope.lookupvar .
./manifests/extension.pp:  $filename = inline_template('<%= scope.lookupvar(\'source\').split(\'/\').last %>')
./manifests/handler.pp:    $filename = inline_template('<%= scope.lookupvar(\'source\').split(\'/\').last %>')
./manifests/mutator.pp:    $filename = inline_template('<%= scope.lookupvar(\'source\').split(\'/\').last %>')
./manifests/plugin.pp:      $filename = inline_template('<%= scope.lookupvar(\'name\').split(\'/\').last %>')
./manifests/plugin.pp:      $filename = inline_template('<%= scope.lookupvar(\'name\').split(\'/\').last %>')

While you are changing these, could you have them use .erb files. I prefer to use .erb files, even for one liners, so they can be validated.

[Phil-Friderici]

have added the grep results to #731 as I think they should be refactored to Puppet code instead.

[ghoneycutt]

Yes, please address that in this PR.

Solves #731

[ghoneycutt]

@Phil-Friderici please use vagrant to confirm that all platforms still work. Here's a bash function I use to see what clients are connected, instead of poking around through the Dashboard.

function sensuclients {
  curl -s http://admin:[email protected]:4567/clients | jq .[].name | awk -F \" '{print $2}' | awk -F \. '{print $1}' | sort
}

[Phil-Friderici]

Think we should replace Ruby with Puppet code where possible. So I have replaced all occurrences of
inline_template('<%= scope.lookupvar(\'source\').split(\'/\').last %>') with the much simplier to read basename() function.

Sorry, haven't used vagrant yet. Will need some time to get into the details and understand it.

[Phil-Friderici]

same as for line 111 above ($pkg_version in package.pp)

Phil made the changes

[Phil-Friderici]

sweet :)

[ghoneycutt]

Released in v2.22.0