Merge pull request #2393 from cloudfoundry/bugfix/resurrection-config…

…-cached-even-if-deleted

deleted bosh config leaves dangling hm rule

src/bosh-monitor/lib/bosh/monitor/resurrection_manager.rb

@@ -16,23 +16,27 @@ def resurrection_enabled?(deployment_name, instance_group)
     end
 
     def update_rules(resurrection_configs)
+      return if resurrection_configs.nil?
+
       new_parsed_rules = []
-      return if resurrection_configs.nil? || resurrection_configs.empty?
 
       resurrection_config_sha = resurrection_configs.map do |resurrection_config|
         Digest::SHA256.digest(resurrection_config['content'])
       end
+
       if @resurrection_config_sha.to_set != resurrection_config_sha.to_set
         @logger.info('Resurrection config update starting...')
 
         resurrection_rule_hashes = resurrection_configs.map do |resurrection_config|
           YAML.safe_load(resurrection_config['content'])['rules']
         end.flatten || []
+
         resurrection_rule_hashes.each do |resurrection_rule_hash|
           new_parsed_rules << ResurrectionRule.parse(resurrection_rule_hash)
         rescue StandardError => e
           @logger.error("Failed to parse resurrection config rule #{resurrection_rule_hash.inspect}: #{e.inspect}")
         end
+
         @parsed_rules = new_parsed_rules
         @resurrection_config_sha = resurrection_config_sha
         @logger.info('Resurrection config update finished')

src/bosh-monitor/spec/unit/bosh/monitor/resurrection_manager_spec.rb

@@ -119,6 +119,31 @@ module Bhm
           expect(resurrection_rules[1].enabled?).to be_falsey
         end
       end
+
+      context 'when resurrection config is an empty array' do
+        it 'deletes existing resurrection rules' do
+          manager.update_rules(resurrection_config)
+          expect(logger).to receive(:info).with('Resurrection config update starting...')
+          expect(logger).to receive(:info).with('Resurrection config update finished')
+          manager.update_rules([])
+          resurrection_rules = manager.instance_variable_get(:@parsed_rules)
+          expect(resurrection_rules.count).to eq(0)
+        end
+      end
+
+      context 'when resurrection config is nil' do
+        it 'uses existing resurrection rules' do
+          expect(logger).to receive(:info).with('Resurrection config update starting...')
+          expect(logger).to receive(:info).with('Resurrection config update finished')
+          manager.update_rules(resurrection_config)
+
+          manager.update_rules(nil)
+          resurrection_rules = manager.instance_variable_get(:@parsed_rules)
+          expect(resurrection_rules.count).to eq(2)
+          expect(resurrection_rules[0].enabled?).to be_truthy
+          expect(resurrection_rules[1].enabled?).to be_falsey
+        end
+      end
     end
 
     describe '#resurrection_enabled?' do