hammer_cli_foreman_virt_who_configure 0.0.5 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ee53d10c25c7bb73cf7ec8bb3d7f8fc3dcbea957cc4ccde0652ce37c5aa9660
-  data.tar.gz: 7bde63d3680ca55eedf00df46f800b08d0858c3934b995585ee515cb5e408d66
+  metadata.gz: 36e2261f8c32cd0906a348f9920af4f7cbd8acd74ad7c78447c48e020a42a925
+  data.tar.gz: cd292789c8ceea3321fb0a091ba190dbe489f2fcc4b7937ba35a58698748af0b
 SHA512:
-  metadata.gz: 7794300b03933db3ffa7438863ea2e98c10b9a13608109f567deef76911afe9741e6e755df11d8b6068c7773c3c72a714764e82e8be1d4f41217071dcee5c67c
-  data.tar.gz: a394bf2a667af20930679c72875164f684cdc2b8116d972de7e73153d58cf0bfb36ff0d000a4ac873d809e6502939fbec02e79f5828d94d17e568bc9c7c7ea10
+  metadata.gz: d71a9bf91cde3e5840bf83b4ed13cf00f20ccc5b670fc601b9cce0728806f66bab53ee0b8a5c9a8a5c7b0811648dd3dbc3558f238b2f1055754a37a291814ab2
+  data.tar.gz: 93dfa03a8a0fa04c0fca4a90c4f7352d8d949a2862ae7f18cd9937815aec74cca48c99e1a724e3eed7e5c92c4f02d47e6f61d7804756a609bf1cc03ff52a0799

data/lib/hammer_cli_foreman_virt_who_configure/config.rb

@@ -43,6 +43,12 @@ module HammerCLIForemanVirtWhoConfigure
       end
     end
 
+    def self.validate_hypervisor_options(conf)
+      options = conf["hypervisor_type"] == 'kubevirt' ? %w(hypervisor_server hypervisor_username) : %w(kubeconfig_path)
+      options.append("prism_flavor", "ahv_update_interval", "ahv_internal_debug") unless conf["hypervisor_type"] == 'ahv'
+      conf.delete_if { |k, v| options.include?(k) }
+    end
+
     class ListCommand < HammerCLIForeman::ListCommand
       output do
         field :id, _('Id')
@@ -69,6 +75,10 @@ module HammerCLIForemanVirtWhoConfigure
           field :hypervisor_type, _('Hypervisor type')
           field :hypervisor_server, _('Hypervisor server')
           field :hypervisor_username, _('Hypervisor username')
+          field :kubeconfig_path, _('Configuration file'), Fields::Field, :hide_blank => true
+          field :prism_flavor, _('AHV Prism flavor'), Fields::Field, :hide_blank => true
+          field :ahv_update_interval, _('AHV update frequency'), Fields::Field, :hide_blank => true
+          field :ahv_internal_debug, _('Enable AHV debug'), Fields::Boolean
           field :_status, _('Status')
         end
         label _('Schedule') do
@@ -84,8 +94,14 @@ module HammerCLIForemanVirtWhoConfigure
           field :filter_host_parents, _('Filter host parents'), Fields::Field, :hide_blank => true
           field :exclude_host_parents, _('Exclude host parents'), Fields::Field, :hide_blank => true
           field :debug, _('Debug mode'), Fields::Boolean
-          field :proxy, _('HTTP proxy')
-          field :no_proxy, _('Ignore proxy')
+          field :no_proxy, _('Ignore proxy'), Fields::Field, :hide_blank => true
+        end
+        label _('HTTP Proxy') do
+          from :http_proxy do
+            field :id, _('HTTP proxy ID'), Fields::Field, :hide_blank => true
+            field :name, _('HTTP proxy name'), Fields::Field, :hide_blank => true
+            field :url, _('HTTP proxy URL'), Fields::Field, :hide_blank => true
+          end
         end
         HammerCLIForeman::References.taxonomies(self)
       end
@@ -105,7 +121,7 @@ module HammerCLIForemanVirtWhoConfigure
         else
           conf['blacklist'] ||= " "
         end
-        conf
+        VirtWhoConfig.validate_hypervisor_options(conf)
       end
 
       build_options

data/lib/hammer_cli_foreman_virt_who_configure/system_caller.rb

@@ -1,15 +1,27 @@
 module HammerCLIForemanVirtWhoConfigure
   class SystemCaller
+    WHITELISTED_VARS = %w[HOME USER LANG].freeze
+
     def initialize(tempfile = nil)
       @tempfile = tempfile || Tempfile.new('virt_who')
     end
 
-    def system(commad)
+    def clean_env_vars
+      # Cleaning ENV vars and keeping required vars only because,
+      # When using SCL it adds GEM_HOME and GEM_PATH ENV vars.
+      # These vars break foreman-maintain tool.
+      # This way we use system ruby to execute the bash script.
+      cleaned_env = ENV.select { |var| WHITELISTED_VARS.include?(var) || var.start_with?('LC_') }
+      cleaned_env['PATH'] = '/sbin:/bin:/usr/sbin:/usr/bin'
+      cleaned_env
+    end
+
+    def system(command)
       result = nil
       begin
-        @tempfile.write(commad)
+        @tempfile.write(command)
         @tempfile.flush # to make sure the command is complete
-        result = Kernel.system("/usr/bin/bash #{@tempfile.path}")
+        result = Kernel.system(clean_env_vars, "/usr/bin/bash #{@tempfile.path}", unsetenv_others: true)
       ensure
         @tempfile.close
         @tempfile.unlink

data/lib/hammer_cli_foreman_virt_who_configure/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanVirtWhoConfigure
   def self.version
-    @version ||= Gem::Version.new '0.0.5'
+    @version ||= Gem::Version.new '0.0.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.9
 platform: ruby
 authors:
 - Tomáš Strachota
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -80,7 +80,7 @@ homepage: https://github.com/theforeman/hammer-cli-foreman-virt-who-configure
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,18 +95,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Plugin for configuring Virt Who
 test_files:
-- test/unit/system_caller_test.rb
-- test/test_helper.rb
-- test/functional/test_helper.rb
 - test/functional/config/config_info_test.rb
-- test/functional/config/config_deploy_test.rb
-- test/functional/config/config_list_test.rb
 - test/functional/config/config_update_test.rb
-- test/functional/config/config_create_test.rb
+- test/functional/config/config_list_test.rb
+- test/functional/config/config_deploy_test.rb
 - test/functional/config/config_fetch_test.rb
+- test/functional/config/config_create_test.rb
+- test/functional/test_helper.rb
+- test/unit/system_caller_test.rb
+- test/test_helper.rb
 - test/data/1.15/foreman_api.json