Add regexp overrides to ENC too

Author: kpaulisse

lib/octocatalog-diff/catalog-util/enc.rb

@@ -65,8 +65,11 @@ def override_enc_parameters(logger)
         return unless @options[:enc_override].is_a?(Array) && @options[:enc_override].any?
         content_structure = YAML.load(content)
         @options[:enc_override].each do |x|
-          merge_enc_param(content_structure, x.key, x.value)
-          logger.debug "ENC override: #{x.key} #{x.value.nil? ? 'DELETED' : '= ' + x.value.inspect}"
+          keys = x.key.is_a?(Regexp) ? content_structure.keys.select { |y| x.key.match(y) } : [x.key]
+          keys.each do |key|
+            merge_enc_param(content_structure, key, x.value)
+            logger.debug "ENC override: #{key} #{x.value.nil? ? 'DELETED' : '= ' + x.value.inspect}"
+          end
         end
         @content = content_structure.to_yaml
       end

spec/octocatalog-diff/tests/catalog-util/enc_spec.rb

@@ -154,6 +154,19 @@
       logs = @logger_str.string.split(/\n/).compact.map { |x| OctocatalogDiff::Spec.strip_log_message(x) }
       expect(logs).to include('DEBUG - ENC override: foo = "bar"')
     end
+
+    it 'should handle regexp overrides' do
+      options = {
+        enc_override: [OctocatalogDiff::API::V1::Override.create_from_input('/o+/=(string)bar')]
+      }
+      subject = described_class.allocate
+      subject.instance_variable_set('@options', options)
+      subject.instance_variable_set('@content', "---\nfoo: baz\nfizz: buzz\n")
+      subject.send(:override_enc_parameters, @logger)
+      expect(subject.instance_variable_get('@content')).to eq("---\nfoo: bar\nfizz: buzz\n")
+      logs = @logger_str.string.split(/\n/).compact.map { |x| OctocatalogDiff::Spec.strip_log_message(x) }
+      expect(logs).to include('DEBUG - ENC override: foo = "bar"')
+    end
   end
 
   describe '#merge_enc_param' do