foreman_maintain 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a459203e886ab2569e44fe1248dcc5e678e9cb2752bee8d6ff1454687a3811b
-  data.tar.gz: 94d4ef1cd297ed24fde199194215e2ab5f1b799ec33b60335e1dc94835a9b48b
+  metadata.gz: ae5019f17555d2bd1f46cb58469c2a8e9134a7b0723628a08f27ed918703dc53
+  data.tar.gz: f12b8fbf32055f25abd89ba4c9a8ed72cb26438db24c0bfd143cb0fe52204d48
 SHA512:
-  metadata.gz: cc7422d890bf9637fa08f6efd8c8f5877371d14575746cd2d0e79771fe98aac99edd0aa8a591f86ff236f300723e1507e4dbae41c0d996d81049f31e187d2289
-  data.tar.gz: 24a5d18d3154143f4091777dd57f2f162736d1fdf83e1327062029f36601e78e48c6ca7feb1f812d7e1a5350de2634136dee07eb3eff22012810cf28982448e9
+  metadata.gz: b160fc0f48f6a873ea32596abd608f21976e06e6505fe1cc909b3000df0fdd6c41df713fa02f2e5280d2b2abfe923efe3a2c440036f53d0c5348c018fb740594
+  data.tar.gz: 382123bb454e8afcb46e375c5fd52ead52081ffb76ba2ceac6cbd4896e9d9d1fb4e5f9d2d7dc16f1b22362a57877782017165b1baa3cb69f87e10a2402a0802a

data/definitions/checks/foreman/check_checkpoint_segments.rb

@@ -18,31 +18,39 @@ module Checks
       # rubocop:disable Metrics/MethodLength
       def check_custom_hiera
         hiera_file = feature(:installer).custom_hiera_file
-        if (config = YAML.load_file(hiera_file)) &&
-           config.key?('postgresql::server::config_entries')
-          if config['postgresql::server::config_entries'].nil?
-            return <<-MESSAGE.strip_heredoc
-            ERROR: 'postgresql::server::config_entries' cannot be null.
-            Please remove it from following file and re-run the command.
-            - #{hiera_file}
-            MESSAGE
-          elsif config['postgresql::server::config_entries'].key?('checkpoint_segments')
-            message = <<-MESSAGE.strip_heredoc
-            ERROR: Tuning option 'checkpoint_segments' found.
-            This option is no longer valid for PostgreSQL 9.5 or newer.
-            Please remove it from following file and re-run the command.
-            - #{hiera_file}
-            MESSAGE
-            if feature(:katello)
-              message += <<-MESSAGE.strip_heredoc
-              The presence of checkpoint_segments in #{hiera_file} indicates manual tuning.
-              Manual tuning can override values provided by the --tuning parameter.
-              Review #{hiera_file} for values that are already provided by the built in tuning profiles.
-              Built in tuning profiles also provide a supported upgrade path.
+        begin
+          config = YAML.load_file(hiera_file)
+          if config.is_a?(Hash) && config.key?('postgresql::server::config_entries')
+            if config['postgresql::server::config_entries'].nil?
+              return <<-MESSAGE.strip_heredoc
+              ERROR: 'postgresql::server::config_entries' cannot be null.
+              Please remove it from following file and re-run the command.
+              - #{hiera_file}
               MESSAGE
+            elsif config['postgresql::server::config_entries'].key?('checkpoint_segments')
+              message = <<-MESSAGE.strip_heredoc
+              ERROR: Tuning option 'checkpoint_segments' found.
+              This option is no longer valid for PostgreSQL 9.5 or newer.
+              Please remove it from following file and re-run the command.
+              - #{hiera_file}
+              MESSAGE
+              if feature(:katello)
+                message += <<-MESSAGE.strip_heredoc
+                The presence of checkpoint_segments in #{hiera_file} indicates manual tuning.
+                Manual tuning can override values provided by the --tuning parameter.
+                Review #{hiera_file} for values that are already provided by the built in tuning profiles.
+                Built in tuning profiles also provide a supported upgrade path.
+                MESSAGE
+              end
+              return message
             end
-            return message
+          elsif config.is_a?(String)
+            fail! "Error: File #{hiera_file} is not a yaml file."
+            exit 1
           end
+        rescue Psych::SyntaxError
+          fail! "Found syntax error in file: #{hiera_file}"
+          exit 1
         end
       end
       # rubocop:enable Metrics/MethodLength

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.6.13'.freeze
+  VERSION = '0.6.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -405,7 +405,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt