foreman_openscap 3.0.1 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9022cadb1e56bd7bf36523d096543e50bcadb360327e0f930d00a8308774203
-  data.tar.gz: a1cf2ae2a6bfd3dd77de305ea65312e07ca51ec61ceed96c625e48a170306183
+  metadata.gz: f4a4ecc74498e831daaf3b06da9a2ab475c1eac67f34ef698fe7aabc949e7fa3
+  data.tar.gz: b917c3d1c392311306404f261541bbabbc63fcabdfb5ee277a25a794eb3cf0f2
 SHA512:
-  metadata.gz: 43d354207d9200b8d230312cd6259ff76b27ee75a87bcace113df7b323fad7bc4be4012ea15fd1aa1134fc91e9fff6aa93a2e07deeef2acd4f358e4cd031b63c
-  data.tar.gz: fda20c152e9bf85fc7a42d85e1d8472386ea8b1fa9fc516373f144019c39cd797db4b49f60312165b154e4c59f63cf948ae7cb364990c020687a28020434b12c
+  metadata.gz: 2f50b5057eac300b2f23d006d2523d0a1241d1133ce108a2836f4833a1b491a8b365ba3bb9428b9a120b7c89bf1278274844eb8e02304d2dc8edc37952477629
+  data.tar.gz: d7c772636e3a3406cf1df32cdb6521716800acc61b31825ed7a9c1d4819411ca4047aaf43c16c346eb715b83c7778b5b37daf6d41ad38a20b89435be4b5466c0

data/app/controllers/api/v2/compliance/scap_contents_controller.rb

@@ -51,7 +51,7 @@ module Api::V2
       param_group :scap_content
 
       def update
-        process_response @scap_content.update_attributes(scap_content_params)
+        process_response @scap_content.update(scap_content_params)
       end
 
       api :DELETE, '/compliance/scap_contents/:id', N_('Deletes an SCAP content')

data/app/controllers/api/v2/compliance/tailoring_files_controller.rb

@@ -52,7 +52,7 @@ module Api::V2
       param_group :tailoring_file
 
       def update
-        process_response @tailoring_file.update_attributes(tailoring_file_params)
+        process_response @tailoring_file.update(tailoring_file_params)
       end
 
       api :DELETE, '/compliance/tailoring_files/:id', N_('Deletes a Tailoring file')

data/app/controllers/scap_contents_controller.rb

@@ -33,7 +33,7 @@ class ScapContentsController < ApplicationController
   end
 
   def update
-    if @scap_content.update_attributes(scap_content_params)
+    if @scap_content.update(scap_content_params)
       process_success
     else
       process_error

data/app/controllers/tailoring_files_controller.rb

@@ -30,7 +30,7 @@ class TailoringFilesController < ApplicationController
   end
 
   def update
-    if @tailoring_file.update_attributes(tailoring_file_params)
+    if @tailoring_file.update(tailoring_file_params)
       process_success
     else
       process_error

data/app/models/concerns/foreman_openscap/hostgroup_extensions.rb

@@ -22,18 +22,10 @@ module ForemanOpenscap
     end
 
     def inherited_openscap_proxy_id
-      inherited_ancestry_attribute(:openscap_proxy_id)
-    end
-
-    unless defined?(Katello::System)
-      private
-
-      def inherited_ancestry_attribute(attribute)
-        if ancestry.present?
-          self[attribute] || self.class.sort_by_ancestry(ancestors.where("#{attribute} is not NULL")).last.try(attribute)
-        else
-          self.send(attribute)
-        end
+      if ancestry.present?
+        self[:openscap_proxy_id] || self.class.sort_by_ancestry(ancestors.where.not(openscap_proxy_id: nil)).last.try(:openscap_proxy_id)
+      else
+        self.send(:openscap_proxy_id)
       end
     end
   end

data/app/models/concerns/foreman_openscap/openscap_proxy_core_extensions.rb

@@ -33,10 +33,6 @@ module ForemanOpenscap
       end
     end
 
-    def inherited_openscap_proxy_id
-      inherited_ancestry_attribute(:openscap_proxy_id)
-    end
-
     private
 
     def scap_client_lookup_values_for(lookup_keys, model_match)

data/app/models/foreman_openscap/policy.rb

@@ -67,7 +67,7 @@ module ForemanOpenscap
           ForemanOpenscap::LookupKeyOverrider.new(self).override
         end
 
-        errors.none? && update_attributes(params)
+        errors.none? && update(params)
       end
     end
 
@@ -312,7 +312,7 @@ module ForemanOpenscap
     end
 
     def assign_ids(ids, class_name)
-      new_assets = ids.reject { |id| id.respond_to?(:empty?) && id.empty? }.reduce([]) do |memo, id|
+      new_assets = ids.uniq.reject { |id| id.respond_to?(:empty?) && id.empty? }.reduce([]) do |memo, id|
         memo << assets.where(:assetable_type => class_name, :assetable_id => id).first_or_initialize
       end
       complimentary_class_name = class_name == 'Host::Base' ? 'Hostgroup' : 'Host::Base'

data/db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb

@@ -0,0 +1,34 @@
+class MigratePortOverridesForAnsible < ActiveRecord::Migration[6.0]
+  def up
+    transform_lookup_values :to_i
+  end
+
+  def down
+    transform_lookup_values :to_s
+  end
+
+  private
+
+  def transform_lookup_values(method)
+    return unless defined?(ForemanAnsible)
+    role = AnsibleRole.find_by :name => 'theforeman.foreman_scap_client'
+    return unless role
+    port_key = role.ansible_variables.find_by :key => 'foreman_scap_client_port'
+    return unless port_key
+    if method == :to_i
+      port_key.key_type =  "integer"
+      port_key.default_value = 8080
+    else
+      port_key.key_type == "string"
+      port_key.default_value = ""
+    end
+
+    port_key.save
+    port_key.lookup_values.in_batches do |batch|
+      batch.each do |lookup_value|
+        lookup_value.value = lookup_value.value.send(method)
+        lookup_value.save
+      end
+    end
+  end
+end

data/db/seeds.d/75-job_templates.rb

@@ -7,9 +7,9 @@ if ForemanOpenscap.with_remote_execution?
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
         # import! was renamed to import_raw! around 1.3.1
         if JobTemplate.respond_to?('import_raw!')
-          template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
         else
-          template = JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import!(File.read(template), :default => true, :lock => true, :update => sync)
         end
         template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
         template.locations = locations if SETTINGS[:locations_enabled] && template.present?

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "3.0.1".freeze
+  VERSION = "4.0.4".freeze
 end

data/locale/action_names.rb

@@ -1,10 +1,5 @@
 # Autogenerated!
-_("Import Puppet classes")
-_("Remote action:")
 _("Action with sub plans")
 _("Import facts")
-_("Delete host")
-_("Update host")
-_("Update node")
-_("Create client")
-_("Delete client")
+_("Import Puppet classes")
+_("Remote action:")

data/locale/de/foreman_openscap.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-02-11 07:20+0000\n"
-"Last-Translator: Ludwig B <lbayerlein@lbayerlein.de>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Crited <Alexander.Stoll@netways.de>\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,9 +166,6 @@ msgstr "Richtlinie erstellen"
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Übersichtsseite"
 
@@ -190,18 +187,12 @@ msgstr "Richtlinie löschen"
 msgid "Delete an ARF Report"
 msgstr "ARF-Bericht löschen"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "Compliance-Richtline %s löschen mit allen Berichten?"
 
 msgid "Delete compliance report for %s?"
 msgstr "Compliance-Bericht von %s löschen?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "Berichte löschen"
 
@@ -834,12 +825,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr "Einen SCAP-Inhalt aktualisieren "
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "Host aktualisiert: Zugewiesen mit OpenSCAP Proxy: %s"
 

data/locale/en_GB/foreman_openscap.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-12-23 01:05+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/fore"
 "man/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -163,9 +163,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr ""
 
@@ -187,18 +184,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr ""
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr ""
 
@@ -831,12 +822,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr ""
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""
 

data/locale/es/foreman_openscap.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/foreman/foreman/language/es/)"
 "\n"
@@ -165,9 +165,6 @@ msgstr "Crear una política"
 msgid "Create a Tailoring file"
 msgstr "Crear un archivo de personalización"
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Tablero de mandos"
 
@@ -189,18 +186,12 @@ msgstr "Eliminar una política"
 msgid "Delete an ARF Report"
 msgstr "Eliminar un informe ARF"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "¿Eliminar política de cumplimiento %s junto con todos sus informes?"
 
 msgid "Delete compliance report for %s?"
 msgstr "¿Eliminar el informe de cumplimiento para %s?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "Eliminar informes"
 
@@ -833,12 +824,6 @@ msgstr "Actualizar un archivo de personalización"
 msgid "Update an SCAP content"
 msgstr "Actualizar el contenido de SCAP"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "Hosts actualizados: Asignados con proxy OpenSCAP: %s"
 

data/locale/foreman_openscap.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_openscap 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-02 13:32+0000\n"
-"PO-Revision-Date: 2020-03-02 13:32+0000\n"
+"POT-Creation-Date: 2020-05-11 18:31+0530\n"
+"PO-Revision-Date: 2020-05-11 18:31+0530\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1295,37 +1295,17 @@ msgid "Run OpenSCAP scan"
 msgstr ""
 
 #: action_names.rb:2
-msgid "Import Puppet classes"
+msgid "Action with sub plans"
 msgstr ""
 
 #: action_names.rb:3
-msgid "Remote action:"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Action with sub plans"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:5
-msgid "Import facts"
-msgstr ""
-
-#: action_names.rb:6
-msgid "Delete host"
-msgstr ""
-
-#: action_names.rb:7
-msgid "Update host"
-msgstr ""
-
-#: action_names.rb:8
-msgid "Update node"
-msgstr ""
-
-#: action_names.rb:9
-msgid "Create client"
-msgstr ""
-
-#: action_names.rb:10
-msgid "Delete client"
+msgid "Remote action:"
 msgstr ""

data/locale/fr/foreman_openscap.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/foreman/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -165,9 +165,6 @@ msgstr "Créer une stratégie"
 msgid "Create a Tailoring file"
 msgstr "Créer un fichier de personnalisation"
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
@@ -189,18 +186,12 @@ msgstr "Supprimer une Stratégie"
 msgid "Delete an ARF Report"
 msgstr "Supprimer un rapport ARF"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "Souhaitez-vous  supprimer la stratégie de conformité %s avec tous ses rapports ?"
 
 msgid "Delete compliance report for %s?"
 msgstr "Supprimer les rapports de conformité pour %s ?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "Supprimer les rapports"
 
@@ -839,12 +830,6 @@ msgstr "Mettre à jour un fichier de personnalisation"
 msgid "Update an SCAP content"
 msgstr "Mettre à jour un contenu SCAP"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "Hôtes mis à jour : attribué avec le proxy OpenSCAP : %s"
 

data/locale/gl/foreman_openscap.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
-"Last-Translator: Carmela Rubiños <carmela.rubinos@gmail.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Galician (http://www.transifex.com/foreman/foreman/language/gl/"
 ")\n"
 "MIME-Version: 1.0\n"
@@ -163,9 +163,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Escritorio"
 
@@ -187,18 +184,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr ""
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr ""
 
@@ -831,12 +822,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr ""
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""
 

data/locale/it/foreman_openscap.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Italian (http://www.transifex.com/foreman/foreman/language/it/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -164,9 +164,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -188,18 +185,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr ""
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr ""
 
@@ -832,12 +823,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr ""
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""
 

data/locale/ja/foreman_openscap.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/foreman/foreman/language/ja/"
 ")\n"
@@ -165,9 +165,6 @@ msgstr "ポリシーの作成"
 msgid "Create a Tailoring file"
 msgstr "テーラリングファイルの作成"
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
@@ -189,18 +186,12 @@ msgstr "ポリシーの削除"
 msgid "Delete an ARF Report"
 msgstr "ARF レポートの定義"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "すべてのレポートでコンプライアンスポリシー %s を削除しますか?"
 
 msgid "Delete compliance report for %s?"
 msgstr "%s のコンプライアンスレポートを削除しますか?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "レポートを削除"
 
@@ -833,12 +824,6 @@ msgstr "テーラリングファイルの更新"
 msgid "Update an SCAP content"
 msgstr "SCAP コンテンツの更新"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "更新済みホスト: OpenSCAP プロキシーで割り当て済み: %s"
 

data/locale/ko/foreman_openscap.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Korean (http://www.transifex.com/foreman/foreman/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -163,9 +163,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "대시보드 "
 
@@ -187,18 +184,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr "%s에 대한 컴플라이언스 보고서를 삭제하시겠습니까?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "보고서 삭제"
 
@@ -831,12 +822,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr "SCAP 컨텐츠 업데이트"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""
 

data/locale/pt_BR/foreman_openscap.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/foreman/foreman/l"
 "anguage/pt_BR/)\n"
@@ -164,9 +164,6 @@ msgstr "Criar uma política"
 msgid "Create a Tailoring file"
 msgstr "Criar um arquivo de personalização"
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Painel"
 
@@ -188,18 +185,12 @@ msgstr "Excluir uma política"
 msgid "Delete an ARF Report"
 msgstr "Excluir um relatório ARF"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "Excluir política de conformidade %s com todos os relatórios?"
 
 msgid "Delete compliance report for %s?"
 msgstr "Remover relatório de conformidade para %s?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "Remover relatórios"
 
@@ -838,12 +829,6 @@ msgstr "Atualizar um arquivo de personalização"
 msgid "Update an SCAP content"
 msgstr "Atualizar um conteúdo SCAP"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "Hosts atualizados: atribuídos com proxy de OpenSCAP: %s"
 

data/locale/ru/foreman_openscap.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/ru/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -167,9 +167,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Обзор"
 
@@ -191,18 +188,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr "Удалить отчет %s?"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "Удалить отчеты"
 
@@ -835,12 +826,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr "Обновить описание SCAP"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""
 

data/locale/sv_SE/foreman_openscap.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
-"Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/foreman/foreman/lang"
 "uage/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -163,9 +163,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "Instrumentbräda"
 
@@ -187,18 +184,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr ""
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr ""
 
@@ -831,12 +822,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr ""
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""
 

data/locale/zh_CN/foreman_openscap.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"
@@ -164,9 +164,6 @@ msgstr "创建策略"
 msgid "Create a Tailoring file"
 msgstr "创建定制文件"
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "仪表板"
 
@@ -188,18 +185,12 @@ msgstr "删除一个策略"
 msgid "Delete an ARF Report"
 msgstr "删除 ARF 报告"
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr "是否删除所有报告中的合规策略 %s？"
 
 msgid "Delete compliance report for %s?"
 msgstr "是否删除 %s 的合规报告？"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "删除报告"
 
@@ -834,12 +825,6 @@ msgstr "更新定制文件"
 msgid "Update an SCAP content"
 msgstr "更新 SCAP 内容"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr "更新的主机：分配了 OpenSCAP 代理: %s"
 

data/locale/zh_TW/foreman_openscap.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-23 20:36+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"PO-Revision-Date: 2020-03-02 20:59+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -164,9 +164,6 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
-msgid "Create client"
-msgstr ""
-
 msgid "Dashboard"
 msgstr "控制面板"
 
@@ -188,18 +185,12 @@ msgstr ""
 msgid "Delete an ARF Report"
 msgstr ""
 
-msgid "Delete client"
-msgstr ""
-
 msgid "Delete compliance policy %s with all of its reports?"
 msgstr ""
 
 msgid "Delete compliance report for %s?"
 msgstr "刪除 %s 的合規報告？"
 
-msgid "Delete host"
-msgstr ""
-
 msgid "Delete reports"
 msgstr "刪除報告"
 
@@ -832,12 +823,6 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr "更新 SCAP 內容"
 
-msgid "Update host"
-msgstr ""
-
-msgid "Update node"
-msgstr ""
-
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
 msgstr ""
 

data/test/unit/policy_test.rb

@@ -37,6 +37,15 @@ class PolicyTest < ActiveSupport::TestCase
     assert_equal hostgroup, policy.hostgroups.first
   end
 
+  test "should not raise when assiging same host by id" do
+    host1 = FactoryBot.create(:compliance_host)
+    asset = FactoryBot.create(:asset, :assetable_id => host1.id, :assetable_type => 'Host::Base')
+    policy = FactoryBot.create(:policy, :assets => [asset], :scap_content => @scap_content, :scap_content_profile => @scap_profile)
+    policy.host_ids = [host1, host1].map(&:id)
+    policy.save!
+    assert_equal 1, policy.hosts.count
+  end
+
   test "should remove associated hostgroup" do
     hg = FactoryBot.create(:hostgroup)
     asset = FactoryBot.create(:asset, :assetable_id => hg.id, :assetable_type => 'Hostgroup')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.4
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -244,6 +244,7 @@ files:
 - db/migrate/20171016125613_add_content_title_unique_constraint.foreman_openscap.rb
 - db/migrate/20190103093409_add_deployment_option_to_policy.foreman_openscap.rb
 - db/migrate/20200117135424_migrate_port_overrides_to_int.rb
+- db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb