From 89cb5fcace6e7dae8fe9a52e9f01b7b298003670 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 13 Feb 2022 00:08:10 +0900
Subject: [PATCH] Add support for MultiStrOpt

This replaces the provider implementation of magnum_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: I58cf4cc6adc7e3a003d6b28c9286e6e72e5bcf0b
---
 .../{ini_setting.rb => openstackconfig.rb}           |  4 ++--
 lib/puppet/type/magnum_config.rb                     | 12 ++++++++++--
 .../{ini_setting_spec.rb => openstackconfig_spec.rb} |  2 +-
 spec/unit/type/magnum_config_spec.rb                 |  4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)
 rename lib/puppet/provider/magnum_config/{ini_setting.rb => openstackconfig.rb} (55%)
 rename spec/unit/provider/magnum_config/{ini_setting_spec.rb => openstackconfig_spec.rb} (94%)

diff --git a/lib/puppet/provider/magnum_config/ini_setting.rb b/lib/puppet/provider/magnum_config/openstackconfig.rb
similarity index 55%
rename from lib/puppet/provider/magnum_config/ini_setting.rb
rename to lib/puppet/provider/magnum_config/openstackconfig.rb
index 7feff87..0bb759a 100644
--- a/lib/puppet/provider/magnum_config/ini_setting.rb
+++ b/lib/puppet/provider/magnum_config/openstackconfig.rb
@@ -1,6 +1,6 @@
 Puppet::Type.type(:magnum_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/magnum_config.rb b/lib/puppet/type/magnum_config.rb
index 2b55fca..4f21c60 100644
--- a/lib/puppet/type/magnum_config.rb
+++ b/lib/puppet/type/magnum_config.rb
@@ -7,14 +7,22 @@ Puppet::Type.newtype(:magnum_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?
diff --git a/spec/unit/provider/magnum_config/ini_setting_spec.rb b/spec/unit/provider/magnum_config/openstackconfig_spec.rb
similarity index 94%
rename from spec/unit/provider/magnum_config/ini_setting_spec.rb
rename to spec/unit/provider/magnum_config/openstackconfig_spec.rb
index 95cfea9..30a358e 100644
--- a/spec/unit/provider/magnum_config/ini_setting_spec.rb
+++ b/spec/unit/provider/magnum_config/openstackconfig_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
-provider_class = Puppet::Type.type(:magnum_config).provider(:ini_setting)
+provider_class = Puppet::Type.type(:magnum_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/magnum_config_spec.rb b/spec/unit/type/magnum_config_spec.rb
index 51dfc1f..68bd3e3 100644
--- a/spec/unit/type/magnum_config_spec.rb
+++ b/spec/unit/type/magnum_config_spec.rb
@@ -30,12 +30,12 @@ describe 'Puppet::Type.type(:magnum_config)' do
 
   it 'should accept a valid value' do
     @magnum_config[:value] = 'bar'
-    expect(@magnum_config[:value]).to eq('bar')
+    expect(@magnum_config[:value]).to eq(['bar'])
   end
 
   it 'should not accept a value with whitespace' do
     @magnum_config[:value] = 'b ar'
-    expect(@magnum_config[:value]).to eq('b ar')
+    expect(@magnum_config[:value]).to eq(['b ar'])
   end
 
   it 'should accept valid ensure values' do