Merge pull request #1147 from binford2k/psych

Account for Psych API changes
puppetlabs · Oct 20, 2021 · 0b29013 · 0b29013
2 parents fe8bdd5 + a7b45bc
commit 0b29013
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/pdk/config/yaml.rb b/lib/pdk/config/yaml.rb
@@ -13,7 +13,11 @@ def parse_file(filename)
 
         require 'yaml'
 
-        data = ::YAML.safe_load(data, [Symbol], [], true)
+        data = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
+                 ::YAML.safe_load(data, permitted_classes: [Symbol], permitted_symbols: [], aliases: true)
+               else
+                 ::YAML.safe_load(data, [Symbol], [], true)
+               end
         return if data.nil?
 
         data.each { |k, v| yield k, PDK::Config::Setting.new(k, self, v) }

diff --git a/spec/unit/pdk/analytics/client/google_analytics_spec.rb b/spec/unit/pdk/analytics/client/google_analytics_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'securerandom'
 require 'httpclient'
 require 'concurrent/configuration'
 require 'concurrent/future'