File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed
lib/puppet/provider/dsc_base_provider Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -665,16 +665,16 @@ def mandatory_set_attributes(context)
665
665
context . type . attributes . select { |_attribute , properties | properties [ :mandatory_for_set ] } . keys
666
666
end
667
667
668
- # Parses the DSC resource type definition to retrieve the names of any attributes which are specifed as required strings
669
- # This is used to ensure that any nil values are converted to empty strings to match puppets expecetd value
668
+ # Parses the DSC resource type definition to retrieve the names of any attributes which are specified as required strings
669
+ # This is used to ensure that any nil values are converted to empty strings to match puppets expected value
670
670
# @param context [Object] the Puppet runtime context to operate in and send feedback to
671
671
# @param data [Hash] the hash of properties returned from the DSC resource
672
672
# @return [Hash] returns a data hash with any nil values converted to empty strings
673
673
def stringify_nil_attributes ( context , data )
674
- nil_strings = data . select { |_name , value | value . nil? } . keys
675
- string_attrs = context . type . attributes . select { | _name , properties | properties [ :type ] == 'String' } . keys
676
- string_attrs . each do | attribute |
677
- data [ attribute ] = '' if nil_strings . include? ( attribute )
674
+ nil_attributes = data . select { |_name , value | value . nil? } . keys
675
+ nil_attributes . each do | nil_attr |
676
+ attribute_type = context . type . attributes [ nil_attr ] [ :type ]
677
+ data [ nil_attr ] = '' if ( attribute_type . include? ( 'Enum[' ) && enum_values ( context , nil_attr ) . include? ( '' ) ) || attribute_type == 'String'
678
678
end
679
679
data
680
680
end
Original file line number Diff line number Diff line change @@ -123,4 +123,4 @@ Function ConvertTo-CanonicalResult {
123
123
124
124
# Output the final result
125
125
$ResultObject
126
- }
126
+ }
You can’t perform that action at this time.
0 commit comments