Added guards to rabbitmq version to determine if it's running, otherwise try new options every other iteration

Author: nmaludy

lib/puppet/provider/rabbitmq_cli.rb

@@ -71,10 +71,7 @@ def self.run_with_retries(count = 30, step = 6, timeout = 10)
         output = Timeout.timeout(timeout) do
           yield
         end
-      rescue Puppet::ExecutionFailure => e
-        Puppet.debug "Command failed, retrying: #{e.message}"
-        sleep step
-      rescue Timeout::Error
+      rescue Puppet::ExecutionFailure, Timeout::Error
         Puppet.debug 'Command failed, retrying'
         sleep step
       else

lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb

@@ -5,8 +5,8 @@
   confine feature: :posix
 
   def self.plugin_list
-    list = run_with_retries do
-      # Starting in RabbitMQ 3.6.7 pass in -e to list both implicitly and explicitly enabled plugins.
+    list_str = run_with_retries do
+      # Pass in -e to list both implicitly and explicitly enabled plugins.
       # If you pass in -E instead, then only explicitly enabled plugins are listed.
       # Implicitly enabled plugins are those that were enabled as a dependency of another plugin/
       # If we do not pass in -e then the order if plugin installation matters within the puppet
@@ -15,14 +15,15 @@ def self.plugin_list
       # -e parameter, we won't see Plugin A as being enabled so we'll try to install it again.
       # To preserve idempotency we should get all enabled plugins regardless of implicitly or
       # explicitly enabled.
-      if Puppet::Util::Package.versioncmp(rabbitmq_version, '3.6.7') >= 0
-        # also pass in -q to suppress informational messages that break our parsing
-        rabbitmqplugins('list', '-e', '-m', '-q')
-      else
-        rabbitmqplugins('list', '-E', '-m')
-      end
+      rabbitmqplugins('list', '-e', '-m')
     end
-    list.split(%r{\n})
+    # Split by newline.
+    lines = list_str.split(%r{\n})
+    # Return only lines that are single words because sometimes RabbitMQ likes to output
+    # information messages. Suppressing those messages via CLI flags is inconsistent between
+    # versions, so this this regex removes those message without having to use painful
+    # version switches.
+    lines.select { |line| line =~ %r{^(\S+)$} }
   end
 
   def self.instances

spec/acceptance/parameter_spec.rb

@@ -32,8 +32,8 @@ class { 'rabbitmq':
       }
       EOS
 
-      apply_manifest(pp, catch_failures: true, debug: true)
-      apply_manifest(pp, catch_changes: true, debug: true)
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
     end
 
     # rubocop:disable RSpec/MultipleExpectations

spec/acceptance/rabbitmqadmin_spec.rb

@@ -14,7 +14,7 @@ class { 'erlang': epel_enable => true}
       }
       EOS
 
-      apply_manifest(pp, catch_failures: true, debug: true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file('/var/lib/rabbitmq/rabbitmqadmin') do
@@ -36,7 +36,7 @@ class { 'erlang': epel_enable => true}
       EOS
 
       shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
-      apply_manifest(pp, catch_failures: true, debug: true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file('/var/lib/rabbitmq/rabbitmqadmin') do
@@ -73,7 +73,7 @@ class { 'erlang': epel_enable => true}
       EOS
 
       shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
-      apply_manifest(pp_pre, catch_failures: true, debug: true)
+      apply_manifest(pp_pre, catch_failures: true)
       apply_manifest(pp, catch_failures: true)
     end
 

spec/spec_helper_acceptance.rb

@@ -99,6 +99,6 @@
   end
 
   it 'applies a second time without changes' do
-    apply_manifest(pp, catch_changes: true, debug: true)
+    apply_manifest(pp, catch_changes: true)
   end
 end

spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb

@@ -43,32 +43,19 @@
       expect(provider_class).to respond_to :instances
     end
 
-    context 'with RabbitMQ version >=3.6.7' do
-      it 'returns a list of plugins' do
-        provider.class.expects(:rabbitmq_version).returns '3.6.7'
-        provider.class.expects(:rabbitmqplugins).with('list', '-e', '-m', '-q').returns("foo\nbar\nbaz\n")
-        expect(provider.class.plugin_list).to eq(%w[foo bar baz])
-      end
-
-      it 'handles no training newline properly' do
-        provider.class.expects(:rabbitmq_version).returns '3.6.7'
-        provider.class.expects(:rabbitmqplugins).with('list', '-e', '-m', '-q').returns("foo\nbar")
-        expect(provider.class.plugin_list).to eq(%w[foo bar])
-      end
+    it 'returns a list of plugins' do
+      provider.class.expects(:rabbitmqplugins).with('list', '-e', '-m').returns("foo\nbar\nbaz\n")
+      expect(provider.class.plugin_list).to eq(%w[foo bar baz])
     end
 
-    context 'with RabbitMQ version <3.6.7' do
-      it 'returns a list of plugins' do
-        provider.class.expects(:rabbitmq_version).returns '3.6.6'
-        provider.class.expects(:rabbitmqplugins).with('list', '-E', '-m').returns("foo\nbar\nbaz\n")
-        expect(provider.class.plugin_list).to eq(%w[foo bar baz])
-      end
+    it 'handles no training newline properly' do
+      provider.class.expects(:rabbitmqplugins).with('list', '-e', '-m').returns("foo\nbar")
+      expect(provider.class.plugin_list).to eq(%w[foo bar])
+    end
 
-      it 'handles no training newline properly' do
-        provider.class.expects(:rabbitmq_version).returns '3.6.6'
-        provider.class.expects(:rabbitmqplugins).with('list', '-E', '-m').returns("foo\nbar")
-        expect(provider.class.plugin_list).to eq(%w[foo bar])
-      end
+    it 'handles lines that are not plugins ' do
+      provider.class.expects(:rabbitmqplugins).with('list', '-e', '-m').returns("Listing plugins with pattern \".*\" ...\nfoo\nbar")
+      expect(provider.class.plugin_list).to eq(%w[foo bar])
     end
   end