foreman_openscap 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85b072f0b231c8eae26142c2c7c792678d85ef85
-  data.tar.gz: 40cdf774aea828e834c28014616add7e349bdfce
+  metadata.gz: 476be55fdeeda480329624fd4ca562c93e33c370
+  data.tar.gz: 7d58930838e01c45d99fcd9b11444696c336eaa0
 SHA512:
-  metadata.gz: '0880c0fa84d985e180707c086074140cdb7d5b770008cf12a6e7c6c937e91a7ab17819956a1ed3ddbd5f0e102b75ec7b7ec91b44492f35a190c033a73cc67b3f'
-  data.tar.gz: 11830e756386113703725b05ae4c70e2f7406d44f2e71262b162d6d1857935d2b215dd496879efefdc8170ffce9ef6457b86924b607f9d74dfa1078f657cae2c
+  metadata.gz: d2bac463d3ffd03167b30a84d38194d6a5a12e8d331c09a0cbe4dabbd2ad2c785652b4bfe2ed873bd1af80ed24aeb73bd36459e0db2ecc067af975a6777d013f
+  data.tar.gz: 4cc7c132c045f5baf2a30e92cbc9bc55f39e4ae4eea23c044f87c981057e38a82b55c4a52e6ad08d3dc406e79c425115636110877d945d7e6fb4c20897b7d5be

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

@@ -76,9 +76,7 @@ module Api
         private
 
         def respond_for_report(arf_report)
-          if arf_report.nil?
-            upload_fail(_("Policy with id %s not found.") % params[:policy_id])
-          elsif arf_report.new_record?
+          if arf_report.new_record?
             upload_fail arf_report.errors.full_messages.to_sentence
           else
             render :json => { :result => :ok, :id => arf_report.id.to_s }
@@ -91,6 +89,11 @@ module Api
         end
 
         def find_resources_before_create
+          unless ForemanOpenscap::Policy.where(:id => params[:policy_id]).any?
+            upload_fail(_("Policy with id %s not found.") % params[:policy_id])
+            return
+          end
+
           @asset = ForemanOpenscap::Helper::get_asset(params[:cname], params[:policy_id])
 
           unless @asset

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.11.4".freeze
+  VERSION = "0.11.5".freeze
 end

data/locale/de/foreman_openscap.edit.po

@@ -41,11 +41,19 @@ msgstr ""
 msgid "Download ARF report in HTML"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/arf_reports_controller.rb:87
+#: ../app/controllers/api/v2/compliance/arf_reports_controller.rb:93
+msgid "Policy with id %s not found."
+msgstr ""
+
+#: ../app/controllers/api/v2/compliance/arf_reports_controller.rb:100
+msgid "Could not find host identified by: %s"
+msgstr ""
+
+#: ../app/controllers/api/v2/compliance/arf_reports_controller.rb:105
 msgid "Failed to upload Arf Report, OpenSCAP proxy name or url not found in params when uploading for %s and host is missing openscap_proxy"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/arf_reports_controller.rb:99
+#: ../app/controllers/api/v2/compliance/arf_reports_controller.rb:117
 msgid "No proxy found for %{name} or %{url}"
 msgstr ""
 
@@ -105,27 +113,31 @@ msgstr ""
 msgid "Tailoring file profile ID"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/policies_controller.rb:56
+#: ../app/controllers/api/v2/compliance/policies_controller.rb:52
+msgid "How the policy should be deployed"
+msgstr ""
+
+#: ../app/controllers/api/v2/compliance/policies_controller.rb:57
 msgid "Create a Policy"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/policies_controller.rb:64
+#: ../app/controllers/api/v2/compliance/policies_controller.rb:66
 msgid "Update a Policy"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/policies_controller.rb:72
+#: ../app/controllers/api/v2/compliance/policies_controller.rb:74
 msgid "Delete a Policy"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/policies_controller.rb:79
+#: ../app/controllers/api/v2/compliance/policies_controller.rb:81
 msgid "Show a policy's SCAP content"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/policies_controller.rb:89
+#: ../app/controllers/api/v2/compliance/policies_controller.rb:91
 msgid "Show a policy's Tailoring file"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/policies_controller.rb:99
+#: ../app/controllers/api/v2/compliance/policies_controller.rb:101
 msgid "No Tailoring file assigned for policy with id %s"
 msgstr ""
 
@@ -241,31 +253,31 @@ msgstr ""
 msgid "No OpenSCAP Proxy selected."
 msgstr ""
 
-#: ../app/controllers/policies_controller.rb:83
+#: ../app/controllers/policies_controller.rb:84
 msgid "Updated hosts: Assigned with compliance policy: %s"
 msgstr ""
 
-#: ../app/controllers/policies_controller.rb:87
+#: ../app/controllers/policies_controller.rb:88
 msgid "No compliance policy selected."
 msgstr ""
 
-#: ../app/controllers/policies_controller.rb:99
+#: ../app/controllers/policies_controller.rb:100
 msgid "Updated hosts: Unassigned from compliance policy '%s'"
 msgstr ""
 
-#: ../app/controllers/policies_controller.rb:101
+#: ../app/controllers/policies_controller.rb:102
 msgid "No valid policy ID provided"
 msgstr ""
 
-#: ../app/controllers/policies_controller.rb:121
+#: ../app/controllers/policies_controller.rb:122
 msgid "No hosts were found."
 msgstr ""
 
-#: ../app/controllers/policies_controller.rb:125
+#: ../app/controllers/policies_controller.rb:126
 msgid "No hosts selected"
 msgstr ""
 
-#: ../app/controllers/policies_controller.rb:130
+#: ../app/controllers/policies_controller.rb:131
 msgid "Something went wrong while selecting hosts - %s"
 msgstr ""
 
@@ -380,47 +392,51 @@ msgstr ""
 msgid "Host is deleted"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:20
+#: ../app/helpers/foreman_openscap_helper.rb:2
+msgid "documentation"
+msgstr ""
+
+#: ../app/helpers/policies_helper.rb:56
 msgid "Choose existing SCAP Content"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:21 ../app/helpers/policies_helper.rb:26 ../app/models/foreman_openscap/policy.rb:100 ../app/views/policies/_form.html.erb:9 ../app/views/scap_contents/welcome.html.erb:1 ../app/views/scap_contents/welcome.html.erb:6
+#: ../app/helpers/policies_helper.rb:57 ../app/helpers/policies_helper.rb:62 ../app/models/foreman_openscap/policy.rb:100 ../app/views/policies/_form.html.erb:10 ../app/views/scap_contents/welcome.html.erb:1 ../app/views/scap_contents/welcome.html.erb:6
 msgid "SCAP Content"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:36 ../app/helpers/policies_helper.rb:43
+#: ../app/helpers/policies_helper.rb:72 ../app/helpers/policies_helper.rb:79
 msgid "XCCDF Profile"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:42
+#: ../app/helpers/policies_helper.rb:78
 msgid "Default XCCDF profile"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:51
+#: ../app/helpers/policies_helper.rb:87
 msgid "Choose Tailoring File"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:52 ../app/views/policies/_list.html.erb:6
+#: ../app/helpers/policies_helper.rb:88 ../app/views/policies/_list.html.erb:6
 msgid "Tailoring File"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:61
+#: ../app/helpers/policies_helper.rb:97
 msgid "XCCDF Profile in Tailoring File"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:62
+#: ../app/helpers/policies_helper.rb:98
 msgid "This profile will be used to override the one from scap content"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:73 ../app/views/arf_reports/_list.html.erb:53
+#: ../app/helpers/policies_helper.rb:109 ../app/views/arf_reports/_list.html.erb:53
 msgid "Submit"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:78 ../app/views/arf_reports/_list.html.erb:52
+#: ../app/helpers/policies_helper.rb:114 ../app/views/arf_reports/_list.html.erb:52
 msgid "Cancel"
 msgstr ""
 
-#: ../app/helpers/policies_helper.rb:109 ../lib/foreman_openscap/engine.rb:138
+#: ../app/helpers/policies_helper.rb:145 ../lib/foreman_openscap/engine.rb:138
 msgid "Policies"
 msgstr ""
 
@@ -472,14 +488,10 @@ msgstr ""
 msgid "is not included in SCAP_RESULT"
 msgstr ""
 
-#: ../app/models/concerns/foreman_openscap/openscap_proxy_core_extensions.rb:66
+#: ../app/models/concerns/foreman_openscap/openscap_proxy_core_extensions.rb:68
 msgid "must have Openscap feature"
 msgstr ""
 
-#: ../app/models/concerns/foreman_openscap/openscap_proxy_core_extensions.rb:71
-msgid "Puppet class 'foreman_scap_client' not found, make sure it is imported from Puppet master"
-msgstr ""
-
 #: ../app/models/concerns/foreman_openscap/openscap_proxy_extensions.rb:8
 msgid "No OpenSCAP proxy found for %{class} with id %{id}"
 msgstr ""
@@ -500,7 +512,7 @@ msgstr ""
 msgid "Unknown Compliance status"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:29 ../app/models/foreman_openscap/policy.rb:304
+#: ../app/models/foreman_openscap/policy.rb:27 ../app/models/foreman_openscap/policy.rb:265
 msgid "is not a valid value"
 msgstr ""
 
@@ -512,19 +524,23 @@ msgstr ""
 msgid "Cannot generate HTML guide, no valid OpenSCAP proxy server found."
 msgstr ""
 
+#: ../app/models/foreman_openscap/policy.rb:100 ../app/views/policies/_form.html.erb:8
+msgid "Deployment Options"
+msgstr ""
+
 #: ../app/models/foreman_openscap/policy.rb:100
-msgid "Create policy"
+msgid "Policy Attributes"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:100 ../app/views/policies/_form.html.erb:10
+#: ../app/models/foreman_openscap/policy.rb:100 ../app/views/policies/_form.html.erb:11
 msgid "Schedule"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:101 ../app/views/policies/_form.html.erb:12 ../app/views/scap_contents/_form.html.erb:11 ../app/views/tailoring_files/_form.html.erb:11
+#: ../app/models/foreman_openscap/policy.rb:101 ../app/views/policies/_form.html.erb:13 ../app/views/scap_contents/_form.html.erb:11 ../app/views/tailoring_files/_form.html.erb:11
 msgid "Locations"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:102 ../app/views/policies/_form.html.erb:15 ../app/views/scap_contents/_form.html.erb:14 ../app/views/tailoring_files/_form.html.erb:14
+#: ../app/models/foreman_openscap/policy.rb:102 ../app/views/policies/_form.html.erb:16 ../app/views/scap_contents/_form.html.erb:14 ../app/views/tailoring_files/_form.html.erb:14
 msgid "Organizations"
 msgstr ""
 
@@ -532,39 +548,27 @@ msgstr ""
 msgid "Hostgroups"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:251
-msgid "Required Puppet class %{class} is not found, please ensure it imported first."
-msgstr ""
-
-#: ../app/models/foreman_openscap/policy.rb:277
-msgid "Puppet class %{class} does not have %{parameter} class parameter."
-msgstr ""
-
-#: ../app/models/foreman_openscap/policy.rb:286
-msgid "%{parameter} class parameter for class %{class} could not be configured."
-msgstr ""
-
-#: ../app/models/foreman_openscap/policy.rb:298
+#: ../app/models/foreman_openscap/policy.rb:259
 msgid "does not consist of 5 parts separated by space"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:310
+#: ../app/models/foreman_openscap/policy.rb:271
 msgid "must be between 1 and 31"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:315
+#: ../app/models/foreman_openscap/policy.rb:276
 msgid "must be present when tailoring file profile present"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:316
+#: ../app/models/foreman_openscap/policy.rb:277
 msgid "must be present when tailoring file present"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:321
+#: ../app/models/foreman_openscap/policy.rb:282
 msgid "does not come from selected tailoring file"
 msgstr ""
 
-#: ../app/models/foreman_openscap/policy.rb:327
+#: ../app/models/foreman_openscap/policy.rb:288
 msgid "does not have the selected SCAP content profile"
 msgstr ""
 
@@ -572,6 +576,38 @@ msgstr ""
 msgid "invalid type %s"
 msgstr ""
 
+#: ../app/services/foreman_openscap/client_config/ansible.rb:32
+msgid "Ansible role"
+msgstr ""
+
+#: ../app/services/foreman_openscap/client_config/ansible.rb:33
+msgid "Ansible variables"
+msgstr ""
+
+#: ../app/services/foreman_openscap/client_config/puppet.rb:32
+msgid "Puppet class"
+msgstr ""
+
+#: ../app/services/foreman_openscap/client_config/puppet.rb:33
+msgid "Smart Class Parameters"
+msgstr ""
+
+#: ../app/services/foreman_openscap/lookup_key_overrider.rb:13
+msgid "%{type} was selected to deploy policy to clients, but %{type} is not available. Are you missing a plugin?"
+msgstr ""
+
+#: ../app/services/foreman_openscap/lookup_key_overrider.rb:27
+msgid "Required %{msg_name} %{class} was not found, please ensure it is imported first."
+msgstr ""
+
+#: ../app/services/foreman_openscap/lookup_key_overrider.rb:57
+msgid "The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding."
+msgstr ""
+
+#: ../app/services/foreman_openscap/lookup_key_overrider.rb:89
+msgid "Failed to save when overriding parameters for %{config_tool}, cause: %{errors}"
+msgstr ""
+
 #: ../app/services/foreman_openscap/openscap_proxy_version_check.rb:39
 msgid "This feature is temporarily disabled. "
 msgstr ""
@@ -696,7 +732,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: ../app/views/arf_reports/delete_multiple.html.erb:27 action_names.rb:18
+#: ../app/views/arf_reports/delete_multiple.html.erb:27
 msgid "Delete"
 msgstr ""
 
@@ -848,27 +884,27 @@ msgstr ""
 msgid "Select OpenSCAP Proxy"
 msgstr ""
 
-#: ../app/views/policies/_form.html.erb:8
+#: ../app/views/policies/_form.html.erb:9
 msgid "General"
 msgstr ""
 
-#: ../app/views/policies/_form.html.erb:17
+#: ../app/views/policies/_form.html.erb:18
 msgid "Host Groups"
 msgstr ""
 
-#: ../app/views/policies/_form.html.erb:41 ../app/views/policies/steps/_schedule_form.html.erb:6
+#: ../app/views/policies/_form.html.erb:45 ../app/views/policies/steps/_schedule_form.html.erb:6
 msgid "Choose period"
 msgstr ""
 
-#: ../app/views/policies/_form.html.erb:43 ../app/views/policies/steps/_schedule_form.html.erb:8
+#: ../app/views/policies/_form.html.erb:47 ../app/views/policies/steps/_schedule_form.html.erb:8
 msgid "Choose weekday"
 msgstr ""
 
-#: ../app/views/policies/_form.html.erb:44 ../app/views/policies/steps/_schedule_form.html.erb:9
+#: ../app/views/policies/_form.html.erb:48 ../app/views/policies/steps/_schedule_form.html.erb:9
 msgid "Number of a day in month, note that not all months have same count of days"
 msgstr ""
 
-#: ../app/views/policies/_form.html.erb:45 ../app/views/policies/steps/_schedule_form.html.erb:10
+#: ../app/views/policies/_form.html.erb:49 ../app/views/policies/steps/_schedule_form.html.erb:10
 msgid "You can specify custom cron line, e.g. \"0  3  *  *  *\", separate each of 5 values by space"
 msgstr ""
 
@@ -1151,269 +1187,37 @@ msgid "Run OpenSCAP scan"
 msgstr ""
 
 #: action_names.rb:2
-msgid "Action with sub plans"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:3
-msgid "Import facts"
+msgid "Remote action:"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Import Puppet classes"
+msgid "Action with sub plans"
 msgstr ""
 
 #: action_names.rb:5
-msgid "Remote action:"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:6
-msgid "Create client"
+msgid "Delete host"
 msgstr ""
 
 #: action_names.rb:7
-msgid "Delete client"
+msgid "Update host"
 msgstr ""
 
 #: action_names.rb:8
-msgid "Delete host"
+msgid "Update node"
 msgstr ""
 
 #: action_names.rb:9
-msgid "Update host"
+msgid "Create client"
 msgstr ""
 
 #: action_names.rb:10
-msgid "Update node"
-msgstr ""
-
-#: action_names.rb:11
-msgid "Abstract async task"
-msgstr ""
-
-#: action_names.rb:12
-msgid "Create"
-msgstr ""
-
-#: action_names.rb:13
-msgid "Delete Activation Key"
-msgstr ""
-
-#: action_names.rb:14
-msgid "Update"
-msgstr ""
-
-#: action_names.rb:15
-msgid "Configure capsule"
-msgstr ""
-
-#: action_names.rb:16
-msgid "Create repos"
-msgstr ""
-
-#: action_names.rb:17
-msgid "Synchronize smart proxy"
-msgstr ""
-
-#: action_names.rb:19
-msgid "Errata mail"
-msgstr ""
-
-#: action_names.rb:20
-msgid "Incremental Update of  Content View Version(s) "
-msgstr ""
-
-#: action_names.rb:21
-msgid "Promote"
-msgstr ""
-
-#: action_names.rb:22
-msgid "Promotion to Environment"
-msgstr ""
-
-#: action_names.rb:23
-msgid "Publish"
-msgstr ""
-
-#: action_names.rb:24
-msgid "Remove Versions and Associations"
-msgstr ""
-
-#: action_names.rb:25
-msgid "Remove from Environment"
-msgstr ""
-
-#: action_names.rb:26
-msgid "Remove Version"
-msgstr ""
-
-#: action_names.rb:27
-msgid "Export"
-msgstr ""
-
-#: action_names.rb:28
-msgid "Fetch pxe files"
-msgstr ""
-
-#: action_names.rb:29
-msgid "Filtered index content"
-msgstr ""
-
-#: action_names.rb:30
-msgid "Upload into"
-msgstr ""
-
-#: action_names.rb:31
-msgid "Index content"
-msgstr ""
-
-#: action_names.rb:32
-msgid "Index errata"
-msgstr ""
-
-#: action_names.rb:33
-msgid "Index module streams"
-msgstr ""
-
-#: action_names.rb:34
-msgid "Index package groups"
-msgstr ""
-
-#: action_names.rb:35
-msgid "Remove Content"
-msgstr ""
-
-#: action_names.rb:36
-msgid "Synchronize"
-msgstr ""
-
-#: action_names.rb:37
-msgid "Upload errata into"
-msgstr ""
-
-#: action_names.rb:38
-msgid "Create Package Group"
-msgstr ""
-
-#: action_names.rb:39
-msgid "Disable"
-msgstr ""
-
-#: action_names.rb:40
-msgid "Enable"
-msgstr ""
-
-#: action_names.rb:41
-msgid "Run Sync Plan"
-msgstr ""
-
-#: action_names.rb:42
-msgid "Incremental Update"
-msgstr ""
-
-#: action_names.rb:43
-msgid "Republish Version Repositories"
-msgstr ""
-
-#: action_names.rb:44
-msgid "Delete Lifecycle Environment"
-msgstr ""
-
-#: action_names.rb:45
-msgid "Publish Lifecycle Environment Repositories"
-msgstr ""
-
-#: action_names.rb:46
-msgid "Attach subscriptions"
-msgstr ""
-
-#: action_names.rb:47
-msgid "Auto attach subscriptions"
-msgstr ""
-
-#: action_names.rb:48
-msgid "Destroy Content Host"
-msgstr ""
-
-#: action_names.rb:49
-msgid "Install Applicable Errata"
-msgstr ""
-
-#: action_names.rb:50
-msgid "Install erratum"
-msgstr ""
-
-#: action_names.rb:51
-msgid "Hypervisors"
-msgstr ""
-
-#: action_names.rb:52
-msgid "Hypervisors update"
-msgstr ""
-
-#: action_names.rb:53
-msgid "Install package"
-msgstr ""
-
-#: action_names.rb:54
-msgid "Install package group"
-msgstr ""
-
-#: action_names.rb:55
-msgid "Remove package"
-msgstr ""
-
-#: action_names.rb:56
-msgid "Update package"
-msgstr ""
-
-#: action_names.rb:57
-msgid "Remove package group"
-msgstr ""
-
-#: action_names.rb:58
-msgid "Remove subscriptions"
-msgstr ""
-
-#: action_names.rb:59
-msgid "Update for host"
-msgstr ""
-
-#: action_names.rb:60
-msgid "Update Content Overrides"
-msgstr ""
-
-#: action_names.rb:61
-msgid "Update release version for host"
-msgstr ""
-
-#: action_names.rb:62
-msgid "Package Profile Update"
-msgstr ""
-
-#: action_names.rb:63
-msgid "Auto-attach subscriptions"
-msgstr ""
-
-#: action_names.rb:64
-msgid "Destroy"
-msgstr ""
-
-#: action_names.rb:65
-msgid "Product Create"
-msgstr ""
-
-#: action_names.rb:66
-msgid "Delete Product"
-msgstr ""
-
-#: action_names.rb:67
-msgid "Reindex subscriptions"
-msgstr ""
-
-#: action_names.rb:68
-msgid "Delete Package Group"
-msgstr ""
-
-#: action_names.rb:69
-msgid "Report"
+msgid "Delete client"
 msgstr ""