foreman_ansible 7.1.4 → 7.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c2aa2f197db82b4761ba3383644509cd7d1adf1da8d25767020e4e22bd58a59
-  data.tar.gz: 3818951fe2e8f8cbc4fd3c4cf4253e86199f4680f3ea6bbc14603403d9f81b18
+  metadata.gz: 6988da0b98785b524a517950e7af3143cb869a83a4880e07930c5db47a466d8c
+  data.tar.gz: 6cdfa6a0f7dce34cae4b4c39004d9dea499e3f70d9b0687784c3acc45e548bf1
 SHA512:
-  metadata.gz: c29e747b40b8ec1bdf2056058639ebbe28fd566f474addc51ddd220e7f55f47c9db5ad0c3697f284e32eeb8efabd124bb58257e20c8ef50f7196a29da4ee845a
-  data.tar.gz: ab30288f2eb2aed966b93eb6bb7b1cbbcf3f9564bff61d9f1bde0161834f5886adf9c7d2a084494021e4b867b886b3530c78bc069212cf893b49c4d887504dc8
+  metadata.gz: e56067be85f66f973b8f4ebc1244f17e052539977cb022df27e0206087844d6aef590c4a5ab7d4b69265d7e2b1a21285363f01676d5e563b03749208628a2173
+  data.tar.gz: a92d028988fd669b325492b8fb7c01dbf8b266bb1f9e53fb7a69d461133f5d8c93114da3606369f8ab36590d6ae6d1af2453a9416236465455c98ff342a15996

data/lib/foreman_ansible/version.rb

@@ -4,5 +4,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '7.1.4'
+  VERSION = '7.1.5'
 end

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTableHelper.js

@@ -85,12 +85,16 @@ const validateRegexp = (variable, value) => {
 };
 
 const validateList = (variable, value) => {
-  if (variable.validatorRule.split(',').find(item => item.trim() === value)) {
+  let { validatorRule } = variable;
+  if (typeof validatorRule !== 'string') {
+    validatorRule = validatorRule.toString();
+  }
+  if (validatorRule.split(',').find(item => item.trim() === value)) {
     return validationSuccess;
   }
   return {
     key: 'error',
-    msg: sprintf(__('Invalid, expected one of: %s'), variable.validatorRule),
+    msg: sprintf(__('Invalid, expected one of: %s'), validatorRule),
   };
 };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 7.1.4
+  version: 7.1.5
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -42,30 +42,30 @@ dependencies:
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.3
 description: Ansible integration with Foreman
 email:
 - elobatocs@gmail.com
@@ -223,85 +223,48 @@ files:
 - lib/foreman_ansible.rb
 - lib/foreman_ansible/engine.rb
 - lib/foreman_ansible/register.rb
-- lib/foreman_ansible/register.rb.orig
 - lib/foreman_ansible/remote_execution.rb
 - lib/foreman_ansible/version.rb
 - locale/Makefile
 - locale/action_names.rb
 - locale/ca/LC_MESSAGES/foreman_ansible.mo
-- locale/ca/foreman_ansible.edit.po
 - locale/ca/foreman_ansible.po
-- locale/ca/foreman_ansible.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/foreman_ansible.mo
-- locale/cs_CZ/foreman_ansible.edit.po
 - locale/cs_CZ/foreman_ansible.po
-- locale/cs_CZ/foreman_ansible.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_ansible.mo
-- locale/de/foreman_ansible.edit.po
 - locale/de/foreman_ansible.po
-- locale/de/foreman_ansible.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_ansible.mo
-- locale/en/foreman_ansible.edit.po
 - locale/en/foreman_ansible.po
-- locale/en/foreman_ansible.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_ansible.mo
-- locale/en_GB/foreman_ansible.edit.po
 - locale/en_GB/foreman_ansible.po
-- locale/en_GB/foreman_ansible.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_ansible.mo
-- locale/es/foreman_ansible.edit.po
 - locale/es/foreman_ansible.po
-- locale/es/foreman_ansible.po.time_stamp
 - locale/foreman_ansible.pot
 - locale/fr/LC_MESSAGES/foreman_ansible.mo
-- locale/fr/foreman_ansible.edit.po
 - locale/fr/foreman_ansible.po
-- locale/fr/foreman_ansible.po.time_stamp
 - locale/gemspec.rb
 - locale/gl/LC_MESSAGES/foreman_ansible.mo
-- locale/gl/foreman_ansible.edit.po
 - locale/gl/foreman_ansible.po
-- locale/gl/foreman_ansible.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_ansible.mo
-- locale/it/foreman_ansible.edit.po
 - locale/it/foreman_ansible.po
-- locale/it/foreman_ansible.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_ansible.mo
-- locale/ja/foreman_ansible.edit.po
 - locale/ja/foreman_ansible.po
-- locale/ja/foreman_ansible.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_ansible.mo
-- locale/ko/foreman_ansible.edit.po
 - locale/ko/foreman_ansible.po
-- locale/ko/foreman_ansible.po.time_stamp
 - locale/nl_NL/LC_MESSAGES/foreman_ansible.mo
-- locale/nl_NL/foreman_ansible.edit.po
 - locale/nl_NL/foreman_ansible.po
-- locale/nl_NL/foreman_ansible.po.time_stamp
 - locale/pl/LC_MESSAGES/foreman_ansible.mo
-- locale/pl/foreman_ansible.edit.po
 - locale/pl/foreman_ansible.po
-- locale/pl/foreman_ansible.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_ansible.mo
-- locale/pt_BR/foreman_ansible.edit.po
 - locale/pt_BR/foreman_ansible.po
-- locale/pt_BR/foreman_ansible.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_ansible.mo
-- locale/ru/foreman_ansible.edit.po
 - locale/ru/foreman_ansible.po
-- locale/ru/foreman_ansible.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_ansible.mo
-- locale/sv_SE/foreman_ansible.edit.po
 - locale/sv_SE/foreman_ansible.po
-- locale/sv_SE/foreman_ansible.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/foreman_ansible.mo
-- locale/zh_CN/foreman_ansible.edit.po
 - locale/zh_CN/foreman_ansible.po
-- locale/zh_CN/foreman_ansible.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_ansible.mo
-- locale/zh_TW/foreman_ansible.edit.po
 - locale/zh_TW/foreman_ansible.po
-- locale/zh_TW/foreman_ansible.po.time_stamp
 - package.json
 - test/factories/ansible_proxy.rb
 - test/factories/ansible_roles.rb
@@ -375,7 +338,6 @@ files:
 - webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.js
 - webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.scss
 - webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js
-- webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js.orig
 - webpack/components/AnsibleHostDetail/components/JobsTab/RecurringJobsTable.js
 - webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.fixtures.js
 - webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.test.js
@@ -496,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
@@ -507,29 +469,35 @@ test_files:
 - test/factories/host_ansible_enhancements.rb
 - test/fixtures/insights_playbook.yaml
 - test/fixtures/playbooks_example_output.json
-- test/fixtures/report.json
 - test/fixtures/sample_facts.json
 - test/fixtures/sample_playbooks.json
+- test/fixtures/report.json
 - test/foreman_ansible/helpers/ansible_roles_helper_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
+- test/functional/ansible_roles_controller_test.rb
+- test/functional/ansible_variables_controller_test.rb
 - test/functional/api/v2/ansible_playbooks_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
+- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
-- test/functional/ansible_roles_controller_test.rb
-- test/functional/ansible_variables_controller_test.rb
 - test/functional/hosts_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
 - test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
 - test/graphql/queries/ansible_roles_query_test.rb
 - test/graphql/queries/host_ansible_roles_query_test.rb
-- test/unit/actions/run_ansible_job_test.rb
-- test/unit/actions/run_proxy_ansible_command_test.rb
+- test/test_plugin_helper.rb
+- test/unit/ansible_role_test.rb
+- test/unit/ansible_variable_test.rb
 - test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
 - test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/host_ansible_role_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
+- test/unit/ignore_roles_test.rb
+- test/unit/import_playbooks_test.rb
+- test/unit/import_roles_and_variables.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
 - test/unit/services/ansible_variables_importer_test.rb
@@ -539,12 +507,6 @@ test_files:
 - test/unit/services/override_resolver_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
+- test/unit/actions/run_ansible_job_test.rb
+- test/unit/actions/run_proxy_ansible_command_test.rb
 - test/unit/ansible_provider_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/ansible_variable_test.rb
-- test/unit/host_ansible_role_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
-- test/unit/ignore_roles_test.rb
-- test/unit/import_playbooks_test.rb
-- test/unit/import_roles_and_variables.rb
-- test/test_plugin_helper.rb

data/lib/foreman_ansible/register.rb.orig

@@ -1,257 +0,0 @@
-# frozen_string_literal: true
-
-Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 3.3'
-
-  settings do
-    category :ansible, N_('Ansible') do
-      setting 'ansible_ssh_private_key_file',
-              type: :string,
-              description: N_('Use this to supply a path to an SSH Private Key '\
-                               'that Ansible will use in lieu of a password '\
-                               'Override with "ansible_ssh_private_key_file" '\
-                               'host parameter'),
-              default: '',
-              full_name: N_('Private Key Path')
-      setting 'ansible_connection',
-              type: :string,
-              description: N_('Use this connection type by default when running '\
-                               'Ansible playbooks. You can override this on hosts by '\
-                               'adding a parameter "ansible_connection"'),
-              default: 'ssh',
-              full_name: N_('Connection type')
-      setting 'ansible_winrm_server_cert_validation',
-              type: :string,
-              description: N_('Enable/disable WinRM server certificate '\
-                               'validation when running Ansible playbooks. You can override '\
-                               'this on hosts by adding a parameter '\
-                               '"ansible_winrm_server_cert_validation"'),
-              default: 'validate',
-              full_name: N_('WinRM cert Validation')
-      setting 'ansible_verbosity',
-              type: :integer,
-              description: N_('Foreman will add this level of verbosity for '\
-                               'additional debugging output when running Ansible playbooks.'),
-              default: '0',
-              full_name: N_('Default verbosity level'),
-              value: nil,
-              collection: proc {
-                { '0' => N_('Disabled'),
-                  '1' => N_('Level 1 (-v)'),
-                  '2' => N_('Level 2 (-vv)'),
-                  '3' => N_('Level 3 (-vvv)'),
-                  '4' => N_('Level 4 (-vvvv)') }
-              }
-      setting 'ansible_post_provision_timeout',
-              type: :integer,
-              description: N_('Timeout (in seconds) to set when Foreman will trigger a '\
-                               'play Ansible roles task after a host is fully provisioned. '\
-                               'Set this to the maximum time you expect a host to take '\
-                               'until it is ready after a reboot.'),
-              default: '360',
-              full_name: N_('Post-provision timeout')
-      setting 'ansible_interval',
-              type: :integer,
-              description: N_('Timeout (in minutes) when hosts should have reported.'),
-              default: '30',
-              full_name: N_('Ansible report timeout')
-      setting 'ansible_out_of_sync_disabled',
-              type: :boolean,
-              description: format(N_('Disable host configuration status turning to out of'\
-                               ' sync for %{cfgmgmt} after report does not arrive within'\
-                               ' configured interval'), :cfgmgmt => 'Ansible'),
-              default: false,
-              full_name: format(N_('%{cfgmgmt} out of sync disabled'), :cfgmgmt => 'Ansible')
-      setting  'ansible_inventory_template',
-               type: :string,
-               description: N_('Foreman will use this template to schedule the report '\
-                                 'with Ansible inventory'),
-               default: 'Ansible - Ansible Inventory',
-               full_name: N_('Default Ansible inventory report template')
-      setting 'ansible_roles_to_ignore',
-              type: :array,
-              description: N_('Those roles will be excluded when importing roles from smart proxy, '\
-                'The expected input is comma separated values and you can use * wildcard metacharacters'\
-                'For example: foo*, *b*,*bar'),
-              default: [],
-              full_name: N_('Ansible roles to ignore')
-      setting 'foreman_ansible_proxy_batch_size',
-              type: :integer,
-              description: N_('Number of tasks which should be sent to the smart proxy in one request, '\
-                              'if foreman_tasks_proxy_batch_trigger is enabled. '\
-                              'If set, overrides foreman_tasks_proxy_batch_size setting for Ansible jobs.'),
-              default: nil,
-              full_name: N_('Proxy tasks batch size for Ansible')
-    end
-  end
-
-  security_block :foreman_ansible do
-    permission :play_roles_on_host,
-               { :hosts => [:play_roles, :multiple_play_roles],
-                 :'api/v2/hosts' => [:play_roles,
-                                     :multiple_play_roles] },
-               :resource_type => 'Host'
-    permission :play_roles_on_hostgroup,
-               { :hostgroups => [:play_roles],
-                 :'api/v2/hostgroups' => [:play_roles,
-                                          :multiple_play_roles] },
-               :resource_type => 'Hostgroup'
-    permission :view_ansible_roles,
-               { :ansible_roles => [:index, :auto_complete_search],
-                 :'api/v2/ansible_roles' => [:index, :show, :fetch],
-                 :ui_ansible_roles => [:index] },
-               :resource_type => 'AnsibleRole'
-    permission :destroy_ansible_roles,
-               { :ansible_roles => [:destroy],
-                 :'api/v2/ansible_roles' => [:destroy, :obsolete] },
-               :resource_type => 'AnsibleRole'
-    permission :import_ansible_roles,
-               { :ansible_roles => [:import, :confirm_import],
-                 :'api/v2/ansible_roles' => [:import, :sync] },
-               :resource_type => 'AnsibleRole'
-    permission :view_ansible_variables,
-               {
-                 :lookup_values => [:index],
-                 :ansible_variables => [:index, :auto_complete_search],
-                 :'api/v2/ansible_variables' => [:index, :show]
-               },
-               :resource_type => 'AnsibleVariable'
-    permission :edit_ansible_variables,
-               { :lookup_values => [:update],
-                 :ansible_variables => [:edit, :update],
-                 :'api/v2/ansible_variables' => [:update],
-                 :'api/v2/ansible_override_values' => [:create, :destroy] },
-               :resource_type => 'AnsibleVariable'
-    permission :destroy_ansible_variables,
-               {
-                 :lookup_values => [:destroy],
-                 :ansible_variables => [:destroy],
-                 :'api/v2/ansible_variables' => [:destroy, :obsolete]
-               },
-               :resource_type => 'AnsibleVariable'
-    permission :create_ansible_variables,
-               {
-                 :lookup_values => [:create],
-                 :ansible_variables => [:new, :create],
-                 :'api/v2/ansible_variables' => [:create]
-               },
-               :resource_type => 'AnsibleVariable'
-    permission :import_ansible_variables,
-               {
-                 :ansible_variables => [:import, :confirm_import],
-                 :'api/v2/ansible_variables' => [:import]
-               },
-               :resource_type => 'AnsibleVariable'
-    permission :view_hosts,
-               { :'api/v2/hosts' => [:ansible_roles],
-                 :'api/v2/ansible_inventories' => [:hosts] },
-               :resource_type => 'Host'
-    permission :view_hostgroups,
-               { :'api/v2/hostgroups' => [:ansible_roles],
-                 :'api/v2/ansible_inventories' => [:hostgroups] },
-               :resource_type => 'Hostgroup'
-    permission :edit_hosts,
-               { :'api/v2/hosts' => [:assign_ansible_roles] },
-               :resource_type => 'Host'
-    permission :edit_hostgroups,
-               { :'api/v2/hostgroups' => [:assign_ansible_roles] },
-               :resource_type => 'Hostgroup'
-    permission :generate_ansible_inventory,
-               { :'api/v2/ansible_inventories' => [:schedule] }
-    permission :import_ansible_playbooks,
-               { :'api/v2/ansible_playbooks' => [:sync, :fetch] }
-  end
-
-  role 'Ansible Roles Manager',
-       [:play_roles_on_host, :play_roles_on_hostgroup,
-        :create_job_invocations, :view_job_templates,      # to allow the play_roles
-        :create_template_invocations, :view_smart_proxies, # ...
-        :view_ansible_roles, :destroy_ansible_roles,
-        :import_ansible_roles, :view_ansible_variables,
-        :create_ansible_variables, :import_ansible_variables,
-        :edit_ansible_variables, :destroy_ansible_variables, :import_ansible_playbooks]
-
-  role 'Ansible Tower Inventory Reader',
-       [:view_hosts, :view_hostgroups, :view_facts, :generate_report_templates, :generate_ansible_inventory,
-        :view_report_templates],
-       'Permissions required for the user which is used by Ansible Tower Dynamic Inventory Item'
-
-  add_all_permissions_to_default_roles
-  extend_template_helpers ForemanAnsible::RendererMethods
-  allowed_template_helpers :insights_remediation
-
-  base_role_assignment_params = { :ansible_role_ids => [],
-                                  :ansible_roles => [] }
-  parameter_filter Host::Managed, base_role_assignment_params.merge(:host_ansible_roles_attributes => {})
-  parameter_filter Hostgroup, base_role_assignment_params.merge(:hostgroup_ansible_roles_attributes => {})
-
-  register_global_js_file 'global'
-
-  extend_graphql_type :type => '::Types::Host' do
-    field :all_ansible_roles, ::Types::InheritedAnsibleRole.connection_type, :null => true, :method => :present_all_ansible_roles
-    field :own_ansible_roles, ::Types::AnsibleRole.connection_type, :null => true
-    field :available_ansible_roles, ::Types::AnsibleRole.connection_type, :null => true
-    field :ansible_variables_with_overrides, Types::OverridenAnsibleVariable.connection_type, :null => false
-
-    def present_all_ansible_roles
-      inherited_ansible_roles = object.inherited_ansible_roles.map { |role| ::Presenters::AnsibleRolePresenter.new(role, true) }
-      ansible_roles = object.ansible_roles.map { |role| ::Presenters::AnsibleRolePresenter.new(role, false) }
-      (inherited_ansible_roles + ansible_roles).uniq
-    end
-
-    def ansible_variables_with_overrides
-      resolver = ::ForemanAnsible::OverrideResolver.new(object)
-      AnsibleVariable.where(:ansible_role_id => object.all_ansible_roles.pluck(:id), :override => true).map { |variable| ::Presenters::OverridenAnsibleVariablePresenter.new variable, resolver }
-    end
-  end
-
-  register_graphql_query_field :ansible_roles, '::Types::AnsibleRole', :collection_field
-  register_graphql_mutation_field :assign_ansible_roles, '::Mutations::Hosts::AssignAnsibleRoles'
-  register_graphql_mutation_field :delete_ansible_variable_override, ::Mutations::AnsibleVariableOverrides::Delete
-  register_graphql_mutation_field :update_ansible_variable_override, ::Mutations::AnsibleVariableOverrides::Update
-  register_graphql_mutation_field :create_ansible_variable_override, ::Mutations::AnsibleVariableOverrides::Create
-
-  divider :top_menu, :caption => N_('Ansible'), :parent => :configure_menu
-  menu :top_menu, :ansible_roles,
-       :caption => N_('Roles'),
-       :url_hash => { :controller => :ansible_roles, :action => :index },
-       :parent => :configure_menu
-  menu :top_menu, :ansible_variables,
-       :caption => N_('Variables'),
-       :url_hash => { :controller => :ansible_variables, :action => :index },
-       :parent => :configure_menu
-
-  apipie_documented_controllers [
-    "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"
-  ]
-  ApipieDSL.configuration.dsl_classes_matchers += [
-    "#{ForemanAnsible::Engine.root}/app/models/*.rb",
-    "#{ForemanAnsible::Engine.root}/app/services/foreman_ansible/*.rb"
-  ]
-
-  register_info_provider ForemanAnsible::AnsibleInfo
-
-  # For backwards compatiblity with 1.17
-  if respond_to?(:register_report_scanner)
-    register_report_scanner ForemanAnsible::AnsibleReportScanner
-    register_report_origin 'Ansible', 'ConfigReport'
-  end
-
-<<<<<<< HEAD
-  describe_host do
-    multiple_actions_provider :ansible_hosts_multiple_actions
-=======
-  extend_page('smart_proxies/show') do |context|
-    context.add_pagelet :smart_proxy_title_actions,
-                        :name => _('Update Smart Proxy'),
-                        :partial => 'foreman/smart_proxies/update_smart_proxy',
-                        :onlyif => ->(proxy, view) { view.can_update_proxy?(proxy) }
-  end
-  extend_page('smart_proxies/index') do |context|
-    context.add_pagelet :smart_proxy_title_actions,
-                        :name => _('Update Smart Proxy'),
-                        :partial => 'foreman/smart_proxies/update_smart_proxy',
-                        :onlyif => ->(proxy, view) { view.can_update_proxy?(proxy) }
->>>>>>> a707dab (Fixes #35143 - Add a smart proxy update button)
-  end
-end