foreman_maintain 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c41499ac6685ff43c89736a3d159f9b969315668d09bf03c3d4e2517d76a6a8
-  data.tar.gz: fb8ba4ab1265156bb620852859ef7ef962abd403d93c72bfa35e1c5de9a40014
+  metadata.gz: 90eacd73fa55b32a916a21202f5505f5b23aeacb8669815807c467a1a3a59099
+  data.tar.gz: 6c5fdb1c2ced614672d721ea3eedf4fa87240be901371fb16deecfeccdb84896
 SHA512:
-  metadata.gz: a60e3f5ea25daf3ce10ba16bb48135da6d27cb623c206a990cf6cab092b1e9cf450644973eef1da0c3ab5d5567d506af39b201887afe05d346e59275f273eb5e
-  data.tar.gz: 05bbaba6dd6ddad08aa20da138c105b9931d64e1d7453d2256036abc22b7f381a1e01f7df6fc83dd036744ed50e76cb2e5479dd3c026346e0a5d4f66a7a8c80d
+  metadata.gz: 18d9c5e18cc69d58d874201ec26366f7fb3444cb62162d61944344aa4783ecfffda9b6e232e58303df6da9cf51ea4f0e28bb7262e3b77bc0f91bc09ebaaf5412
+  data.tar.gz: 629d81c5ee075d1ce030594d5ac2bec6111c286ff4a54b7adf85c2105e146a73711e67ce2bf7279930294c225e404d9cfb4b50737e99d3648e6d5d00a5ac383b

data/definitions/checks/env_proxy.rb

@@ -0,0 +1,13 @@
+class Checks::EnvProxy < ForemanMaintain::Check
+  metadata do
+    label :env_proxy
+    tags :env_proxy
+    description 'Check to make sure no HTTP(S) proxy set in ENV'
+  end
+
+  def run
+    variables = %w[http_proxy https_proxy HTTP_PROXY HTTPS_PROXY]
+    has_proxy_set = true if variables.map { |variable| ENV[variable] }.compact.any?
+    assert(has_proxy_set, 'Global HTTP(S) proxy in environment (env) is set. Please unset first!')
+  end
+end

data/definitions/scenarios/packages.rb

@@ -1,7 +1,10 @@
 module ForemanMaintain::Scenarios
   module Packages
     def self.skip_installer_run?(packages_list)
-      packages_list = packages_list.split(',').map(&:strip) if packages_list.is_a?(String)
+      if packages_list.is_a?(String)
+        packages_list = packages_list.split(',').map(&:strip)
+      end
+      packages_list ||= []
 
       return false unless packages_list.any? { |p| p.include?('foreman_maintain') }
       return true if packages_list.length == 1

data/lib/foreman_maintain/concerns/downstream.rb

@@ -97,23 +97,19 @@ module ForemanMaintain
       end
 
       def common_repos(rh_version_major, full_version)
-        repos_arrary = common_repos_array(rh_version_major, full_version)
+        repos_arrary = if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
+                         ["rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms",
+                          "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"]
+                       else
+                         ["rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms",
+                          "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}-rpms"]
+                       end
+
         return repos_arrary.first(1) if feature(:capsule)
 
         repos_arrary
       end
 
-      def common_repos_array(rh_version_major, full_version)
-        ["rhel-#{rh_version_major}-server-satellite-maintenance-6#{use_beta}-rpms",
-         "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}#{use_beta}-rpms"]
-      end
-
-      def use_beta
-        return '-beta' if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-
-        nil
-      end
-
       def main_rh_repos(rh_version_major)
         ["rhel-#{rh_version_major}-server-rpms",
          "rhel-server-rhscl-#{rh_version_major}-rpms"]

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.6.6'.freeze
+  VERSION = '0.6.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -126,6 +126,7 @@ files:
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/performance.rb
+- definitions/checks/env_proxy.rb
 - definitions/checks/foreman/check_corrupted_roles.rb
 - definitions/checks/foreman/check_duplicate_roles.rb
 - definitions/checks/foreman/db_up.rb