foreman_virt_who_configure 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e6b64a57650777168676381d665c54bcda4233d
-  data.tar.gz: a58212eb1cc2af308023ff9158637060d4ade777
+  metadata.gz: 7c9d0b1bd39ef64d89b9dd99354534d18867afe7
+  data.tar.gz: 647f150db1e6c1f20274bf5b01beb37aad6f860f
 SHA512:
-  metadata.gz: 5cb38125f70ccfaee3cd932a48b845903f4ee69c8fe2df7a5665d335109f42656629051534fc78fcadea6fe90a2083ff774b4923536dd4a781430d5d015d507b
-  data.tar.gz: 0eb8fc43bcc1fd41e77aee026854ead4faf4896e9520f7d7bf56acc43251ab44557bd7484cce9cd83debd40408b4faf22de3d455c5410584f26f6880690ba9f8
+  metadata.gz: 8673a8cb1b35ae0d1b92bf4ba934bfd3cf7acad6330aebd59a71fdcaffdfc8c69f139a61394e51bb72bf20d2ca21736f8a8364927e3e70f8b3130168c97b973b
+  data.tar.gz: 55cc16da7f0daf66d69b17e9b565936d91c029c470508ef72e1b288213cd040e6b32b32f119504b9db4f764d526a90c6aef4778da90c834a194b5177d534525d

data/app/models/concerns/virt_who_taxonomy_extensions.rb

@@ -0,0 +1,13 @@
+module VirtWhoTaxonomyExtensions
+  extend ActiveSupport::Concern
+  included do
+    # the order is imporant here, around filter needs to disable audit creation, otherwise config deletion
+    # creates audit during org deletion and creates foreign key issue, the relation must be defined later
+    around_destroy :ignore_auditing_of_config
+    has_many :configs, :dependent => :destroy, :class_name => 'ForemanVirtWhoConfigure::Config'
+
+    def ignore_auditing_of_config
+      ::ForemanVirtWhoConfigure::Config.without_auditing { yield }
+    end
+  end
+end

data/app/models/foreman_virt_who_configure/config.rb

@@ -200,13 +200,13 @@ module ForemanVirtWhoConfigure
     end
 
     def virt_who_config_command
-      "hammer virt-who-config deploy --id #{self.id}"
+      "hammer virt-who-config deploy --id #{self.id} --organization-id #{self.organization_id}"
     end
 
     def virt_who_touch!
       self.last_report_at = DateTime.now.utc
       self.out_of_date_at = self.last_report_at + self.interval.minutes
-      self.save!
+      self.class.skip_permission_check { self.save! }
     end
 
     def status

data/lib/foreman_virt_who_configure/engine.rb

@@ -27,7 +27,7 @@ module ForemanVirtWhoConfigure
 
     initializer 'foreman_virt_who_configure.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_virt_who_configure do
-        requires_foreman '>= 1.18'
+        requires_foreman '>= 1.20'
 
         apipie_documented_controllers ["#{ForemanVirtWhoConfigure::Engine.root}/app/controllers/foreman_virt_who_configure/api/v2/*.rb"]
 
@@ -55,13 +55,14 @@ module ForemanVirtWhoConfigure
         end
 
         begin
-          role 'Virt-who Reporter', reporter_permissions
+          role 'Virt-who Reporter', reporter_permissions, 'Role granting minimal set of permissions for virt-who to upload the report, it can be used if you configure virt-who manually and want to use user that has locked down account.'
         rescue ArgumentError
           # could not configure role, some permissions are missing
         end
 
-        role 'Virt-who Manager', [ :view_virt_who_config, :create_virt_who_config, :edit_virt_who_config, :destroy_virt_who_config ]
-        role 'Virt-who Viewer', [ :view_virt_who_config ]
+        role 'Virt-who Manager',  [ :view_virt_who_config, :create_virt_who_config, :edit_virt_who_config, :destroy_virt_who_config ], 'Role granting all permissions to manage virt-who configurations, user needs this role to create, delete or update configurations.'
+
+        role 'Virt-who Viewer',  [ :view_virt_who_config ], 'Role granting permissions to see all configurations including their configuration scripts, which means viewers could still deploy the virt-who instances for existing virt-who configurations.'
 
         # Available since Foreman 1.15
         add_all_permissions_to_default_roles if respond_to?(:add_all_permissions_to_default_roles)
@@ -101,6 +102,7 @@ module ForemanVirtWhoConfigure
     # Include concerns in this config.to_prepare block
     config.to_prepare do
       SSO::METHODS.unshift SSO::BasicWithHidden
+      ::Organization.send :include, VirtWhoTaxonomyExtensions
     end
 
     rake_tasks do

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Foreman virt-who-configure team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -72,6 +72,7 @@ files:
 - app/helpers/foreman_virt_who_configure/compatibility_helper.rb
 - app/helpers/foreman_virt_who_configure/configs_helper.rb
 - app/lib/actions/foreman_virt_who_configure/config/report.rb
+- app/models/concerns/virt_who_taxonomy_extensions.rb
 - app/models/foreman_virt_who_configure/auth_source_hidden_with_authentication.rb
 - app/models/foreman_virt_who_configure/config.rb
 - app/models/foreman_virt_who_configure/output_generator.rb