Fixed issue where dialog values are not passed consistently

[Fryguy]

This matches the way it's passed for the dynamic_dialog_field_value_processor i.e.

manageiq/app/models/dynamic_dialog_field_value_processor.rb

Line 7 in 26b506a

dialog_values = {:dialog => dialog_field.dialog.try(:automate_values_hash)}

@agrare Please review.

[miq-bot]

Checked commit Fryguy@ea0109f with ruby 2.7.8, rubocop 1.56.3, haml-lint 0.51.0, and yamllint
1 file checked, 0 offenses detected
Everything looks fine. 👍

[agrare]

@Fryguy spec failures look related

[miq-bot]

This pull request has been automatically marked as stale because it has not been updated for at least 3 months.

If these changes are still valid, please remove the stale label, make any changes requested by reviewers (if any), and ensure that this issue is being looked at by the assigned/reviewer(s).

[Fryguy]

I see why it's failing, but I'm not sure I understand it - maybe this isn't the right fix :(

[miq-bot]

This pull request has been automatically marked as stale because it has not been updated for at least 3 months.

If these changes are still valid, please remove the stale label, make any changes requested by reviewers (if any), and ensure that this issue is being looked at by the assigned/reviewer(s).

[agrare]

The logs from the specs here are gone so here are the failures

  1) ServiceReconfigureTask#deliver_to_automate automation entry point available queues the reconfigure automate entry point
     Failure/Error:
       MiqQueue.put(
         :class_name     => 'MiqAeEngine',
         :method_name    => 'deliver',
         :args           => [args],
         :role           => 'automate',
         :zone           => zone,
         :tracking_label => tracking_label_id
       )
     
       #<MiqQueue(id: integer, target_id: integer, priority: integer, method_name: string, state: string, created_on: datetime, updated_on: datetime, lock_version: integer, task_id: string, deliver_on: datetime, queue_name: string, class_name: string, instance_id: integer, args: text, miq_callback: text, msg_data: binary, zone: string, role: string, server_guid: string, msg_timeout: integer, handler_id: integer, handler_type: string, expires_on: datetime, tracking_label: string, user_id: integer, group_id: integer, tenant_id: integer, miq_task_id: integer, href_slug: string, region_number: integer, region_description: string) (class)> received :put with unexpected arguments
         expected: ({:args=>[{:attrs=>{"dialog_key"=>"value", "request"=>"service_reconfigure"}, :automate_message=>"crea...>"automate", :tracking_label=>"r38000000000236_service_reconfigure_task_38000000000045", :zone=>nil})
              got: ({:args=>[{:attrs=>{:dialog=>{"dialog_key"=>"value"}}, :automate_message=>"create", :class_name=>"clas...>"automate", :tracking_label=>"r38000000000236_service_reconfigure_task_38000000000045", :zone=>nil})
       Diff:
       @@ -1,5 +1,5 @@
        [{:args=>
       -   [{:attrs=>{"dialog_key"=>"value", "request"=>"service_reconfigure"},
       +   [{:attrs=>{:dialog=>{"dialog_key"=>"value"}},
             :automate_message=>"create",
             :class_name=>"class",
             :instance_name=>"instance",
       
     # ./app/models/service_reconfigure_task.rb:39:in `deliver_to_automate'
     # ./spec/models/service_reconfigure_task_spec.rb:107:in `block (4 levels) in <main>'
     # /home/grare/adam/.gem/ruby/3.1.0/gems/webmock-3.23.1/lib/webmock/rspec.rb:39:in `block (2 levels) in <main>'
  1) ServiceTemplateProvisionTask with multiple tasks #deliver_queue when the state is not active with AUTOMATE_DRIVES delivers to the queue
     Failure/Error:
       MiqQueue.put(
         :class_name     => 'MiqAeEngine',
         :method_name    => 'deliver',
         :args           => [args],
         :role           => 'automate',
         :zone           => options.fetch(:miq_zone, my_zone),
         :tracking_label => tracking_label_id
       )
     
       #<MiqQueue(id: integer, target_id: integer, priority: integer, method_name: string, state: string, created_on: datetime, updated_on: datetime, lock_version: integer, task_id: string, deliver_on: datetime, queue_name: string, class_name: string, instance_id: integer, args: text, miq_callback: text, msg_data: binary, zone: string, role: string, server_guid: string, msg_timeout: integer, handler_id: integer, handler_type: string, expires_on: datetime, tracking_label: string, user_id: integer, group_id: integer, tenant_id: integer, miq_task_id: integer, href_slug: string, region_number: integer, region_description: string) (class)> received :put with unexpected arguments
         expected: ({:args=>[{:attrs=>{"Service::Service"=>87000000000037, "request"=>"clone_to_service"}, :automate_mess...:tracking_label=>"r87000000000089_service_template_provision_task_87000000000617", :zone=>"special"})
              got: ({:args=>[{:attrs=>{"Service::Service"=>87000000000037, :dialog=>{}, "request"=>"clone_to_service"}, :...:tracking_label=>"r87000000000089_service_template_provision_task_87000000000617", :zone=>"special"})
       Diff:
       @@ -1,6 +1,8 @@
        [{:args=>
           [{:attrs=>
       -      {"Service::Service"=>87000000000037, "request"=>"clone_to_service"},
       +      {"Service::Service"=>87000000000037,
       +       :dialog=>{},
       +       "request"=>"clone_to_service"},
             :automate_message=>"create",
             :class_name=>"ServiceProvision_Template",
             :instance_name=>"clone_to_service",
       
     # ./app/models/service_template_provision_task.rb:161:in `deliver_to_automate'
     # ./app/models/miq_request_task.rb:153:in `deliver_queue'
     # ./spec/models/service_template_provision_task_spec.rb:115:in `block (6 levels) in <main>'
     # /home/grare/adam/.gem/ruby/3.1.0/gems/webmock-3.23.1/lib/webmock/rspec.rb:39:in `block (2 levels) in <main>'

Finished in 10.23 seconds (files took 6.96 seconds to load)
176 examples, 1 failure

Failed examples:

rspec ./spec/models/service_template_provision_task_spec.rb:91 # ServiceTemplateProvisionTask with multiple tasks #deliver_queue when the state is not active with AUTOMATE_DRIVES delivers to the queue

[agrare]

#23138 is an alternate which (accidentally) only changes the dialog_values format for workflows so it isn't subject to the same errors as this with other Services

[agrare]

@Fryguy I do like keeping the input consistent for everything, but I'd be wary of changing the attrs that get delivered to automate which is what is (luckily) causing these test failures.

[Fryguy]

Closing in favor of #23138