Fix resource defaults for plugins on Puppet 5 #354

Toby McLaughlin · Toby McLaughlin · commit 08cc70dbcfd1 · 2017-12-06T15:10:39.000+11:00
Additionally, reinstate the puppet-rspec unit test framework and use it
to prove this fix is working.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,9 +1,9 @@
 fixtures:
-  repositories:
-    stdlib:
-      repo: "https://github.com/puppetlabs/puppetlabs-stdlib"
-      ref: "3.2.0"
-    apt: https://github.com/puppetlabs/puppetlabs-apt.git
-    zypprepo: https://github.com/deadpoint/puppet-zypprepo.git
-  symlinks:
-    logstash: "#{source_dir}"
+  forge_modules:
+    apt: puppetlabs/apt
+    elastic_stack: elastic/elastic_stack
+    stdlib: puppetlabs/stdlib
+    zypprepo: darin/zypprepo
+
+symlinks:
+    logstash: #{source_dir}
diff --git a/.travis.yml b/.travis.yml
@@ -16,16 +16,36 @@ rvm:
 
 script:
   - docker run --privileged -d polarbearlabs/haveged:1.9.1 # https://github.com/elastic/logstash/issues/5507
-  - (if [[ -n $TRAVIS_LINT ]]; then make lint; else bundle exec rake beaker; fi)
+  - |
+    (
+      if [[ -n $TRAVIS_LINT ]]; then
+        make lint
+      elif [[ -n $TRAVIS_UNIT ]]; then
+        bundle exec rake spec
+      else
+        bundle exec rake beaker
+      fi
+    )
 
 env:
   global:
     - LOGSTASH_VERSION=6.0.0
     - BEAKER_PE_DIR=spec/fixtures/artifacts
+    - CI_SPEC_OPTIONS='--format documentation'
   matrix:
     # Do linting once.
     - TRAVIS_LINT=true
 
+    # Run the puppet-rspec synthetic/unit tests.
+    - PUPPET_VERSION=4.6.1 TRAVIS_UNIT=true
+    - PUPPET_VERSION=4.8.2 TRAVIS_UNIT=true
+    - PUPPET_VERSION=4.9.4 TRAVIS_UNIT=true
+    - PUPPET_VERSION=4.10.8 TRAVIS_UNIT=true
+    - PUPPET_VERSION=5.0.1 TRAVIS_UNIT=true
+    - PUPPET_VERSION=5.1.0 TRAVIS_UNIT=true
+    - PUPPET_VERSION=5.2.0 TRAVIS_UNIT=true
+    - PUPPET_VERSION=5.3.3 TRAVIS_UNIT=true
+
     # Then run the acceptance tests across the matrix.
     - PUPPET_VERSION=4.6.1 BEAKER_set=centos-6
     - PUPPET_VERSION=4.8.2 BEAKER_set=centos-6
diff --git a/Gemfile b/Gemfile
@@ -29,6 +29,7 @@ gem 'puppetlabs_spec_helper'
 gem 'puppet-syntax'
 gem 'rspec-puppet-facts'
 gem 'rubocop'
+gem 'semantic_puppet'
 gem 'serverspec', '2.38.0'
 gem 'specinfra', '2.67.3'
 gem 'syck'
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -46,6 +46,13 @@
   require logstash::package
   $exe = "${logstash::home_dir}/bin/logstash-plugin"
 
+  Exec {
+    path        => '/bin:/usr/bin',
+    user        => $logstash::logstash_user,
+    timeout     => 1800,
+    environment => $environment,
+  }
+
   case $source { # Where should we get the plugin from?
     undef: {
       # No explict source, so search Rubygems for the plugin, by name.
@@ -116,11 +123,4 @@
       fail "'ensure' should be 'present', 'absent', or a version like '1.3.4'."
     }
   }
-
-  Exec {
-    path        => '/bin:/usr/bin',
-    user        => $logstash::logstash_user,
-    timeout     => 1800,
-    environment => $environment,
-  }
 }
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "elastic-logstash",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "source": "https://github.com/elastic/puppet-logstash",
   "author": "elastic",
   "license": "Apache-2.0",
diff --git a/spec/defines/define_plugin_spec.rb b/spec/defines/define_plugin_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'logstash::plugin' do
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let(:facts) do
+        facts
+      end
+
+      let(:pre_condition) { %q(
+        include elastic_stack::repo
+        include logstash
+      )}
+
+      let(:title) { 'logstash-input-mysql' }
+
+      it { is_expected.to compile }
+
+      it {
+        is_expected.to contain_exec("install-#{title}").with(user: 'logstash')
+      }
+    end
+  end
+end
diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp
diff --git a/spec/fixtures/modules/logstash/manifests b/spec/fixtures/modules/logstash/manifests
diff --git a/spec/fixtures/modules/logstash/templates b/spec/fixtures/modules/logstash/templates
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,8 +1,12 @@
-require 'rubygems'
 require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet-facts'
+include RspecPuppetFacts
+
+default_facts = {
+  puppetversion: Puppet.version,
+  facterversion: Facter.version,
+}
 
 RSpec.configure do |c|
-  Puppet.settings[:strict_variables]=true if ENV['STRICT_VARIABLES'] == 'true'
-  Puppet.settings[:ordering]='random' if ENV['ORDERING_RANDOM'] == 'true'
-  c.parser = 'future' if ENV['FUTURE_PARSER'] == 'true'
+  c.default_facts = default_facts
 end

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "elastic-logstash",`
`3`		`- "version": "6.0.1",`
	`3`	`+ "version": "6.0.2",`
`4`	`4`	`"source": "https://github.com/elastic/puppet-logstash",`
`5`	`5`	`"author": "elastic",`
`6`	`6`	`"license": "Apache-2.0",`