From 0541ab7507929164fd838aceafeb55f9fdf3a822 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 24 Feb 2023 03:21:20 +0900 Subject: [PATCH] trove_datastore_version: Validate status The status argument of datastore_version update command accepts only 0 or 1. This ensures a correct value is used by property validation instead of attempting to execute the command with an invalid value. Change-Id: I3eeace41c677157d6b5913a7ab9092e3456106a7 --- lib/puppet/type/trove_datastore_version.rb | 5 +++-- spec/acceptance/10_basic_trove_spec.rb | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/puppet/type/trove_datastore_version.rb b/lib/puppet/type/trove_datastore_version.rb index e5207eb8..0ff447cd 100644 --- a/lib/puppet/type/trove_datastore_version.rb +++ b/lib/puppet/type/trove_datastore_version.rb @@ -9,7 +9,7 @@ Puppet::Type.newtype(:trove_datastore_version) do end newparam(:datastore) do - desc "Datastore name)" + desc "Datastore name" end newparam(:manager) do @@ -26,6 +26,8 @@ Puppet::Type.newtype(:trove_datastore_version) do newparam(:active) do desc "State" + newvalues('0', '1') + defaultto('1') end validate do @@ -33,7 +35,6 @@ Puppet::Type.newtype(:trove_datastore_version) do raise(Puppet::Error, 'Manager must be set') unless self[:manager] raise(Puppet::Error, 'Image must be set') unless self[:image_id] raise(Puppet::Error, 'Packages must be set') unless self[:packages] - raise(Puppet::Error, 'State must be set') unless self[:active] end autorequire(:anchor) do diff --git a/spec/acceptance/10_basic_trove_spec.rb b/spec/acceptance/10_basic_trove_spec.rb index fa698c8d..c0545fa6 100644 --- a/spec/acceptance/10_basic_trove_spec.rb +++ b/spec/acceptance/10_basic_trove_spec.rb @@ -22,7 +22,6 @@ describe 'basic trove' do manager => 'mysql', image_id => 'dummy', packages => '', - active => 1, } EOS