foreman_puppet 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 551d9a6cf7153dfc0bb5a4709bbd394bc6d2ba5354b16531de6787653ca1d185
-  data.tar.gz: cacbf35dfb12c49175bd0ee95ea8cf4b441319c140b7401c5527b8231a9000f0
+  metadata.gz: 60ff3828222cc632f3ede70b60d3789bc68cd9565a501293ff037d16f089e875
+  data.tar.gz: 4446e0632671fe04ac826ae0c6ca1315ffe2dc4555acf252ee93c7a322b9f0fc
 SHA512:
-  metadata.gz: 6c28a424fb8afdb633134b1f57fa7254ead445a7a1e45d3b8bc97cbfc3ffd42a0dbb80df33ae2d7cc52d55cc12575078a773b3ed5ae3b9a360f9afb26d2631b8
-  data.tar.gz: d29c6598e1709bfddceb64e92fe16f33df55ce5eb85288e3f3ad14d590aa59d88515c37fd7116a252d889deb416bb652449c6fa6de3ef4baad5e27bfd9547bc8
+  metadata.gz: a8176437ecad24bbcbd707459114bedbadd20905ba031142cf9634aec2efe77adf6c790412b65162358c016df2999739c8b4b2f4d4c322d56673325ccf3aa65b
+  data.tar.gz: 723ab74a3fc1b20954e446018508bd61fd35ea04fce200049cb306f04ee6240289ec136d34b00a4873ec51e211781fdb93722baabf04bcf19b777a4f211a85af

data/app/controllers/concerns/foreman_puppet/extensions/hosts_controller_extensions.rb

@@ -3,7 +3,7 @@ module ForemanPuppet
     module HostsControllerExtensions
       extend ActiveSupport::Concern
 
-      PUPPETMASTER_ACTIONS = %i[externalNodes lookup].freeze
+      PUPPETMASTER_ACTIONS = %i[externalNodes].freeze
       PUPPET_AJAX_REQUESTS = %w[hostgroup_or_environment_selected puppetclass_parameters].freeze
 
       MULTIPLE_EDIT_ACTIONS = %w[select_multiple_environment update_multiple_environment

data/app/helpers/foreman_puppet/puppetclass_lookup_keys_helper.rb

@@ -9,7 +9,7 @@ module ForemanPuppet
     # ------ Host(group) Form Helpers -----
 
     def overridable_puppet_lookup_keys(klass, obj)
-      klass.class_params.override.where(environment_classes: { environment_id: obj.environment_id })
+      klass.class_params.override.where(environment_classes: { environment_id: obj.environment })
     end
 
     def hidden_puppet_lookup_value_fields(lookup_key, lookup_value, disabled)

data/app/services/foreman_puppet/host_info_providers/puppet_info.rb

@@ -45,7 +45,7 @@ module ForemanPuppet
       end
 
       def ca_defined?
-        SETTINGS[:unattended] && host.puppetca_exists?
+        host.puppetca_exists?
       end
 
       def has_environment?

data/app/views/hosts/_form_puppet_enc_tab.html.erb

@@ -11,13 +11,14 @@
   <% end %>
 
   <%= render 'foreman_puppet/puppetclasses/class_selection', obj: obj, resource_type: resource_type %>
+
+  <fieldset id="puppet_klasses_parameters" data-url="<%= foreman_puppet.url_for(controller: resource_type.to_s.pluralize.to_sym, action: :puppetclass_parameters, only_path: true) %>">
+    <h2><%= _('Puppet Class Parameters') %></h2>
+    <%= render 'foreman_puppet/puppetclasses/classes_parameters', obj: subject %>
+  </fieldset>
 <% else %>
   <%= alert(class: alert_class(:info),
             header: _('Notice'),
             text: _('Please select an environment first')) %>
 <% end %>
 
-<fieldset id="puppet_klasses_parameters" data-url="<%= foreman_puppet.url_for(controller: resource_type.to_s.pluralize.to_sym, action: :puppetclass_parameters, only_path: true) %>">
-  <h2><%= _('Puppet Class Parameters') %></h2>
-  <%= render 'foreman_puppet/puppetclasses/classes_parameters', obj: subject %>
-</fieldset>

data/db/migrate/20220201205305_migrate_host_class_permission.foreman_puppet.rb

@@ -0,0 +1,9 @@
+class MigrateHostClassPermission < ActiveRecord::Migration[6.0]
+  def up
+    Permission.where(resource_type: 'HostClass').update_all(resource_type: 'ForemanPuppet::HostClass')
+  end
+
+  def down
+    # no can do
+  end
+end

data/db/migrate/20220208135305_migrate_environment_ignore_type.foreman_puppet.rb

@@ -0,0 +1,15 @@
+class MigrateEnvironmentIgnoreType < ActiveRecord::Migration[6.0]
+  def up
+    taxonomies = Taxonomy.unscoped.where("ignore_types LIKE '%Environment%'")
+    environment_ids = ForemanPuppet::Environment.unscoped.pluck(:id)
+
+    taxonomies.each do |tax|
+      new_types = tax.ignore_types.reject { |type| type == 'Environment' }
+      tax.update_columns(ignore_types: new_types)
+      taxable_rows = environment_ids.map do |env_id|
+        { taxable_id: env_id, taxable_type: 'ForemanPuppet::Environment', taxonomy_id: tax.id }
+      end
+      TaxableTaxonomy.insert_all(taxable_rows) if taxable_rows.any?
+    end
+  end
+end

data/db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb

@@ -1,6 +1,8 @@
 class CreateHostgroupsPuppetclasses < ActiveRecord::Migration[6.0]
   def up
-    create_table :hostgroups_puppetclasses, id: false, if_not_exists: true do |t|
+    # this table is later renamed into hostgroup_classes and thus we don't want to create it if it exists under the later name
+    return if table_exists?(:hostgroups_puppetclasses) || table_exists?(:hostgroup_classes)
+    create_table :hostgroups_puppetclasses, id: false do |t|
       t.references :hostgroup, foreign_key: true, null: false
       t.references :puppetclass, foreign_key: true, null: false
     end

data/lib/foreman_puppet/register.rb

@@ -147,7 +147,8 @@ Foreman::Plugin.register :foreman_puppet do
     permission :import_puppetclasses, { 'foreman_puppet/puppetclasses' => %i[import_environments obsolete_and_new],
                                         'foreman_puppet/api/v2/environments' => [:import_puppetclasses] },
       resource_type: 'ForemanPuppet::Puppetclass'
-    permission :edit_classes, { 'foreman_puppet/api/v2/host_classes': %i[index create destroy] },
+    permission :edit_classes, { :host_editing => [:edit_classes],
+                                'foreman_puppet/api/v2/host_classes' => %i[index create destroy] },
       resource_type: 'ForemanPuppet::HostClass'
   end
 

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.2'.freeze
 end

data/test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb

@@ -79,12 +79,22 @@ module ForemanPuppet
 
           test 'should update with puppet class' do
             puppetclass = environment.puppetclasses.first
+            # uses the deprecated version of params passing without namespace, to test it works :)
             put :update, params: { id: host.id, host: { environment_id: environment.id, puppetclass_ids: [puppetclass.id] } }
             assert_response :success
             response = JSON.parse(@response.body)
             assert_equal environment.id, response['environment_id'], "Can't update host with environment #{environment}"
             assert_equal puppetclass.id, response['puppetclasses'][0]['id'], "Can't update host with puppetclass #{puppetclass}"
           end
+
+          test 'should remove puppetclass by passing empty array' do
+            host2 = FactoryBot.create(:host, :with_puppet_enc, :with_puppetclass)
+
+            put :update, params: { id: host2.id, host: { puppet_attributes: { puppetclass_ids: [] } } }
+            assert_response :success
+            response = JSON.parse(@response.body)
+            assert_empty(response['puppetclasses'], 'Can not remove puppetclasses')
+          end
         end
 
         describe '#enc' do

data/test/controllers/foreman_puppet/hosts_controller_test.rb

@@ -201,7 +201,6 @@ module ForemanPuppet
       test 'hosts with a registered smart proxy on should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['else.where'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
@@ -211,7 +210,6 @@ module ForemanPuppet
       test 'hosts without a registered smart proxy on should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['another.host'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
@@ -221,7 +219,6 @@ module ForemanPuppet
       test 'hosts with a registered smart proxy and SSL cert should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=else.where'
@@ -234,7 +231,6 @@ module ForemanPuppet
       test 'hosts in trusted hosts list and SSL cert should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['else.where']
 
         @request.env['HTTPS'] = 'on'
@@ -248,7 +244,6 @@ module ForemanPuppet
       test 'hosts with comma-separated SSL DN should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['foreman.example']
 
         @request.env['HTTPS'] = 'on'
@@ -262,7 +257,6 @@ module ForemanPuppet
       test 'hosts with slash-separated SSL DN should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['foreman.linux.lab.local']
 
         @request.env['HTTPS'] = 'on'
@@ -276,53 +270,37 @@ module ForemanPuppet
       test 'hosts without a registered smart proxy but with an SSL cert should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=another.host'
         @request.env['SSL_CLIENT_VERIFY'] = 'SUCCESS'
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
+        assert_response :forbidden
       end
 
       test 'hosts with an unverified SSL cert should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=else.where'
         @request.env['SSL_CLIENT_VERIFY'] = 'FAILURE'
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
+        assert_response :forbidden
       end
 
-      test 'when "require_ssl_smart_proxies" and "require_ssl" are true, HTTP requests should not be able to get externalNodes' do
+      test 'when "require_ssl" is true, HTTP requests should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = true
 
         Resolv.any_instance.stubs(:getnames).returns(['else.where'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
-      end
-
-      test 'when "require_ssl_smart_proxies" is true and "require_ssl" is false, HTTP requests should be able to get externalNodes' do
-        User.current = nil
-        # since require_ssl_smart_proxies is only applicable to HTTPS connections, both should be set
-        Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
-        SETTINGS[:require_ssl] = false
-
-        Resolv.any_instance.stubs(:getnames).returns(['else.where'])
-        get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_response :success
+        assert_response :redirect
       end
 
       test 'authenticated users over HTTP should be able to get externalNodes' do
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['users.host'])
@@ -332,7 +310,6 @@ module ForemanPuppet
 
       test 'authenticated users over HTTPS should be able to get externalNodes' do
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['users.host'])

data/test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb

@@ -0,0 +1,34 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class PuppetclassLookupKeysHelperTest < ActionView::TestCase
+    include PuppetclassLookupKeysHelper
+
+    describe '#overridable_puppet_lookup_keys' do
+      let(:parent_puppet_var) { FactoryBot.create(:puppetclass_lookup_key) }
+      let(:parent_hg) { FactoryBot.create(:hostgroup, :with_puppet_enc, environment: parent_puppet_var.environments.first) }
+
+      context 'with new hostgroup' do
+        subject do
+          hg = Hostgroup.new(parent: parent_hg)
+          hg.build_puppet
+          hg
+        end
+
+        it 'returns inherited parameter' do
+          keys = overridable_puppet_lookup_keys(parent_puppet_var.param_classes.first, subject)
+          _(keys).must_include(parent_puppet_var)
+        end
+      end
+
+      context 'with new host' do
+        subject { Host.new(hostgroup: parent_hg) }
+
+        it 'returns inherited parameter' do
+          keys = overridable_puppet_lookup_keys(parent_puppet_var.param_classes.first, subject)
+          _(keys).must_include(parent_puppet_var)
+        end
+      end
+    end
+  end
+end

data/test/integration/foreman_puppet/host_js_test.rb

@@ -60,7 +60,8 @@ module ForemanPuppet
 
         close_interfaces_modal
 
-        click_on_submit
+        click_button('Submit')
+        find('h5', text: /myhost1*/)
 
         host = Host::Managed.search_for('name ~ "myhost1"').first
         assert_equal env2.name, host.puppet.environment.name
@@ -94,8 +95,8 @@ module ForemanPuppet
         fill_in 'host_interfaces_attributes_0_mac', with: '00:11:11:11:11:11'
         fill_in 'host_interfaces_attributes_0_ip', with: '1.1.1.1'
         close_interfaces_modal
-        click_on_submit
-        find('#host-show') # wait for host details page
+        click_button('Submit')
+        find('h5', text: /myhost1*/) # wait for host details page
 
         host = Host::Managed.search_for('name ~ "myhost1"').first
         assert_equal env.name, host.puppet.environment.name
@@ -111,8 +112,9 @@ module ForemanPuppet
         visit edit_host_path(host)
 
         select2 env1.name, from: 'host_puppet_attributes_environment_id'
-        click_on_submit
-        assert_current_path(host_path(host), ignore_query: true)
+        click_button('Submit')
+        find('h5', text: /#{host.name}/)
+        assert_current_path(host_details_page_path(host), ignore_query: true)
 
         host.reload
         assert_equal env1.name, host.puppet.environment.name
@@ -201,7 +203,8 @@ module ForemanPuppet
           assert puppetclass_params.has_selector?("a[data-tag='override']", visible: :hidden)
           assert_equal('false', find("#s2id_host_lookup_values_attributes_#{lookup_key.id}_value .select2-chosen").text)
           select2 'true', from: "host_lookup_values_attributes_#{lookup_key.id}_value"
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
@@ -217,7 +220,8 @@ module ForemanPuppet
           assert puppetclass_params.find('textarea:enabled')
           puppetclass_params.find("a[data-tag='remove']").click
           assert puppetclass_params.find('textarea:disabled')
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
@@ -226,7 +230,8 @@ module ForemanPuppet
           puppetclass_params.find("a[data-tag='override']").click
           expect(puppetclass_params).must_have_selector('textarea:enabled')
           puppetclass_params.find('textarea').set('userCustom')
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
@@ -271,7 +276,7 @@ module ForemanPuppet
             switch_form_tab('Puppet ENC')
             assert puppetclass_params.find('textarea').disabled?
             click_button('Submit')
-            assert page.has_link?('Edit')
+            find('h5', text: /#{host.name}/)
           end
         end
 

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -53,6 +53,17 @@ module ForemanPuppet
       end
     end
 
+    describe '#puppetclass_ids=' do
+      test 'allows empting classes' do
+        host = FactoryBot.create(:host, :with_puppet_enc,
+          environment: environment,
+          puppetclasses: [puppetclass_both])
+        host.attributes = { puppet_attributes: { puppetclass_ids: [] } }
+        assert host.save, 'Host could not be saved after updating puppetclasses'
+        assert_empty host.reload.all_puppetclasses, 'Puppetclasses were not removed successfuly'
+      end
+    end
+
     describe '#all_puppetclasses' do
       test 'should return all classes for environment only' do
         host = FactoryBot.create(:host, :with_puppet_enc,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -188,6 +188,8 @@ files:
 - db/migrate/20210924103241_remove_katello_id_from_environments.foreman_puppet.rb
 - db/migrate/20211111125003_drop_puppetclasses_direct_references.foreman_puppet.rb
 - db/migrate/20211112130803_cleanup_environment_from_core_tables.foreman_puppet.rb
+- db/migrate/20220201205305_migrate_host_class_permission.foreman_puppet.rb
+- db/migrate/20220208135305_migrate_environment_ignore_type.foreman_puppet.rb
 - db/migrate_foreman/20090722141107_create_environments.foreman_puppet.rb
 - db/migrate_foreman/20090802062223_create_puppetclasses.foreman_puppet.rb
 - db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb
@@ -292,6 +294,7 @@ files:
 - test/graphql/queries/puppetclass_query_test.rb
 - test/graphql/queries/puppetclasses_query_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
+- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
 - test/integration/foreman_puppet/dashboard_js_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
@@ -364,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Add Puppet features to Foreman
@@ -389,6 +392,7 @@ test_files:
 - test/graphql/queries/hostgroup_puppet_query_test.rb
 - test/graphql/queries/environments_query_test.rb
 - test/integration_puppet_helper.rb
+- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
 - test/models/foreman_puppet/config_group_class_test.rb