foreman_puppet 1.0.4 → 2.0.2

data/test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb

@@ -9,49 +9,88 @@ module ForemanPuppet
     include HostsAndHostgroupsHelper
 
     describe 'puppet environment field' do
+      let(:fields) { mock('fields_for') }
+      let(:f) { mock('form_for') }
+      let(:object) { mock('object') }
+      let(:puppet_facet) { mock('puppet') }
+
       setup do
-        @host = mock('host')
-        puppet = mock('puppet')
-        @host.stubs(:hostgroup)
-        @host.stubs(:puppet).returns(puppet)
-        @host.stubs(:id).returns(999)
-        @f = mock('f')
-        @f.stubs(:object).returns(@host)
-        @fields = mock('fields')
-        @fields.stubs(:object).returns(puppet)
-        @f.stubs(:fields_for).yields(@fields)
+        f.stubs(:object).returns(object)
+        f.stubs(:fields_for).yields(fields)
+        fields.stubs(:object).returns(puppet_facet)
       end
 
-      test 'it adds new first level attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          select_options, html_options = extract_collection_options(attrs)
-          select_options[:test_select_option] == 'test_value1' &&
-            html_options[:test_html_option] == 'test_value2'
+      describe '#host_puppet_environment_field' do
+        let(:object) do
+          host = mock('host')
+          host.stubs(:hostgroup)
+          host.stubs(:puppet).returns(puppet_facet)
+          host.stubs(:id).returns(999)
+          host
         end
 
-        host_puppet_environment_field(@f, { test_select_option: 'test_value1' }, { test_html_option: 'test_value2' })
-      end
+        test 'it adds new first level attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            select_options, html_options = extract_collection_options(attrs)
+            select_options[:test_select_option] == 'test_value1' &&
+              html_options[:test_html_option] == 'test_value2'
+          end
 
-      test 'it adds new data attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          select_options, html_options = extract_collection_options(attrs)
-          select_options[:test_select_option] == 'test_value1' &&
-            html_options[:data][:test] == 'test_value2'
+          host_puppet_environment_field(f, { test_select_option: 'test_value1' }, { test_html_option: 'test_value2' })
         end
 
-        host_puppet_environment_field(@f, { test_select_option: 'test_value1' }, { data: { test: 'test_value2' } })
+        test 'it adds new data attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            select_options, html_options = extract_collection_options(attrs)
+            select_options[:test_select_option] == 'test_value1' &&
+              html_options[:data][:test] == 'test_value2'
+          end
+
+          host_puppet_environment_field(f, { test_select_option: 'test_value1' }, { data: { test: 'test_value2' } })
+        end
+
+        test 'it overrides existing attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            html_options = attrs.pop
+            html_options[:data][:test] == 'some_test_value' &&
+              html_options[:data][:url] == '/test/url'
+          end.returns('')
+
+          html = host_puppet_environment_field(f, { disable_button: false }, { data: { url: '/test/url', test: 'some_test_value' } })
+
+          assert_no_match(/btn/, html)
+        end
       end
 
-      test 'it overrides existing attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          html_options = attrs.pop
-          html_options[:data][:test] == 'some_test_value' &&
-            html_options[:data][:url] == '/test/url'
-        end.returns('')
+      describe '#hostgroup_puppet_environment_field' do
+        let(:object) { FactoryBot.build_stubbed(:hostgroup, parent: parent_hg) }
+        let(:puppet_facet) { object.puppet || object.build_puppet }
+
+        context 'parent without puppet' do
+          let(:parent_hg) { FactoryBot.create(:hostgroup) }
 
-        html = host_puppet_environment_field(@f, { disable_button: false }, { data: { url: '/test/url', test: 'some_test_value' } })
+          it 'shows Inherit option with no value' do
+            fields.expects(:collection_select).with do |*attrs|
+              options = attrs.second
+              options.first.to_label == 'Inherit parent (no value)'
+            end.returns('')
+
+            hostgroup_puppet_environment_field(f)
+          end
+        end
 
-        assert_no_match(/btn/, html)
+        context 'parent with puppet' do
+          let(:parent_hg) { FactoryBot.create(:hostgroup, :with_puppet_enc) }
+
+          it 'shows Inherit option with no value' do
+            fields.expects(:collection_select).with do |*attrs|
+              options = attrs.second
+              options.first.to_label == "Inherit parent (#{parent_hg.puppet.environment.name})"
+            end.returns('')
+
+            hostgroup_puppet_environment_field(f)
+          end
+        end
       end
     end
 

data/test/integration/foreman_puppet/dashboard_js_test.rb

@@ -0,0 +1,31 @@
+require 'test_puppet_helper'
+require 'integration_test_helper'
+require 'integration/shared/host_finders'
+require 'integration/shared/host_orchestration_stubs'
+
+module ForemanPuppet
+  class DashboardJSTest < IntegrationTestWithJavascript
+    setup do
+      Dashboard::Manager.reset_user_to_default(users(:admin))
+      Setting[:outofsync_interval] = 35
+    end
+
+    context 'with origin' do
+      setup do
+        Setting[:puppet_out_of_sync_disabled] = true
+      end
+
+      context 'out of sync disabled' do
+        test 'has no out of sync link' do
+          visit dashboard_path
+          wait_for_ajax
+          within "li[data-name='Host Configuration Status for Puppet']" do
+            assert page.has_no_link?('Out of sync hosts')
+            assert page.has_no_link?('Good host reports in the last')
+            assert page.has_link?('Good host with reports')
+          end
+        end
+      end
+    end
+  end
+end

data/test/integration/foreman_puppet/host_js_test.rb

@@ -362,7 +362,6 @@ module ForemanPuppet
       page.find('#puppet_klasses_parameters_table')
     end
 
-    # TODO: unless ForemanPuppet.extracted_from_core?
     def switch_form_tab_to_interfaces
       switch_form_tab('Interfaces')
       disable_interface_modal_animation

data/test/integration/foreman_puppet/puppetclass_js_test.rb

@@ -11,7 +11,7 @@ module ForemanPuppet
     let(:puppetclass) { FactoryBot.create(:puppetclass, environments: [environment]) }
 
     test 'edit page' do
-      FactoryBot.create(:puppetclass, name: 'vim', environments: [environment]) if ForemanPuppet.extracted_from_core?
+      FactoryBot.create(:puppetclass, name: 'vim', environments: [environment])
       visit puppetclasses_path
       click_link 'vim'
       assert page.has_no_link? 'Common'

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -107,7 +107,13 @@ module ForemanPuppet
       test 'should return empty array if host has no hostgroup' do
         host = FactoryBot.create(:host, :with_puppet_enc)
         assert_not host.hostgroup
-        assert_empty host.puppet.parent_config_groups
+        assert_equal [], host.puppet.parent_config_groups
+      end
+
+      test 'should return empty array if hostgroup do not have puppet data' do
+        hostgroup = FactoryBot.create(:hostgroup)
+        host = FactoryBot.create(:host, :with_puppet_enc, hostgroup: hostgroup)
+        assert_equal [], host.puppet.parent_config_groups
       end
     end
 

data/test/models/foreman_puppet/host_test.rb

@@ -150,6 +150,32 @@ module ForemanPuppet
       end
     end
 
+    describe '#available_template_kinds' do
+      let(:template_kinds) { [stub(name: 'iPXE'), stub(name: 'finish')] }
+
+      test 'calls find_template with Puppet environment' do
+        host = FactoryBot.create(:host, :with_hostgroup, :with_puppet_enc)
+        host.expects(:template_kinds).returns(template_kinds)
+        template_kinds.each do |kind|
+          ::ProvisioningTemplate.expects(:find_template)
+                                .with(kind: kind.name, operatingsystem_id: host.operatingsystem.id, hostgroup_id: host.hostgroup.id, environment_id: host.puppet.environment.id)
+                                .returns(stub(name: "default #{kind.name}"))
+        end
+        assert_equal template_kinds.map { |k| "default #{k.name}" }, host.available_template_kinds.map(&:name)
+      end
+
+      test 'calls find_template without Puppet environment' do
+        host = FactoryBot.create(:host, :with_hostgroup)
+        host.expects(:template_kinds).returns(template_kinds)
+        template_kinds.each do |kind|
+          ::ProvisioningTemplate.expects(:find_template)
+                                .with(kind: kind.name, operatingsystem_id: host.operatingsystem.id, hostgroup_id: host.hostgroup.id, environment_id: nil)
+                                .returns(stub(name: "default #{kind.name}"))
+        end
+        assert_equal template_kinds.map { |k| "default #{k.name}" }, host.available_template_kinds.map(&:name)
+      end
+    end
+
     test 'should import from external nodes output' do
       # create a dummy node
       Parameter.destroy_all

data/test/models/foreman_puppet/user_test.rb

@@ -5,11 +5,7 @@ module ForemanPuppet
     describe '#visible_environments' do
       let(:environment) { FactoryBot.create(:environment) }
       let(:untaxed_env) { FactoryBot.create(:environment, organizations: [], locations: []) }
-      let(:env_names) do
-        env_names = [environment.name, untaxed_env.name]
-        env_names += %w[production global_puppetmaster testing] unless ForemanPuppet.extracted_from_core?
-        env_names
-      end
+      let(:env_names) { [environment.name, untaxed_env.name] }
 
       setup do
         environment

data/test/unit/foreman_puppet/puppet_class_importer_test.rb

@@ -3,7 +3,7 @@ require 'test_puppet_helper'
 module ForemanPuppet
   class PuppetClassImporterTest < ActiveSupport::TestCase
     def setup
-      FactoryBot.create(:environment, name: 'production') if ForemanPuppet.extracted_from_core?
+      FactoryBot.create(:environment, name: 'production')
       ProxyAPI::Puppet.any_instance.stubs(:environments).returns(%w[foreman-testing foreman-testing-1])
       ProxyAPI::Puppet.any_instance.stubs(:classes).returns(mocked_classes)
       User.current = users(:admin)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.2
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,9 +9,9 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies: []
-description: Allow assigning Puppet environmets and classes to the Foreman Hosts.
+description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
 - foreman-dev@googlegroups.com
 executables: []
@@ -22,10 +22,10 @@ files:
 - README.md
 - Rakefile
 - app/assets/stylesheets/foreman_puppet.scss
-- app/controllers/concerns/foreman_puppet/api/import_puppetclasses_common_controller.rb
 - app/controllers/concerns/foreman_puppet/environments_import.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_base_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_hostgroups_controller.rb
+- app/controllers/concerns/foreman_puppet/extensions/api_smart_proxies_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_template_combinations_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_v2_hosts_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/hostgroups_controller_extensions.rb
@@ -113,9 +113,11 @@ files:
 - app/views/foreman_puppet/api/v2/environments/show.json.rabl
 - app/views/foreman_puppet/api/v2/environments/update.json.rabl
 - app/views/foreman_puppet/api/v2/host_puppet_facets/base.json.rabl
+- app/views/foreman_puppet/api/v2/host_puppet_facets/host_list.json.rabl
 - app/views/foreman_puppet/api/v2/host_puppet_facets/host_single.json.rabl
 - app/views/foreman_puppet/api/v2/host_puppet_facets/show.json.rabl
 - app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/base.json.rabl
+- app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_list.json.rabl
 - app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_single.json.rabl
 - app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/show.json.rabl
 - app/views/foreman_puppet/api/v2/import_puppetclasses/index.json.rabl
@@ -183,16 +185,26 @@ files:
 - db/migrate/20200803113803_migrate_environment_to_puppet_facet.foreman_puppet.rb
 - db/migrate/20200803113903_migrate_host_type_in_host_config_groups.foreman_puppet.rb
 - db/migrate/20201125113903_migrate_puppetclasses_to_facets.foreman_puppet.rb
-- db/migrate_foreman/20090722141107_create_environments.rb
-- db/migrate_foreman/20120905095532_create_environment_classes.rb
-- db/migrate_foreman/20140407161817_create_config_groups.rb
-- db/migrate_foreman/20140407162007_create_config_group_classes.rb
-- db/migrate_foreman/20140407162059_create_host_config_groups.rb
-- db/migrate_foreman/20161205142618_delete_orphaned_smart_class_parameters.rb
-- db/migrate_foreman/20170109115157_fix_lookup_key_auditable_type.rb
-- db/migrate_foreman/20180816134832_cast_lookup_key_values.rb
-- db/migrate_foreman/20181023112532_add_environment_puppetclass_id.rb
-- db/migrate_foreman/20181224174419_add_index_to_environment_class_by_lookup_key_and_puppetclass.rb
+- 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_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
+- db/migrate_foreman/20110412103238_remove_unused_fields_from_puppet_classes.foreman_puppet.rb
+- db/migrate_foreman/20110712070522_create_host_class.foreman_puppet.rb
+- db/migrate_foreman/20120824142048_add_some_indexes.foreman_puppet.rb
+- db/migrate_foreman/20120905095532_create_environment_classes.foreman_puppet.rb
+- db/migrate_foreman/20121018152459_create_hostgroup_classes.foreman_puppet.rb
+- db/migrate_foreman/20140407161817_create_config_groups.foreman_puppet.rb
+- db/migrate_foreman/20140407162007_create_config_group_classes.foreman_puppet.rb
+- db/migrate_foreman/20140407162059_create_host_config_groups.foreman_puppet.rb
+- db/migrate_foreman/20161205142618_delete_orphaned_smart_class_parameters.foreman_puppet.rb
+- db/migrate_foreman/20170109115157_fix_lookup_key_auditable_type.foreman_puppet.rb
+- db/migrate_foreman/20180816134832_cast_lookup_key_values.foreman_puppet.rb
+- db/migrate_foreman/20180831115634_add_uniqueness_to_puppetclass_name.foreman_puppet.rb
+- db/migrate_foreman/20181023112532_add_environment_puppetclass_id.foreman_puppet.rb
+- db/migrate_foreman/20181224174419_add_index_to_environment_class_by_lookup_key_and_puppetclass.foreman_puppet.rb
 - db/seeds.d/111_puppet_proxy_feature.rb
 - lib/foreman_puppet.rb
 - lib/foreman_puppet/engine.rb
@@ -201,14 +213,50 @@ files:
 - lib/tasks/foreman_puppet_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/ca/LC_MESSAGES/foreman_puppet.mo
+- locale/ca/foreman_puppet.po
+- locale/cs_CZ/LC_MESSAGES/foreman_puppet.mo
+- locale/cs_CZ/foreman_puppet.edit.po
+- locale/cs_CZ/foreman_puppet.po
+- locale/cs_CZ/foreman_puppet.po.time_stamp
+- locale/de/LC_MESSAGES/foreman_puppet.mo
+- locale/de/foreman_puppet.po
 - locale/en/LC_MESSAGES/foreman_puppet.mo
 - locale/en/foreman_puppet.edit.po
 - locale/en/foreman_puppet.po
 - locale/en/foreman_puppet.po.time_stamp
 - locale/en/foreman_puppet.pox
+- locale/en_GB/LC_MESSAGES/foreman_puppet.mo
+- locale/en_GB/foreman_puppet.po
+- locale/es/LC_MESSAGES/foreman_puppet.mo
+- locale/es/foreman_puppet.po
 - locale/foreman_puppet.pot
+- locale/fr/LC_MESSAGES/foreman_puppet.mo
+- locale/fr/foreman_puppet.po
 - locale/gemspec.rb
+- locale/gl/LC_MESSAGES/foreman_puppet.mo
+- locale/gl/foreman_puppet.po
+- locale/it/LC_MESSAGES/foreman_puppet.mo
+- locale/it/foreman_puppet.po
+- locale/ja/LC_MESSAGES/foreman_puppet.mo
+- locale/ja/foreman_puppet.po
+- locale/ko/LC_MESSAGES/foreman_puppet.mo
+- locale/ko/foreman_puppet.po
 - locale/messages.mo
+- locale/nl_NL/LC_MESSAGES/foreman_puppet.mo
+- locale/nl_NL/foreman_puppet.po
+- locale/pl/LC_MESSAGES/foreman_puppet.mo
+- locale/pl/foreman_puppet.po
+- locale/pt_BR/LC_MESSAGES/foreman_puppet.mo
+- locale/pt_BR/foreman_puppet.po
+- locale/ru/LC_MESSAGES/foreman_puppet.mo
+- locale/ru/foreman_puppet.po
+- locale/sv_SE/LC_MESSAGES/foreman_puppet.mo
+- locale/sv_SE/foreman_puppet.po
+- locale/zh_CN/LC_MESSAGES/foreman_puppet.mo
+- locale/zh_CN/foreman_puppet.po
+- locale/zh_TW/LC_MESSAGES/foreman_puppet.mo
+- locale/zh_TW/foreman_puppet.po
 - package.json
 - test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
@@ -221,6 +269,7 @@ files:
 - test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
 - test/controllers/foreman_puppet/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/environments_controller_test.rb
@@ -244,6 +293,7 @@ files:
 - test/graphql/queries/puppetclasses_query_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_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
 - test/integration/foreman_puppet/host_js_test.rb
 - test/integration/foreman_puppet/hostgroup_js_test.rb
@@ -316,7 +366,7 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: Adds puppet ENC features
+summary: Add Puppet features to Foreman
 test_files:
 - test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb
 - test/services/foreman_puppet/host_info_providers/puppet_info_test.rb
@@ -326,6 +376,7 @@ test_files:
 - test/integration/foreman_puppet/puppetclass_js_test.rb
 - test/integration/foreman_puppet/hostgroup_js_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
+- test/integration/foreman_puppet/dashboard_js_test.rb
 - test/integration/foreman_puppet/host_js_test.rb
 - test/graphql/mutations/hosts/create_mutation_test.rb
 - test/graphql/queries/puppetclasses_query_test.rb
@@ -376,6 +427,7 @@ test_files:
 - test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
 - test/controllers/foreman_puppet/puppetclasses_controller_test.rb

data/db/migrate_foreman/20180816134832_cast_lookup_key_values.rb

@@ -1,35 +0,0 @@
-class CastLookupKeyValues < ActiveRecord::Migration[5.1]
-  def up
-    # Different LookupKey types handle casting a bit differently
-    PuppetclassLookupKey.unscoped.preload(:lookup_values).where(override: true).where.not(key_type: 'string').find_each do |key|
-      cast_key_and_values(key)
-    end
-  end
-
-  private
-
-  def cast_key_and_values(key)
-    fix_value(key, :default_value)
-    key.lookup_values.each do |lv|
-      fix_value(lv, :value)
-    end
-  end
-
-  def safemode_box
-    @safemode_box ||= Safemode::Box.new
-  end
-
-  def fix_value(obj, attribute)
-    return if obj.omit && !obj.try(:merge_default)
-    value = obj.send(attribute)
-    return unless value.is_a? String
-    return if value.contains_erb?
-    fixed = safemode_box.eval(value)
-    obj.update_column(attribute, fixed)
-  rescue StandardError => e
-    say "Failed to cast #{attribute} for #{obj.inspect}:"
-    say "Value: #{value}", subitem: true
-    say "Error: #{e.message}", subitem: true
-    say 'Perhaps it is invalid? Casting skipped, manual action may be needed.', subitem: true
-  end
-end