From 97bce7569d18b6c456c23a87e63ccce275b3bc27 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 5 May 2021 10:48:51 +0900 Subject: [PATCH] Add support for MultiStrOpt This replaces the provider implementation of heat_config type so that MultiStrOpt, which is used by several options like - oslo_messaging_notifications/driver - oslo_policy/policy_dirs is handled correctly. Change-Id: Ifb3a302e1e15b496761112936c847217ec2116cc --- .../{ini_setting.rb => openstackconfig.rb} | 4 ++-- lib/puppet/type/heat_config.rb | 12 +++++++++-- ...etting_spec.rb => openstackconfig_spec.rb} | 21 ++++++++----------- spec/unit/type/heat_config_spec.rb | 7 +++---- 4 files changed, 24 insertions(+), 20 deletions(-) rename lib/puppet/provider/heat_config/{ini_setting.rb => openstackconfig.rb} (54%) rename spec/unit/provider/heat_config/{ini_setting_spec.rb => openstackconfig_spec.rb} (76%) diff --git a/lib/puppet/provider/heat_config/ini_setting.rb b/lib/puppet/provider/heat_config/openstackconfig.rb similarity index 54% rename from lib/puppet/provider/heat_config/ini_setting.rb rename to lib/puppet/provider/heat_config/openstackconfig.rb index 73985ffb..cb442030 100644 --- a/lib/puppet/provider/heat_config/ini_setting.rb +++ b/lib/puppet/provider/heat_config/openstackconfig.rb @@ -1,6 +1,6 @@ Puppet::Type.type(:heat_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/heat_config.rb b/lib/puppet/type/heat_config.rb index f3b24e7a..1eae7015 100644 --- a/lib/puppet/type/heat_config.rb +++ b/lib/puppet/type/heat_config.rb @@ -7,14 +7,22 @@ Puppet::Type.newtype(:heat_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/heat_config/ini_setting_spec.rb b/spec/unit/provider/heat_config/openstackconfig_spec.rb similarity index 76% rename from spec/unit/provider/heat_config/ini_setting_spec.rb rename to spec/unit/provider/heat_config/openstackconfig_spec.rb index d011d3cb..d93bf747 100644 --- a/spec/unit/provider/heat_config/ini_setting_spec.rb +++ b/spec/unit/provider/heat_config/openstackconfig_spec.rb @@ -1,3 +1,8 @@ +# +# 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 programmatically set the modulepath $LOAD_PATH.push( File.join( File.dirname(__FILE__), @@ -20,19 +25,13 @@ $LOAD_PATH.push( 'openstacklib', 'lib') ) - require 'spec_helper' - -provider_class = Puppet::Type.type(:heat_config).provider(:ini_setting) - +provider_class = Puppet::Type.type(:heat_config).provider(:openstackconfig) describe provider_class do it 'should default to the default setting when no other one is specified' do resource = Puppet::Type::Heat_config.new( - { - :name => 'DEFAULT/foo', - :value => 'bar' - } + {:name => 'DEFAULT/foo', :value => 'bar'} ) provider = provider_class.new(resource) expect(provider.section).to eq('DEFAULT') @@ -41,10 +40,7 @@ describe provider_class do it 'should allow setting to be set explicitly' do resource = Puppet::Type::Heat_config.new( - { - :name => 'dude/foo', - :value => 'bar' - } + {:name => 'dude/foo', :value => 'bar'} ) provider = provider_class.new(resource) expect(provider.section).to eq('dude') @@ -68,4 +64,5 @@ describe provider_class do provider.exists? expect(resource[:ensure]).to eq :absent end + end diff --git a/spec/unit/type/heat_config_spec.rb b/spec/unit/type/heat_config_spec.rb index 6296189a..266fbafc 100644 --- a/spec/unit/type/heat_config_spec.rb +++ b/spec/unit/type/heat_config_spec.rb @@ -6,7 +6,7 @@ describe 'Puppet::Type.type(:heat_config)' do @heat_config = Puppet::Type.type(:heat_config).new(:name => 'DEFAULT/foo', :value => 'bar') end - it 'should require a name' do + it 'should require a name' do expect { Puppet::Type.type(:heat_config).new({}) }.to raise_error(Puppet::Error, 'Title or name must be provided') @@ -30,12 +30,12 @@ describe 'Puppet::Type.type(:heat_config)' do it 'should accept a valid value' do @heat_config[:value] = 'bar' - expect(@heat_config[:value]).to eq('bar') + expect(@heat_config[:value]).to eq(['bar']) end it 'should not accept a value with whitespace' do @heat_config[:value] = 'b ar' - expect(@heat_config[:value]).to eq('b ar') + expect(@heat_config[:value]).to eq(['b ar']) end it 'should accept valid ensure values' do @@ -51,7 +51,6 @@ describe 'Puppet::Type.type(:heat_config)' do }.to raise_error(Puppet::Error, /Invalid value/) end - it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new anchor = Puppet::Type.type(:anchor).new(:name => 'heat::install::end')