Merge remote-tracking branch 'origin/master' into quinteros

ManageIQ · Dec 7, 2023 · 7b26641 · 7b26641
2 parents 8f62196 + 57df84c
commit 7b26641
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/app/models/manageiq/providers/openstack/cloud_manager/orchestration_template.rb b/app/models/manageiq/providers/openstack/cloud_manager/orchestration_template.rb
@@ -105,7 +105,7 @@ def self.display_name(number = 1)
 
   def parse
     return JSON.parse(content) if format == 'json'
-    YAML.safe_load(content, [Date])
+    YAML.safe_load(content, :permitted_classes => [Date])
   end
 
   def validate_format_yaml

diff --git a/app/models/manageiq/providers/openstack/helper_methods.rb b/app/models/manageiq/providers/openstack/helper_methods.rb
@@ -72,12 +72,8 @@ def with_notification(type, options: {})
       success_options.merge!(options)
       error_options.merge!(options)
 
-      # copy subject, initiator and cause from options
-      named_options_keys = [:subject, :initiator, :cause]
-      named_options = {}
-      named_options_keys.map do |key|
-        named_options[key] = options.fetch(key, nil)
-      end
+      # extract subject, initiator and cause from options
+      named_options = options.extract!(:subject, :initiator, :cause)
 
       begin
         yield

diff --git a/spec/models/manageiq/providers/openstack/cloud_manager/provision/volume_attachment_spec.rb b/spec/models/manageiq/providers/openstack/cloud_manager/provision/volume_attachment_spec.rb
@@ -5,6 +5,8 @@
     @flavor = FactoryBot.create(:flavor_openstack)
     @volume = FactoryBot.create(:cloud_volume_openstack)
 
+    # We're storing objects in the instance_type, so we must permit loading this class
+    ActiveRecord::Base.yaml_column_permitted_classes = ActiveRecord::Base.yaml_column_permitted_classes | [@flavor.class]
     @task = FactoryBot.create(:miq_provision_openstack,
                                :source  => @template,
                                :state   => 'pending',