diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-03-24 13:44:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-24 13:44:27 -0700 |
| commit | 52ef0c8a9835ce5559eccfda7973312ac26d739d (patch) | |
| tree | c60feceba928c9ecdfbf6f496aa09d403a7fdf52 /chef-config | |
| parent | 2b6d99b1c0340ee1d9622286a51f6bf2e480c3da (diff) | |
| parent | 8c11b691afccdffa3b43440e7746ce8dc580e7e5 (diff) | |
| download | chef-52ef0c8a9835ce5559eccfda7973312ac26d739d.tar.gz | |
Merge branch 'main' into INFC-7
Diffstat (limited to 'chef-config')
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | chef-config/spec/unit/config_spec.rb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 87e0b6bab2..2932fdc82f 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -174,7 +174,7 @@ module ChefConfig # Call to_sym because Chef::Config expects only symbol keys. Also # runs a simple parse on the string for some common types. - memo[key.to_sym] = YAML.safe_load(value) + memo[key.to_sym] = YAML.safe_load(value, permitted_classes: [Date]) memo end set_extra_config_options(extra_parsed_options) diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 0d081e6407..d77a6b2fef 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "18.0.72".freeze + VERSION = "18.0.75".freeze end diff --git a/chef-config/spec/unit/config_spec.rb b/chef-config/spec/unit/config_spec.rb index d4d5844d3d..89eb785b06 100644 --- a/chef-config/spec/unit/config_spec.rb +++ b/chef-config/spec/unit/config_spec.rb @@ -19,6 +19,7 @@ require "spec_helper" require "chef-config/config" +require "date" unless defined?(Date) RSpec.describe ChefConfig::Config do before(:each) do |