Add ENC override functionality

Author: Kevin Paulisse

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

@@ -50,10 +50,13 @@ def error_message
       # Override of ENC parameters with parameters specified on the command line.
       # Modifies structures in @enc_obj.
       # @param logger [Logger] Logger object
-      def override_enc_parameters(_logger)
+      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 { |x| merge_enc_param(x.key, x.value) }
+        content_structure = YAML.load(content)
+        @options[:enc_override].each do |x|
+          merge_enc_param(content_structure, "parameters::#{x.key}", x.value)
+          logger.debug "ENC override: #{x.key} #{x.value.nil? ? 'DELETED' : '= ' + x.value.inspect}"
+        end
         @content = content_structure.to_yaml
       end
 
@@ -103,8 +106,8 @@ def execute(logger = nil)
         logger ||= @options[:logger]
         logger ||= Logger.new(StringIO.new)
         @enc_obj.execute(logger) if @enc_obj.respond_to?(:execute)
-        override_enc_parameters(logger)
         @executed = true
+        override_enc_parameters(logger)
       end
     end
   end

spec/octocatalog-diff/integration/enc_override_spec.rb

@@ -53,6 +53,7 @@
       hiera_config: 'hiera.yaml',
       hiera_path: 'hieradata',
       argv: [
+        '--no-parallel',
         '--enc',
         OctocatalogDiff::Spec.fixture_path('repos/enc-overrides/enc.sh'),
         '--enc-override', 'role=two'
@@ -79,10 +80,6 @@
     file_two = to_catalog.resource(type: 'File', title: '/tmp/two')
     expect(file_two['parameters']['content']).to eq('two')
   end
-
-  it 'should log proper messages' do
-    expect(@result.log_messages).to include('DEBUG - ENC override message goes here')
-  end
 end
 
 describe 'ENC override integration with --to-enc-override' do