From 3e47b5ac9dc4f205a73c8ccbfbebdc47902d53d5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 13 Jul 2021 17:33:21 +0900
Subject: [PATCH] Add support for MultiStrOpt

This replaces the provider implementation of aodh_config type so that
MultiStrOpt, which is used by several options like
 - oslo_messaging_notifications/driver
 - oslo_policy/policy_dirs
are handled correctly.

Change-Id: I9e7514e4eb39090fb77379a9e44ed5ffed937f38
(cherry picked from commit 02194e0ffc0697ba46645e3f4dc992036a3638a6)
---
 .../{ini_setting.rb => openstackconfig.rb}         |  4 ++--
 lib/puppet/type/aodh_config.rb                     | 14 ++++++++++++--
 ...ini_setting_spec.rb => openstackconfig_spec.rb} |  4 ++--
 spec/unit/type/aodh_config_spec.rb                 |  4 ++--
 4 files changed, 18 insertions(+), 8 deletions(-)
 rename lib/puppet/provider/aodh_config/{ini_setting.rb => openstackconfig.rb} (54%)
 rename spec/unit/provider/aodh_config/{ini_setting_spec.rb => openstackconfig_spec.rb} (91%)

diff --git a/lib/puppet/provider/aodh_config/ini_setting.rb b/lib/puppet/provider/aodh_config/openstackconfig.rb
similarity index 54%
rename from lib/puppet/provider/aodh_config/ini_setting.rb
rename to lib/puppet/provider/aodh_config/openstackconfig.rb
index e4a2d3a3..d1fec088 100644
--- a/lib/puppet/provider/aodh_config/ini_setting.rb
+++ b/lib/puppet/provider/aodh_config/openstackconfig.rb
@@ -1,6 +1,6 @@
 Puppet::Type.type(:aodh_config).provide(
-  :ini_setting,
-  :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
+  :openstackconfig,
+  :parent => Puppet::Type.type(:openstack_config).provider(:ruby)
 ) do
 
   def self.file_path
diff --git a/lib/puppet/type/aodh_config.rb b/lib/puppet/type/aodh_config.rb
index bb2107ec..af8d7290 100644
--- a/lib/puppet/type/aodh_config.rb
+++ b/lib/puppet/type/aodh_config.rb
@@ -7,14 +7,22 @@ Puppet::Type.newtype(:aodh_config) do
     newvalues(/\S+\/\S+/)
   end
 
-  newproperty(:value) do
+  newproperty(:value, :array_matching => :all) do
     desc 'The value of the setting to be defined.'
+    def insync?(is)
+      return true if @should.empty?
+      return false unless is.is_a? Array
+      return false unless is.length == @should.length
+      return (
+        is & @should == is or
+        is & @should.map(&:to_s) == is
+      )
+    end
     munge do |value|
       value = value.to_s.strip
       value.capitalize! if value =~ /^(true|false)$/i
       value
     end
-    newvalues(/^[\S ]*$/)
 
     def is_to_s( currentvalue )
       if resource.secret?
@@ -35,7 +43,9 @@ Puppet::Type.newtype(:aodh_config) do
 
   newparam(:secret, :boolean => true) do
     desc 'Whether to hide the value from Puppet logs. Defaults to `false`.'
+
     newvalues(:true, :false)
+
     defaultto false
   end
 
diff --git a/spec/unit/provider/aodh_config/ini_setting_spec.rb b/spec/unit/provider/aodh_config/openstackconfig_spec.rb
similarity index 91%
rename from spec/unit/provider/aodh_config/ini_setting_spec.rb
rename to spec/unit/provider/aodh_config/openstackconfig_spec.rb
index e1d4554e..97493573 100644
--- a/spec/unit/provider/aodh_config/ini_setting_spec.rb
+++ b/spec/unit/provider/aodh_config/openstackconfig_spec.rb
@@ -2,7 +2,7 @@
 # these tests are a little concerning b/c they are hacking around the
 # modulepath, so these tests will not catch issues that may eventually arise
 # related to loading these plugins.
-# I could not, for the life of me, figure out how to programatcally set the modulepath
+# I could not, for the life of me, figure out how to programmatically set the modulepath
 $LOAD_PATH.push(
   File.join(
     File.dirname(__FILE__),
@@ -26,7 +26,7 @@ $LOAD_PATH.push(
     'lib')
 )
 require 'spec_helper'
-provider_class = Puppet::Type.type(:aodh_config).provider(:ini_setting)
+provider_class = Puppet::Type.type(:aodh_config).provider(:openstackconfig)
 describe provider_class do
 
   it 'should default to the default setting when no other one is specified' do
diff --git a/spec/unit/type/aodh_config_spec.rb b/spec/unit/type/aodh_config_spec.rb
index ed86f077..47aaa32b 100644
--- a/spec/unit/type/aodh_config_spec.rb
+++ b/spec/unit/type/aodh_config_spec.rb
@@ -30,12 +30,12 @@ describe 'Puppet::Type.type(:aodh_config)' do
 
   it 'should accept a valid value' do
     @aodh_config[:value] = 'bar'
-    expect(@aodh_config[:value]).to eq('bar')
+    expect(@aodh_config[:value]).to eq(['bar'])
   end
 
   it 'should not accept a value with whitespace' do
     @aodh_config[:value] = 'b ar'
-    expect(@aodh_config[:value]).to eq('b ar')
+    expect(@aodh_config[:value]).to eq(['b ar'])
   end
 
   it 'should accept valid ensure values' do