foreman_openscap 2.0.2 → 3.0.0

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-09-05 20:17+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"PO-Revision-Date: 2019-10-23 20:36+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -53,9 +53,6 @@ msgstr ""
 msgid "A summary of reports for OpenSCAP policies"
 msgstr ""
 
-msgid "Abstract async task"
-msgstr ""
-
 msgid "Action with sub plans"
 msgstr ""
 
@@ -80,15 +77,6 @@ msgstr ""
 msgid "Assign Compliance Policy"
 msgstr "指定合規政策"
 
-msgid "Attach subscriptions"
-msgstr ""
-
-msgid "Auto attach subscriptions"
-msgstr ""
-
-msgid "Auto-attach subscriptions"
-msgstr ""
-
 msgid "Back"
 msgstr "上一頁"
 
@@ -128,9 +116,6 @@ msgstr "選擇期間"
 msgid "Choose weekday"
 msgstr "選擇星期幾"
 
-msgid "Combined Profile Update"
-msgstr ""
-
 msgid "Compliance"
 msgstr "合規"
 
@@ -170,12 +155,6 @@ msgstr ""
 msgid "Could not validate %{file_type}. Error %{error}"
 msgstr ""
 
-msgid "Create"
-msgstr ""
-
-msgid "Create Package Group"
-msgstr ""
-
 msgid "Create SCAP content"
 msgstr "建立 SCAP 內容"
 
@@ -185,6 +164,9 @@ msgstr ""
 msgid "Create a Tailoring file"
 msgstr ""
 
+msgid "Create client"
+msgstr ""
+
 msgid "Dashboard"
 msgstr "控制面板"
 
@@ -200,30 +182,24 @@ msgstr "預設 XCCDF 設定檔"
 msgid "Delete"
 msgstr "刪除"
 
-msgid "Delete Activation Key"
-msgstr ""
-
-msgid "Delete Lifecycle Environment"
-msgstr ""
-
-msgid "Delete Package Group"
-msgstr ""
-
-msgid "Delete Product"
-msgstr ""
-
 msgid "Delete a Policy"
 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 "刪除報告"
 
@@ -248,18 +224,6 @@ msgstr ""
 msgid "Description"
 msgstr "說明"
 
-msgid "Destroy"
-msgstr ""
-
-msgid "Destroy Content Host"
-msgstr ""
-
-msgid "Disable"
-msgstr ""
-
-msgid "Discover"
-msgstr ""
-
 msgid "Documentation"
 msgstr ""
 
@@ -296,15 +260,6 @@ msgstr ""
 msgid "Effective Profile"
 msgstr ""
 
-msgid "Enable"
-msgstr ""
-
-msgid "Errata mail"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
 msgid "Failed"
 msgstr "已失敗"
 
@@ -339,15 +294,9 @@ msgstr ""
 msgid "Failed|F"
 msgstr "F"
 
-msgid "Fetch pxe files"
-msgstr ""
-
 msgid "File Upload"
 msgstr "檔案上傳"
 
-msgid "Filtered index content"
-msgstr ""
-
 msgid "Full Report"
 msgstr ""
 
@@ -405,12 +354,6 @@ msgstr ""
 msgid "How the policy should be deployed"
 msgstr ""
 
-msgid "Hypervisors"
-msgstr ""
-
-msgid "Hypervisors update"
-msgstr ""
-
 msgid "ID of OpenSCAP Proxy"
 msgstr ""
 
@@ -445,39 +388,6 @@ msgstr "非決定性"
 msgid "Inconclusive results"
 msgstr "非決定性結果"
 
-msgid "Incremental Update"
-msgstr ""
-
-msgid "Incremental Update of  Content View Version(s) "
-msgstr ""
-
-msgid "Index content"
-msgstr ""
-
-msgid "Index errata"
-msgstr ""
-
-msgid "Index module streams"
-msgstr ""
-
-msgid "Index package groups"
-msgstr ""
-
-msgid "Install Applicable Errata"
-msgstr ""
-
-msgid "Install erratum"
-msgstr ""
-
-msgid "Install package"
-msgstr ""
-
-msgid "Install package group"
-msgstr ""
-
-msgid "Instance update"
-msgstr ""
-
 msgid "It may sometimes be required to adjust the security policy to your specific needs. "
 msgstr ""
 
@@ -493,6 +403,9 @@ msgstr ""
 msgid "List Policies"
 msgstr ""
 
+msgid "List SCAP content profiles"
+msgstr ""
+
 msgid "List SCAP contents"
 msgstr "列出 SCAP 內容"
 
@@ -635,9 +548,6 @@ msgstr "其它"
 msgid "Othered|O"
 msgstr "Othered|O"
 
-msgid "Package Profile Update"
-msgstr ""
-
 msgid "Passed"
 msgstr "已通過"
 
@@ -696,24 +606,9 @@ msgstr ""
 msgid "Policy with id %s not found."
 msgstr ""
 
-msgid "Product Create"
-msgstr ""
-
-msgid "Promote"
-msgstr ""
-
-msgid "Promotion to Environment"
-msgstr ""
-
 msgid "Proxy failed to send a report from spool to Foreman. This indicates a corrupted report format. Report has been moved to directory for storing corrupted files on proxy for later inspection."
 msgstr ""
 
-msgid "Publish"
-msgstr ""
-
-msgid "Publish Lifecycle Environment Repositories"
-msgstr ""
-
 msgid "Puppet class"
 msgstr "Puppet 類別"
 
@@ -723,33 +618,9 @@ msgstr "理由"
 msgid "References"
 msgstr "參照"
 
-msgid "Reindex subscriptions"
-msgstr ""
-
 msgid "Remote action:"
 msgstr ""
 
-msgid "Remove Content"
-msgstr ""
-
-msgid "Remove Version"
-msgstr ""
-
-msgid "Remove Versions and Associations"
-msgstr ""
-
-msgid "Remove from Environment"
-msgstr ""
-
-msgid "Remove package"
-msgstr ""
-
-msgid "Remove package group"
-msgstr ""
-
-msgid "Remove subscriptions"
-msgstr ""
-
 msgid "Report Metrics"
 msgstr "報告計量"
 
@@ -765,9 +636,6 @@ msgstr ""
 msgid "Reports"
 msgstr "報告"
 
-msgid "Republish Version Repositories"
-msgstr ""
-
 msgid "Request timed out. Please try increasing Settings -> proxy_request_timeout"
 msgstr ""
 
@@ -786,9 +654,6 @@ msgstr ""
 msgid "Run OpenSCAP scan"
 msgstr ""
 
-msgid "Run Sync Plan:"
-msgstr ""
-
 msgid "SCAP Content"
 msgstr "SCAP 內容"
 
@@ -894,15 +759,6 @@ msgstr ""
 msgid "Summary report from Foreman server at %{foreman_url}"
 msgstr "來自 Foreman 伺服器的摘要報告，於 %{foreman_url}"
 
-msgid "Sync capsule"
-msgstr ""
-
-msgid "Synchronize"
-msgstr ""
-
-msgid "Synchronize smart proxy"
-msgstr ""
-
 msgid "Tailoring File"
 msgstr ""
 
@@ -967,12 +823,6 @@ msgstr "取消指定合規政策"
 msgid "Unknown Compliance status"
 msgstr "未知的合規狀態"
 
-msgid "Update"
-msgstr ""
-
-msgid "Update Content Overrides"
-msgstr ""
-
 msgid "Update a Policy"
 msgstr ""
 
@@ -982,25 +832,10 @@ msgstr ""
 msgid "Update an SCAP content"
 msgstr "更新 SCAP 內容"
 
-msgid "Update content urls"
-msgstr ""
-
-msgid "Update for host"
-msgstr ""
-
-msgid "Update http proxy"
-msgstr ""
-
-msgid "Update http proxy details"
+msgid "Update host"
 msgstr ""
 
-msgid "Update package"
-msgstr ""
-
-msgid "Update redhat repository"
-msgstr ""
-
-msgid "Update release version for host"
+msgid "Update node"
 msgstr ""
 
 msgid "Updated hosts: Assigned with OpenSCAP Proxy: %s"
@@ -1021,12 +856,6 @@ msgstr ""
 msgid "Upload an ARF report"
 msgstr "上傳 ARF 報告"
 
-msgid "Upload errata into"
-msgstr ""
-
-msgid "Upload into"
-msgstr ""
-
 msgid "Upload new SCAP content file"
 msgstr "上傳新的 SCAP 內容檔案"
 

data/test/functional/api/v2/compliance/arf_reports_controller_test.rb

@@ -3,9 +3,6 @@ require 'tmpdir'
 
 class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
   setup do
-    # required for mysql where database cleaner does not cleanup things properly
-    # because of arf_create does explicit transaction commit
-    Message.delete_all
     # override validation of policy (puppetclass, lookup_key overrides)
     ForemanOpenscap::Policy.any_instance.stubs(:valid?).returns(true)
     @host = FactoryBot.create(:compliance_host)

data/test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb

@@ -0,0 +1,15 @@
+require 'test_plugin_helper'
+
+class Api::V2::Compliance::ScapContentProfilesControllerTest < ActionController::TestCase
+  test "should get index" do
+    2.times do
+      FactoryBot.create(:scap_content_profile)
+    end
+    FactoryBot.create(:scap_content, :scap_content_profiles => [ForemanOpenscap::ScapContentProfile.first])
+    FactoryBot.create(:tailoring_file, :scap_content_profiles => [ForemanOpenscap::ScapContentProfile.last])
+    get :index, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert response['results'].any?
+    assert_response :success
+  end
+end

data/test/test_plugin_helper.rb

@@ -55,8 +55,8 @@ module ScapTestCommon
   def create_report_with_rules(host, rule_names, rule_results)
     raise "rule_names and rule_results should have the same length!" if rule_names.size != rule_results.size
     metrics = {
-      'passed' => rule_results.select { |result| result == 'pass' }.count,
-      'failed' => rule_results.select { |result| result == 'fail' }.count,
+      'passed' => rule_results.count { |result| result == 'pass' },
+      'failed' => rule_results.count { |result| result == 'fail' },
       'othered' => rule_results.reject { |result| result == 'fail' || result == 'pass' }.count
     }
     report = FactoryBot.create(:arf_report, :host_id => host.id, :metrics => metrics, :status => metrics)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -46,6 +46,7 @@ files:
 - app/assets/stylesheets/foreman_openscap/scap_breakdown_chart.css
 - app/controllers/api/v2/compliance/arf_reports_controller.rb
 - app/controllers/api/v2/compliance/policies_controller.rb
+- app/controllers/api/v2/compliance/scap_content_profiles_controller.rb
 - app/controllers/api/v2/compliance/scap_contents_controller.rb
 - app/controllers/api/v2/compliance/tailoring_files_controller.rb
 - app/controllers/arf_reports_controller.rb
@@ -125,6 +126,9 @@ files:
 - app/views/api/v2/compliance/policies/index.json.rabl
 - app/views/api/v2/compliance/policies/main.json.rabl
 - app/views/api/v2/compliance/policies/show.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/base.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/index.json.rabl
+- app/views/api/v2/compliance/scap_content_profiles/main.json.rabl
 - app/views/api/v2/compliance/scap_contents/base.json.rabl
 - app/views/api/v2/compliance/scap_contents/create.json.rabl
 - app/views/api/v2/compliance/scap_contents/index.json.rabl
@@ -239,6 +243,7 @@ files:
 - db/migrate/20171011134112_remove_arf_reports_without_policy.rb
 - 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/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -255,44 +260,57 @@ files:
 - locale/de/LC_MESSAGES/foreman_openscap.mo
 - locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
+- locale/de/foreman_openscap.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
 - locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
+- locale/en_GB/foreman_openscap.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_openscap.mo
 - locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
+- locale/es/foreman_openscap.po.time_stamp
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
 - locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
+- locale/fr/foreman_openscap.po.time_stamp
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
 - locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
+- locale/gl/foreman_openscap.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_openscap.mo
 - locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
+- locale/it/foreman_openscap.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
 - locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
+- locale/ja/foreman_openscap.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
 - locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
+- locale/ko/foreman_openscap.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
 - locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
+- locale/pt_BR/foreman_openscap.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
 - locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
+- locale/ru/foreman_openscap.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
 - locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
+- locale/sv_SE/foreman_openscap.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
 - locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
+- locale/zh_CN/foreman_openscap.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
 - locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
+- locale/zh_TW/foreman_openscap.po.time_stamp
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
 - test/factories/compliance_host_factory.rb
@@ -310,6 +328,7 @@ files:
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
 - test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
 - test/functional/api/v2/compliance/scap_contents_controller_test.rb
 - test/functional/api/v2/compliance/tailoring_files_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
@@ -356,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
@@ -376,16 +395,16 @@ test_files:
 - test/files/scap_contents/ssg-fedora-ds.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
-- test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
 - test/functional/api/v2/compliance/scap_contents_controller_test.rb
 - test/functional/api/v2/compliance/tailoring_files_controller_test.rb
+- test/functional/api/v2/compliance/arf_reports_controller_test.rb
+- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
 - test/functional/tailoring_files_controller_test.rb
 - test/lib/foreman_openscap/bulk_upload_test.rb
-- test/test_plugin_helper.rb
 - test/unit/arf_report_status_calculator_test.rb
 - test/unit/compliance_status_test.rb
 - test/unit/concerns/openscap_proxy_extenstions_test.rb
@@ -404,3 +423,4 @@ test_files:
 - test/unit/policy_test.rb
 - test/helpers/arf_report_dashboard_helper_test.rb
 - test/helpers/policy_dashboard_helper_test.rb
+- test/test_plugin_helper.rb