foreman_puppet 6.2.0 → 7.0.0

data/locale/ru/foreman_puppet.po

@@ -118,6 +118,9 @@ msgstr "Изменить окружение"
 msgid "Change Puppet Master"
 msgstr "Изменить мастер-сервер Puppet"
 
+msgid "Changed"
+msgstr ""
+
 msgid "Changed environments"
 msgstr "Изменение окружений"
 
@@ -157,6 +160,9 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
+msgid "Corrective Change"
+msgstr ""
+
 msgid "Couldn't find any ENC data for this host"
 msgstr ""
 
@@ -271,12 +277,18 @@ msgstr ""
 msgid "Facts"
 msgstr "Факты"
 
+msgid "Failed"
+msgstr ""
+
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr "Не удалось импортировать %{klass} для %{name}: не найден в нашей базе данных. Игнорируется..."
 
 msgid "Failed to set %{proxy_type} proxy for %{host}."
 msgstr "Не удалось настроить %{proxy_type} в качестве прокси для %{host}."
 
+msgid "Failed to start"
+msgstr ""
+
 msgid "Failed to update environments and Puppet classes from the on-disk Puppet installation: %s"
 msgstr "Не удалось обновить окружения и классы Puppet в соответствии с дисковой установкой Puppet: %s"
 
@@ -418,6 +430,9 @@ msgstr ""
 msgid "Invalid proxy selected!"
 msgstr "Выбран неверный прокси."
 
+msgid "Last configuration status"
+msgstr ""
+
 msgid "List all Puppet class IDs for host"
 msgstr "Список всех кодов классов Puppet для узла"
 
@@ -493,12 +508,18 @@ msgstr "Слить все совпадающие значения (только
 msgid "Name"
 msgstr "Имя"
 
+msgid "Never"
+msgstr ""
+
 msgid "New"
 msgstr "Новое"
 
 msgid "No changes to your environments detected"
 msgstr "Нет изменений в окружениях"
 
+msgid "No configuration status available"
+msgstr ""
+
 msgid "No environment selected!"
 msgstr "Окружение не выбрано."
 
@@ -562,6 +583,9 @@ msgstr "Организации"
 msgid "Original value info"
 msgstr "Сведения об исходном значении"
 
+msgid "Out of sync"
+msgstr ""
+
 msgid "Overridden"
 msgstr ""
 
@@ -646,6 +670,9 @@ msgstr "Описание внешних узлов Puppet в формате YAML
 msgid "Puppet interval"
 msgstr "Интервал Puppet"
 
+msgid "Puppet metrics"
+msgstr ""
+
 msgid "Puppet parameter"
 msgstr "Параметр Puppet"
 
@@ -682,6 +709,12 @@ msgstr "Отчеты"
 msgid "Required parameter without value.<br/><b>Please override!</b><br/>"
 msgstr "Обязательный параметр без значения.<br/><b>Необходимо переопределить.</b><br/>"
 
+msgid "Restarted"
+msgstr ""
+
+msgid "Scheduled"
+msgstr ""
+
 msgid "Select environment"
 msgstr "Выберите окружение"
 
@@ -718,6 +751,9 @@ msgstr "Показать значение переопределения для
 msgid "Show template combination"
 msgstr "Показать комбинацию шаблонов"
 
+msgid "Skipped"
+msgstr ""
+
 msgid "Smart Class Parameter"
 msgstr "Смарт-параметры"
 

data/locale/sv_SE/foreman_puppet.po

@@ -113,6 +113,9 @@ msgstr "Byt Miljö"
 msgid "Change Puppet Master"
 msgstr ""
 
+msgid "Changed"
+msgstr ""
+
 msgid "Changed environments"
 msgstr "Ändrade miljöer"
 
@@ -152,6 +155,9 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
+msgid "Corrective Change"
+msgstr ""
+
 msgid "Couldn't find any ENC data for this host"
 msgstr ""
 
@@ -266,12 +272,18 @@ msgstr ""
 msgid "Facts"
 msgstr "Fakta"
 
+msgid "Failed"
+msgstr ""
+
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr "Misslyckades med att importera %{klass} på grund av att %{name}: inte existerar i vår databas - ignorerar"
 
 msgid "Failed to set %{proxy_type} proxy for %{host}."
 msgstr ""
 
+msgid "Failed to start"
+msgstr ""
+
 msgid "Failed to update environments and Puppet classes from the on-disk Puppet installation: %s"
 msgstr ""
 
@@ -413,6 +425,9 @@ msgstr ""
 msgid "Invalid proxy selected!"
 msgstr ""
 
+msgid "Last configuration status"
+msgstr ""
+
 msgid "List all Puppet class IDs for host"
 msgstr ""
 
@@ -488,12 +503,18 @@ msgstr ""
 msgid "Name"
 msgstr "Namn"
 
+msgid "Never"
+msgstr ""
+
 msgid "New"
 msgstr "Ny"
 
 msgid "No changes to your environments detected"
 msgstr ""
 
+msgid "No configuration status available"
+msgstr ""
+
 msgid "No environment selected!"
 msgstr "Ingen miljö vald!"
 
@@ -557,6 +578,9 @@ msgstr "Organisationer"
 msgid "Original value info"
 msgstr ""
 
+msgid "Out of sync"
+msgstr ""
+
 msgid "Overridden"
 msgstr ""
 
@@ -641,6 +665,9 @@ msgstr "Puppet externa noder YAML-export"
 msgid "Puppet interval"
 msgstr ""
 
+msgid "Puppet metrics"
+msgstr ""
+
 msgid "Puppet parameter"
 msgstr ""
 
@@ -677,6 +704,12 @@ msgstr "Rapporter"
 msgid "Required parameter without value.<br/><b>Please override!</b><br/>"
 msgstr ""
 
+msgid "Restarted"
+msgstr ""
+
+msgid "Scheduled"
+msgstr ""
+
 msgid "Select environment"
 msgstr "Välj miljö"
 
@@ -713,6 +746,9 @@ msgstr ""
 msgid "Show template combination"
 msgstr ""
 
+msgid "Skipped"
+msgstr ""
+
 msgid "Smart Class Parameter"
 msgstr "Smart Klassparameter"
 

data/locale/zh_CN/foreman_puppet.po

@@ -117,6 +117,9 @@ msgstr "改变环境"
 msgid "Change Puppet Master"
 msgstr "更改 Puppet 主服务器"
 
+msgid "Changed"
+msgstr ""
+
 msgid "Changed environments"
 msgstr "修改的环境"
 
@@ -156,6 +159,9 @@ msgstr "配置管理"
 msgid "Copy to clipboard"
 msgstr ""
 
+msgid "Corrective Change"
+msgstr ""
+
 msgid "Couldn't find any ENC data for this host"
 msgstr "无法找到此主机的任何 ENC 数据"
 
@@ -270,12 +276,18 @@ msgstr "错误！"
 msgid "Facts"
 msgstr "Facts"
 
+msgid "Failed"
+msgstr ""
+
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr "为 %{name} 导入 %{klass} 失败：不存在于我们的数据库中 -- 忽略"
 
 msgid "Failed to set %{proxy_type} proxy for %{host}."
 msgstr "无法为 %{host} 设置 {proxy_type} 代理服务器。"
 
+msgid "Failed to start"
+msgstr ""
+
 msgid "Failed to update environments and Puppet classes from the on-disk Puppet installation: %s"
 msgstr "无法使用磁盘 Puppet 安装更新环境及 Puppet 类别：%s"
 
@@ -417,6 +429,9 @@ msgstr "从 %s 继承的类"
 msgid "Invalid proxy selected!"
 msgstr "所选代理服务器无效！"
 
+msgid "Last configuration status"
+msgstr ""
+
 msgid "List all Puppet class IDs for host"
 msgstr "列出主机的所有 Puppet 类 ID"
 
@@ -492,12 +507,18 @@ msgstr "合并所有匹配的值（仅用于阵列/哈希类型）"
 msgid "Name"
 msgstr "名称"
 
+msgid "Never"
+msgstr ""
+
 msgid "New"
 msgstr "新"
 
 msgid "No changes to your environments detected"
 msgstr "未探测到您的环境有任何变化"
 
+msgid "No configuration status available"
+msgstr ""
+
 msgid "No environment selected!"
 msgstr "没有选择环境！"
 
@@ -561,6 +582,9 @@ msgstr "机构"
 msgid "Original value info"
 msgstr "原始值信息"
 
+msgid "Out of sync"
+msgstr ""
+
 msgid "Overridden"
 msgstr "覆盖"
 
@@ -645,6 +669,9 @@ msgstr "Puppet 外部节点 YAML 转储"
 msgid "Puppet interval"
 msgstr "Puppet 间隔"
 
+msgid "Puppet metrics"
+msgstr ""
+
 msgid "Puppet parameter"
 msgstr "Puppet 参数"
 
@@ -681,6 +708,12 @@ msgstr "报表"
 msgid "Required parameter without value.<br/><b>Please override!</b><br/>"
 msgstr "需要的参数没有值。<br/><b>请覆盖</b><br/>"
 
+msgid "Restarted"
+msgstr ""
+
+msgid "Scheduled"
+msgstr ""
+
 msgid "Select environment"
 msgstr "选择环境"
 
@@ -717,6 +750,9 @@ msgstr "显示具体智能类别参数的替代值"
 msgid "Show template combination"
 msgstr "显示模板组合"
 
+msgid "Skipped"
+msgstr ""
+
 msgid "Smart Class Parameter"
 msgstr "智能代理参数"
 

data/locale/zh_TW/foreman_puppet.po

@@ -112,6 +112,9 @@ msgstr "更改環境"
 msgid "Change Puppet Master"
 msgstr "改變 Puppet Master"
 
+msgid "Changed"
+msgstr ""
+
 msgid "Changed environments"
 msgstr "已更改的環境"
 
@@ -151,6 +154,9 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
+msgid "Corrective Change"
+msgstr ""
+
 msgid "Couldn't find any ENC data for this host"
 msgstr ""
 
@@ -265,12 +271,18 @@ msgstr ""
 msgid "Facts"
 msgstr "詳情"
 
+msgid "Failed"
+msgstr ""
+
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr "為 %{name} 匯入 %{klass} 失敗：不存在我們的資料庫中 - 將被忽略"
 
 msgid "Failed to set %{proxy_type} proxy for %{host}."
 msgstr "設定 %{proxy_type} 代理給 %{host} 時失敗。"
 
+msgid "Failed to start"
+msgstr ""
+
 msgid "Failed to update environments and Puppet classes from the on-disk Puppet installation: %s"
 msgstr ""
 
@@ -412,6 +424,9 @@ msgstr ""
 msgid "Invalid proxy selected!"
 msgstr "選擇了不正確的代理！"
 
+msgid "Last configuration status"
+msgstr ""
+
 msgid "List all Puppet class IDs for host"
 msgstr "列出主機的所有 Puppet 類別 ID"
 
@@ -487,12 +502,18 @@ msgstr "合併所有相符的值（只有陣列 / 雜湊類型）"
 msgid "Name"
 msgstr "名稱"
 
+msgid "Never"
+msgstr ""
+
 msgid "New"
 msgstr "新增"
 
 msgid "No changes to your environments detected"
 msgstr "未偵測到您的環境遭到變更"
 
+msgid "No configuration status available"
+msgstr ""
+
 msgid "No environment selected!"
 msgstr "未選擇環境！"
 
@@ -556,6 +577,9 @@ msgstr "組織"
 msgid "Original value info"
 msgstr "原始值資訊"
 
+msgid "Out of sync"
+msgstr ""
+
 msgid "Overridden"
 msgstr ""
 
@@ -640,6 +664,9 @@ msgstr "Puppet 外部節點 YAML 傾印"
 msgid "Puppet interval"
 msgstr "Puppet 間隔"
 
+msgid "Puppet metrics"
+msgstr ""
+
 msgid "Puppet parameter"
 msgstr "Puppet 參數"
 
@@ -676,6 +703,12 @@ msgstr "報告"
 msgid "Required parameter without value.<br/><b>Please override!</b><br/>"
 msgstr "必要的參數未提供值。<br/><b>請覆寫！</b> <br/>"
 
+msgid "Restarted"
+msgstr ""
+
+msgid "Scheduled"
+msgstr ""
+
 msgid "Select environment"
 msgstr "選擇環境"
 
@@ -712,6 +745,9 @@ msgstr "顯示特定智慧類別參數的置換值"
 msgid "Show template combination"
 msgstr "顯示範本組合"
 
+msgid "Skipped"
+msgstr ""
+
 msgid "Smart Class Parameter"
 msgstr "智慧類別參數"
 

data/test/integration/foreman_puppet/smartclass_parameter_js_test.rb

@@ -74,6 +74,8 @@ module ForemanPuppet
       within(:xpath, '//table') do
         click_link 'ssl'
       end
+      # see: https://projects.theforeman.org/issues/37251
+      page.driver.browser.file_detector = nil if page.driver.browser.respond_to?(:file_detector=)
       fill_in 'puppetclass_lookup_key_description', with: 'test'
       fill_in 'puppetclass_lookup_key_default_value', with: 'false'
       assert_submit_button(puppetclass_lookup_keys_path)

data/test/models/foreman_puppet/host_test.rb

@@ -172,7 +172,7 @@ module ForemanPuppet
         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)
+                                .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)
@@ -183,7 +183,7 @@ module ForemanPuppet
         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)
+                                .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)
@@ -325,5 +325,17 @@ module ForemanPuppet
       h.save!
       assert_empty h.puppet.config_groups
     end
+
+    test 'assign a puppet class to host without puppet facet' do
+      puppet_class = FactoryBot.create(:puppetclass)
+      host = FactoryBot.create(:host)
+      # This would raise the following exception
+      # NoMethodError: undefined method `<<' for #<ActiveRecord::Relation []>
+      host.puppetclasses << puppet_class
+
+      assert_not_nil host.puppet
+      assert_includes host.puppet.puppetclasses, puppet_class
+      assert_includes host.puppetclasses, puppet_class
+    end
   end
 end

data/test/models/foreman_puppet/hostgroup_test.rb

@@ -10,5 +10,17 @@ module ForemanPuppet
       assert_equal 1, hostgroups.count
       assert_equal hostgroups.pluck(:id).sort, hostgroups.map(&:id).sort
     end
+
+    test 'assign a puppet class to hostgroup without puppet facet' do
+      puppet_class = FactoryBot.create(:puppetclass)
+      hostgroup = FactoryBot.create(:hostgroup)
+      # This would raise the following exception
+      # NoMethodError: undefined method `<<' for #<ActiveRecord::Relation []>
+      hostgroup.puppetclasses << puppet_class
+
+      assert_not_nil hostgroup.puppet
+      assert_includes hostgroup.puppet.puppetclasses, puppet_class
+      assert_includes hostgroup.puppetclasses, puppet_class
+    end
   end
 end

data/webpack/global_index.js

@@ -1,4 +1,6 @@
 import { registerReducer } from 'foremanReact/common/MountingService';
+import { registerColumns } from 'foremanReact/components/HostsIndex/Columns/core';
+import { translate as __ } from 'foremanReact/common/I18n';
 import reducers from './src/reducers';
 import { registerFills } from './src/Extends/Fills';
 import { registerLegacy } from './legacy';
@@ -9,3 +11,22 @@ registerReducer('puppet', reducers);
 registerFills();
 // TODO: the checkForUnavailablePuppetclasses is very nasty
 registerLegacy();
+
+// register columns for React hosts index page
+const puppetHostsIndexColumns = [
+  {
+    columnName: 'environment',
+    title: __('Puppet env'),
+    isSorted: true,
+    wrapper: hostDetails => hostDetails.environment_name,
+    weight: 2700,
+  },
+];
+
+puppetHostsIndexColumns.forEach(column => {
+  column.tableName = 'hosts';
+  column.categoryName = 'Puppet';
+  column.categoryKey = 'puppet';
+});
+
+registerColumns(puppetHostsIndexColumns);

data/webpack/src/foreman_class_edit.js

@@ -154,7 +154,7 @@ export function addConfigGroup(item) {
     .addClass('selected-marker')
     .hide();
 
-  const puppetclassIds = $.parseJSON($(item).attr('data-puppetclass-ids'));
+  const puppetclassIds = JSON.parse($(item).attr('data-puppetclass-ids'));
   const inheritedIds = _getInheritedIds();
 
   $.each(puppetclassIds, (index, puppetclassId) => {
@@ -182,7 +182,7 @@ export function removeConfigGroup(item) {
     .tooltip('hide');
   $(`#selected_config_group_${id}`).remove();
 
-  const puppetclassIds = $.parseJSON($(item).attr('data-puppetclass-ids'));
+  const puppetclassIds = JSON.parse($(item).attr('data-puppetclass-ids'));
   const inheritedIds = _getInheritedIds();
 
   $.each(puppetclassIds, (index, puppetclassId) => {

data/webpack/src/foreman_puppet_host_form.js

@@ -110,7 +110,7 @@ export function checkForUnavailablePuppetclasses() {
       ${warningMessage}
     </span>`;
 
-  if (unavailableClasses.size() > 0) {
+  if (unavailableClasses.length > 0) {
     if (puppetEncTab.find('#puppetclasses_unavailable_warning').length <= 0) {
       tab.prepend('<span class="pficon pficon-warning-triangle-o"></span> ');
       puppetEncTab.prepend(warning);

data/webpack/src/foreman_puppet_host_form.test.js

@@ -37,7 +37,7 @@ describe('checkForUnavailablePuppetclasses', () => {
     );
 
     checkForUnavailablePuppetclasses();
-    expect($('#puppetclasses_unavailable_warning').size()).toBe(1);
+    expect($('#puppetclasses_unavailable_warning').length).toBe(1);
   });
 
   it('does not add a warning if no unavailable classes are found', () => {
@@ -48,8 +48,7 @@ describe('checkForUnavailablePuppetclasses', () => {
     expect(
       $('#hostgroup .help-block')
         .first()
-        .children()
-        .size()
+        .children().length
     ).toBe(0);
   });
 
@@ -59,7 +58,7 @@ describe('checkForUnavailablePuppetclasses', () => {
     );
     checkForUnavailablePuppetclasses();
     setTimeout(() => {
-      expect($('a .pficon').size()).toBe(1);
+      expect($('a .pficon').length).toBe(1);
     }, 100);
   });
 });