Skip to content

Commit 67cb8e9

Browse files
jrafanieFryguy
authored andcommitted
Merge pull request #572 from agrare/fix_ae_state_data_load_error
Fix YAML.load error with serialized StateVarHash (cherry picked from commit bfa2964)
1 parent fa3a9a7 commit 67cb8e9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/miq_automation_engine/engine/miq_ae_engine/miq_ae_workspace_runtime.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def instantiate(uri, user, root = nil)
163163
$miq_ae_logger.info("Instantiating [#{ManageIQ::Password.sanitize_string(uri)}]", :resource_id => miq_request_id) if root.nil?
164164

165165
if (ae_state_data = args.delete('ae_state_data'))
166-
@persist_state_hash.merge!(YAML.load(ae_state_data))
166+
@persist_state_hash.merge!(YAML.safe_load(ae_state_data, :permitted_classes => [MiqAeEngine::StateVarHash]))
167167
end
168168

169169
if (ae_state_previous = args.delete('ae_state_previous'))

spec/miq_ae_engine_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ def before_ae_starts(_options)
924924
end
925925

926926
it "fetches value from state_var" do
927-
ae_state_data = {:my_id => 45}.to_yaml
927+
ae_state_data = MiqAeEngine::StateVarHash.new(:my_id => 45).to_yaml
928928
workspace = MiqAeEngine.instantiate("/A/C/BARNEY/FRED?ae_state_data=#{ae_state_data}", user)
929929
expect(workspace.root['field1']).to eq("45")
930930
expect(workspace.root['field2']).to eq('Bamm Bamm Rubble')

0 commit comments

Comments
 (0)