foreman_ansible 4.0.3.5 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f5cb37ac21d410601d1f871a73f125511574ae218f6a488c865c45e64761c88
-  data.tar.gz: 4bbb6f29895b798715e7d5915d2370e56feefc3ba0ad67365bb03af40ca2dc93
+  metadata.gz: 1181793843192c0b3ef0d48427a3e948a570dc707e7232271fb62e21e7dcce81
+  data.tar.gz: 63406a1b2450e56ede90163216eec5faffe06018ced278c489b99409822c443c
 SHA512:
-  metadata.gz: ea3fd4b934442a52ae46cf71ec2931f67159da7df6906ffc99a7c4616e074d25ab3349021deddeef60258f781969979743ea1aa6eb97e0d575b1a9d912e41663
-  data.tar.gz: 39861b01ad80bac36159c3b6b3b243084f71f4567caa18dc35e9e02e87d92ca53ec27ec31ec467900c8b1aca7979ac0623314c90604bcae370caf3be92148eb6
+  metadata.gz: 6b582b46130075e8f0ab202f7c80c6a8fccba95cebc8a94fb377e35a50c880d20f5e5bf4a5baf77779bc94b9e8d219de5da5f6184ba1afce56a2c5ce0d95d73d
+  data.tar.gz: b6fa2dce6812d569bbec5f60737269ddab3307b7a4f4b0f3bc0013351784a3a5fa2fe1032f40d25f333916ce13fedfa04e94e0af24061c4b3fd1c96180de9ee6

data/app/controllers/api/v2/ansible_roles_controller.rb

@@ -67,7 +67,7 @@ module Api
         params.fetch(:role_names, [])
       end
 
-      # rubocop:disable DotPosition
+      # rubocop:disable Layout/DotPosition
       def find_proxy
         unless params[:proxy_id]
           msg = _('Smart proxy id is required')
@@ -76,7 +76,7 @@ module Api
         @proxy = SmartProxy.authorized(:view_smart_proxies)
                            .find(params[:proxy_id])
       end
-      # rubocop:enable DotPosition
+      # rubocop:enable Layout/DotPosition
 
       def create_importer
         @importer = ForemanAnsible::ApiRolesImporter.new(@proxy)

data/app/controllers/api/v2/ansible_variables_controller.rb

@@ -5,7 +5,6 @@ module Api
     # API controller for Ansible Variables
     class AnsibleVariablesController < ::Api::V2::BaseController
       include ::Api::Version2
-      include Foreman::Controller::Parameters::VariableLookupKey
       include Foreman::Controller::Parameters::AnsibleVariable
 
       resource_description do
@@ -65,7 +64,7 @@ module Api
       param_group :ansible_variable, :as => :update
 
       def update
-        @ansible_variable.update!(variable_lookup_key_params)
+        @ansible_variable.update!(ansible_variable_params)
         render 'api/v2/ansible_variables/show'
       end
 

data/app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb

@@ -12,7 +12,7 @@ module ForemanAnsible
 
         # Included blocks shouldn't be bound by length, as otherwise concerns
         # cannot extend the method properly.
-        # rubocop:disable BlockLength, Rails/LexicallyScopedActionFilter
+        # rubocop:disable Rails/LexicallyScopedActionFilter
         included do
           before_action :find_ansible_roles, :only => [:assign_ansible_roles]
 
@@ -61,7 +61,7 @@ module ForemanAnsible
             process_response @hostgroup.update(:ansible_roles => @ansible_roles)
           end
         end
-        # rubocop:enable BlockLength, Rails/LexicallyScopedActionFilter
+        # rubocop:enable Rails/LexicallyScopedActionFilter
 
         private
 

data/app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb

@@ -12,7 +12,7 @@ module ForemanAnsible
 
         # Included blocks shouldn't be bound by length, as otherwise concerns
         # cannot extend the method properly.
-        # rubocop:disable BlockLength, Rails/LexicallyScopedActionFilter
+        # rubocop:disable Rails/LexicallyScopedActionFilter
         included do
           before_action :find_ansible_roles, :only => [:assign_ansible_roles]
 
@@ -63,7 +63,7 @@ module ForemanAnsible
             process_response @host.update(:ansible_roles => @ansible_roles)
           end
         end
-        # rubocop:enable BlockLength, Rails/LexicallyScopedActionFilter
+        # rubocop:enable Rails/LexicallyScopedActionFilter
 
         private
 

data/app/models/concerns/foreman_ansible/host_managed_extensions.rb

@@ -4,7 +4,6 @@ require 'ipaddress'
 module ForemanAnsible
   # Relations to make Host::Managed 'have' ansible roles
   module HostManagedExtensions
-    # rubocop:disable Metrics/BlockLength
     def self.prepended(base)
       base.instance_eval do
         include ::ForemanAnsible::Concerns::JobInvocationHelper
@@ -30,7 +29,6 @@ module ForemanAnsible
 
     # This one should be fixed, disabled for the moment as we're
     # in a rush to get the release out
-    # rubocop:disable Metrics/AbcSize
     def play_ansible_roles
       return true unless ansible_roles.present? ||
                          inherited_ansible_roles.present?
@@ -47,13 +45,11 @@ module ForemanAnsible
       logger.info("Error running Ansible roles on #{self} before_provision: "\
                   "#{e.message}")
     end
-    # rubocop:enable Metrics/AbcSize
 
     def all_ansible_roles
       (ansible_roles + inherited_ansible_roles).uniq
     end
 
-    # rubocop:enable Metrics/BlockLength
     # Class methods we may need to override or add
     module ClassMethods
       def import_host(*args)

data/app/models/setting/ansible.rb

@@ -7,8 +7,6 @@ class Setting
       # It would be more disadvantages than advantages to split up
       # default_settings into multiple methods, this way it's already very
       # manageable.
-      # rubocop:disable AbcSize
-      # rubocop:disable MethodLength
       def default_settings
         [
           set(
@@ -85,8 +83,6 @@ class Setting
           )
         ]
       end
-      # rubocop:enable AbcSize
-      # rubocop:enable MethodLength
 
       def load_defaults
         Setting::BLANK_ATTRS.push('ansible_ssh_private_key_file')

data/app/services/foreman_ansible/insights_notification_builder.rb

@@ -3,9 +3,7 @@
 module ForemanAnsible
   # A class that builds custom notificaton for REX job if it's insights
   # remediation feature
-  # rubocop:disable LineLength
   class InsightsNotificationBuilder < ::UINotifications::RemoteExecutionJobs::BaseJobFinish
-    # rubocop:enable LineLength
     def deliver!
       ::Notification.create!(
         :audience => Notification::AUDIENCE_USER,

data/app/services/foreman_ansible/operating_system_parser.rb

@@ -45,7 +45,6 @@ module ForemanAnsible
       facts[:ansible_distribution_release]
     end
 
-    # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity
     def os_major
       if os_name == 'Debian' &&
          facts[:ansible_distribution_major_version][%r{\/sid}i]
@@ -56,14 +55,12 @@ module ForemanAnsible
           (facts[:version].split('R')[0] if os_name == 'junos')
       end
     end
-    # rubocop:enable AbcSize, CyclomaticComplexity, PerceivedComplexity
 
     def os_release
       facts[:ansible_distribution_version] ||
         facts[:ansible_lsb] && facts[:ansible_lsb]['release']
     end
 
-    # rubocop:disable AbcSize
     def os_minor
       _, minor = (os_release&.split('.', 2)) ||
                  (facts[:version].split('R') if os_name == 'junos')
@@ -87,7 +84,6 @@ module ForemanAnsible
           facts[:ansible_lsb] && facts[:ansible_lsb]['id']
       end
     end
-    # rubocop:enable AbcSize
 
     def os_description
       if facts[:ansible_os_family] == 'Windows'

data/app/services/foreman_ansible/variables_importer.rb

@@ -29,6 +29,7 @@ module ForemanAnsible
     def import_variables(role_variables, new_roles)
       detect_changes(
         role_variables.map do |role_name, variables|
+          next if variables.blank?
           role = import_new_role(role_name, new_roles)
           next if role.blank?
           initialize_variables(variables, role)

data/app/views/foreman_ansible/job_templates/ansible_roles_-_ansible_default.erb

@@ -15,10 +15,7 @@ model: JobTemplate
     - name: Display all parameters known for the Foreman host
       debug:
         var: foreman
-  tasks:
-    - name: Apply roles
-      include_role:
-        name: "{{ role }}"
-      loop: "{{ foreman_ansible_roles }}"
-      loop_control:
-        loop_var: role
+  roles:
+<%- if @host.all_ansible_roles.present? -%>
+<%=   @host.all_ansible_roles.map { |role| "    - #{role.name.strip}" }.join("\n") %>
+<%- end -%>

data/config/routes.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable BlockLength
 Rails.application.routes.draw do
   namespace :api do
     scope '(:apiv)',
@@ -104,4 +103,3 @@ Rails.application.routes.draw do
     end
   end
 end
-# rubocop:enable BlockLength

data/db/migrate/20160802153302_create_join_table_hostgroup_ansible_roles.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 # Defines the relation between Hostgroup and AnsibleRole
-# rubocop:disable Metrics/LineLength
 class CreateJoinTableHostgroupAnsibleRoles < ActiveRecord::Migration[4.2]
   def change
     create_join_table :hostgroup, :ansible_roles, :table_name => 'hostgroup_ansible_roles' do |t|
       t.index [:hostgroup_id, :ansible_role_id], :name => 'index_ansible_roles_hostgroup_on_hostgroup_id_and_role_id'
       t.index [:ansible_role_id, :hostgroup_id], :name => 'index_ansible_roles_hostgroup_on_role_id_and_hostgroup_id'
-      # rubocop:enable Metrics/LineLength
     end
   end
 end

data/lib/foreman_ansible/engine.rb

@@ -70,7 +70,6 @@ module ForemanAnsible
       Apipie.configuration.checksum_path += ['/foreman_ansible/api/']
     end
 
-    # rubocop:disable BlockLength
     config.to_prepare do
       begin
         foreman_version = ::Foreman::Version.new
@@ -99,7 +98,6 @@ module ForemanAnsible
         Rails.logger.warn "Foreman Ansible: skipping engine hook (#{e})"
       end
     end
-    # rubocop:enable BlockLength
 
     rake_tasks do
       Rake::Task['db:seed'].enhance do

data/lib/foreman_ansible/register.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable BlockLength
 Foreman::Plugin.register :foreman_ansible do
   requires_foreman '>= 1.24'
 
@@ -119,4 +118,3 @@ Foreman::Plugin.register :foreman_ansible do
     register_report_origin 'Ansible', 'ConfigReport'
   end
 end
-# rubocop:enable BlockLength

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 = '4.0.3.5'
+  VERSION = '4.0.4'
 end

data/test/functional/api/v2/ansible_inventories_controller_test.rb

@@ -34,10 +34,10 @@ module Api
 
       test 'schedule inventory by user' do
         report = FactoryBot.create(:report_template)
-        setting = Setting::Ansible.create! :name => 'ansible_inventory_template', :value  => report.name,
-          :default => report.name, :description => 'inventory'
+        Setting::Ansible.create! :name => 'ansible_inventory_template', :value => report.name,
+                                 :default => report.name, :description => 'inventory'
         user = FactoryBot.create(:user)
-        user.roles << Role.find_by_name('Ansible Tower Inventory Reader')
+        user.roles << Role.find_by(:name => 'Ansible Tower Inventory Reader')
         post :schedule, { :session => set_session_user(user) }
         assert_response :success
       end

data/test/functional/api/v2/ansible_variables_controller_test.rb

@@ -46,6 +46,18 @@ module Api
         res = JSON.parse(@response.body)
         refute res['imported']
       end
+
+      test 'should update' do
+        variable = FactoryBot.create(:ansible_variable, :default_value => 'my default value')
+        new_value = 'changed default value'
+        post :update,
+             :params => { :id => variable.id, :default_value => new_value },
+             :session => set_session_user
+
+        assert_response :success
+        res = JSON.parse(@response.body)
+        assert_equal new_value, res['default_value']
+      end
     end
   end
 end

data/test/unit/services/inventory_creator_test.rb

@@ -5,7 +5,6 @@ require 'test_plugin_helper'
 module ForemanAnsible
   # Test how the inventory creator service transforms host params into
   # inventory variables and connection options
-  # rubocop:disable ClassLength
   class InventoryCreatorTest < ActiveSupport::TestCase
     setup do
       @host = FactoryBot.build(:host)
@@ -204,5 +203,4 @@ module ForemanAnsible
       assert_equal org.name, inventory['_meta']['hostvars'][host.name]['foreman']['organization']
     end
   end
-  # rubocop:enable ClassLength
 end

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js

@@ -89,6 +89,7 @@ class AnsibleRolesSwitcher extends React.Component {
             </div>
             <AssignedRolesList
               assignedRoles={assignedRoles}
+              allAssignedRoles={allAssignedRoles}
               pagination={assignedPagination}
               itemCount={assignedRolesCount}
               onPaginationChange={changeAssignedPage}

data/webpack/components/AnsibleRolesSwitcher/components/AssignedRolesList.js

@@ -8,13 +8,16 @@ import AnsibleRole from './AnsibleRole';
 
 const AssignedRolesList = ({
   assignedRoles,
+  allAssignedRoles,
   pagination,
   itemCount,
   onPaginationChange,
   onRemoveRole,
   resourceName,
 }) => {
-  const directlyAssignedRoles = assignedRoles.filter(role => !role.inherited);
+  const directlyAssignedRoles = allAssignedRoles.filter(
+    role => !role.inherited
+  );
 
   return (
     <div>
@@ -62,6 +65,7 @@ const AssignedRolesList = ({
 
 AssignedRolesList.propTypes = {
   assignedRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
+  allAssignedRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
   pagination: PropTypes.shape({
     page: PropTypes.number,
     perPage: PropTypes.number,

data/webpack/components/AnsibleRolesSwitcher/components/AssignedRolesList.test.js

@@ -6,7 +6,14 @@ const noop = () => {};
 
 const fixtures = {
   'should render': {
-    assignedRoles: [{ id: 1, name: 'fake.role' }, { id: 2, name: 'test.role' }],
+    allAssignedRoles: [
+      { id: 1, name: 'fake.role' },
+      { id: 2, name: 'test.role' },
+    ],
+    assignedRoles: [
+      { id: 1, name: 'fake.role' },
+      { id: 2, name: 'test.role' },
+    ],
     pagination: { page: 1, perPage: 25 },
     itemCount: 2,
     onPaginationChange: noop,

data/webpack/components/AnsibleRolesSwitcher/index.js

@@ -35,10 +35,7 @@ const mapDispatchToProps = dispatch =>
   bindActionCreators(AnsibleRolesSwitcherActions, dispatch);
 
 export default withProtectedView(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )(AnsibleRolesSwitcher),
+  connect(mapStateToProps, mapDispatchToProps)(AnsibleRolesSwitcher),
   AnsiblePermissionDenied,
   props => props.data && props.data.canView
 );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 4.0.3.5
+  version: 4.0.4
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -52,20 +52,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: foreman-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -73,9 +59,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,9 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +186,6 @@ files:
 - app/views/foreman_ansible/job_templates/ansible_roles_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_galaxy.erb
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_git.erb
-- app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/maintenance_plan.erb
 - app/views/foreman_ansible/job_templates/module_action_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/package_action_-_ansible_default.erb

data/app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb

@@ -1,29 +0,0 @@
-<%#
-name: Configure Cloud Connector
-snippet: false
-template_inputs:
-- name: satellite_user
-  required: true
-  input_type: user
-  advanced: false
-  value_type: plain
-  hidden_value: false
-- name: satellite_password
-  required: true
-  input_type: user
-  advanced: false
-  value_type: plain
-  hidden_value: true
-model: JobTemplate
-job_category: Ansible Playbook
-description_format: "%{template_name}"
-provider_type: Ansible
-kind: job_template
-%>
-
----
-- hosts: all
-  vars:
-    satellite_url: "<%= foreman_server_url %>"
-  roles:
-    - project-receptor.satellite_receptor_installer