sensu-settings 9.10.0 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4130a5c9f9c7f870dade98007e89537935948eaa
-  data.tar.gz: aa739d99b17cccabfd6acbef823e750cf80ff2f0
+  metadata.gz: 72b9dcbda492b08e982b281b94f65be601ef4e5e
+  data.tar.gz: 6dc42379262f05d750e47313827550f6987c82ad
 SHA512:
-  metadata.gz: f48976092495a8ff65573e8e6ce643a43dee64bdc34fc4975167715027a023dfe6fdff5ffff23382a9383905302ade85d274f475b8899ec3b98b34c86b34d21f
-  data.tar.gz: ed2ab15c91f45f7b2a62c0ca418937fdf8f037169cfc0888ccc198548add6bd80b20b006c28d2abe7dc0c09491bf403ec6eb85b91f3c525cb1dda13db4da5e3b
+  metadata.gz: 7bbd5259d726402435eead658c1d828c1aa468c6749c75792e101ccad16cc3717b94ed0a29142a12259b752efbb6c7d565a9c073c8949e295de324d54a745b41
+  data.tar.gz: 8769f81d864f075f38c25a38819f07500e53b1cac93ebda165e384ca8362fe04a068aedc2454b32274bc9209ae9d8ac2b19906ed851de6a6f7ed89f6ebc518dd

data/lib/sensu/settings.rb

@@ -3,6 +3,8 @@ require "sensu/settings/loader"
 module Sensu
   module Settings
     class << self
+      attr_accessor :loader
+
       # Load Sensu settings.
       #
       # Settings are loaded in following order, prior to validation:
@@ -16,26 +18,23 @@ module Sensu
       # @option options [Array] :config_dirs to load.
       # @return [Loader] a loaded instance of Loader.
       def load(options={})
-        @loader = Loader.new
-        @loader.load_env
+        loader = Loader.new
+        loader.load_env
         if options[:config_file]
-          @loader.load_file(options[:config_file], false)
+          loader.load_file(options[:config_file], false)
         end
         if options[:config_dir]
-          @loader.load_directory(options[:config_dir])
+          loader.load_directory(options[:config_dir])
         end
         if options[:config_dirs]
           options[:config_dirs].each do |directory|
-            @loader.load_directory(directory)
+            loader.load_directory(directory)
           end
         end
-        @loader.load_overrides!
-        if @loader.validate.empty?
-          @loader.set_env!
-        end
-        @loader
+        loader.load_overrides!
+        loader
       rescue Loader::Error
-        @loader
+        loader
       end
 
       # Retrieve the current loaded settings loader or load one up if
@@ -45,7 +44,7 @@ module Sensu
       # @param [Hash] options to pass to load().
       # @return [Loader] instance of a loaded loader.
       def get(options={})
-        @loader || load(options)
+        @loader || @loader = load(options)
       end
     end
   end

data/lib/sensu/settings/loader.rb

@@ -2,6 +2,7 @@ require "sensu/settings/validator"
 require "sensu/json"
 require "tmpdir"
 require "socket"
+require "digest"
 
 module Sensu
   module Settings
@@ -91,6 +92,7 @@ module Sensu
       def to_hash
         unless @indifferent_access
           indifferent_access!
+          @hexdigest = nil
         end
         @settings
       end
@@ -104,6 +106,31 @@ module Sensu
         to_hash[key]
       end
 
+      # Create a SHA256 hex digest for the settings Hash object. The
+      # client definition scope is ignored when the current process is
+      # not a Sensu client, as it is essentially ignored and it will
+      # likely cause a sum mismatch between two Sensu service systems.
+      # This method will not recalculate the hex digest, unless the
+      # settings have been altered, determine by the values of
+      # `@hexdigest` and `@indifferent_access`.
+      #
+      # @return [String] SHA256 hex digest.
+      def hexdigest
+        if @hexdigest && @indifferent_access
+          @hexdigest
+        else
+          hash = case sensu_service_name
+          when "client", "rspec"
+            to_hash
+          else
+            to_hash.reject do |key, value|
+              key.to_s == "client"
+            end
+          end
+          @hexdigest = Digest::SHA256.hexdigest(hash.to_s)
+        end
+      end
+
       # Load settings from the environment.
       #
       # Loads: SENSU_TRANSPORT_NAME, RABBITMQ_URL, REDIS_URL,
@@ -180,6 +207,7 @@ module Sensu
           @settings[:client][:subscriptions] << "client:#{@settings[:client][:name]}"
           @settings[:client][:subscriptions].uniq!
           warning("applied sensu client overrides", :client => @settings[:client])
+          @indifferent_access = false
         else
           warning("unable to apply sensu client overrides", {
             :reason => "client subscriptions is not an array",

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "9.10.0"
+  spec.version       = "10.0.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 9.10.0
+  version: 10.0.0
 platform: ruby
 authors:
 - Sean Porter