hammer_cli_foreman_virt_who_configure 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 675556beb3ecffcdfb25c8c8abf9e24764d8188a
-  data.tar.gz: 239382fee77faec05ff165595755fdfebc09b56d
+SHA256:
+  metadata.gz: f7c96871810cee34bc4e5b2ac7ff1b15edf614dbc2619b8b07b65cd1b56370a5
+  data.tar.gz: 12687b71a396b7c7293c71f4d1c675bd77ba60a90dd84fb6ac42a4b180da2b1c
 SHA512:
-  metadata.gz: 3c6191c3affd8ffa95480173af1eda0d263d8e3a2ed0c484b644061e01bb425833f913a95987830d0451529e3525223facd253f8d6dbae044ff241635b6ef74a
-  data.tar.gz: 7fdfef029cc203601eed1461daea717172c1dc1dda4e3b72002827d467a23d3fe8bf9fa8c24c5322326325ff06d5795046794041324cc30cc2803ae63a73f052
+  metadata.gz: 24848ae6e6b22fe1ac9d6e20660d0bc7ff59825772bf9d8ed391d8ef4c68a0278e688db91f1a5497df449b9056016e0359a5af5bb6c66840be23a36e99e6d315
+  data.tar.gz: e26889b6dabf00f5659ce741b6351d8f003d26de15102adde7e554d8cea5eae00197fee6e3b65035a5791c43e369b3b3d43bf176e2f849a0784909ca4958783c

data/lib/hammer_cli_foreman_virt_who_configure/config.rb

@@ -69,6 +69,7 @@ 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 :_status, _('Status')
         end
         label _('Schedule') do
@@ -81,9 +82,17 @@ module HammerCLIForemanVirtWhoConfigure
           field :_filtering_mode, _('Filtering')
           field :blacklist, _('Excluded hosts'), Fields::Field, :hide_blank => true
           field :whitelist, _('Filtered hosts'), Fields::Field, :hide_blank => true
+          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
@@ -115,7 +124,7 @@ module HammerCLIForemanVirtWhoConfigure
 
       failure_message _('Could not fetch the Virt Who configuration')
 
-      option ['--output', '-o'], 'FILE', _('File where the script will be written.')
+      option ['-o', '--output'], 'FILE', _('File where the script will be written')
 
       def execute
         data = send_request

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.3'
+    @version ||= Gem::Version.new '0.0.8'
   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.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Tomáš Strachota
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -76,11 +76,11 @@ files:
 - test/functional/test_helper.rb
 - test/test_helper.rb
 - test/unit/system_caller_test.rb
-homepage: http://github.com/theforeman/hammer-cli-foreman-virt-who-configure
+homepage: https://github.com/theforeman/hammer-cli-foreman-virt-who-configure
 licenses:
-- GPL v3+
+- GPL-3.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,19 +95,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Plugin for configuring Virt Who
 test_files:
-- test/data/1.15/foreman_api.json
+- test/functional/test_helper.rb
 - test/functional/config/config_create_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_fetch_test.rb
 - test/functional/config/config_info_test.rb
-- test/functional/test_helper.rb
-- test/test_helper.rb
+- test/functional/config/config_update_test.rb
 - test/unit/system_caller_test.rb
+- test/data/1.15/foreman_api.json
+- test/test_helper.rb