Write --to-enc-override and --from-enc-override

Author: Kevin Paulisse

spec/octocatalog-diff/integration/enc_override_spec.rb

@@ -87,10 +87,124 @@
 end
 
 describe 'ENC override integration with --to-enc-override' do
+  before(:all) do
+    @result = OctocatalogDiff::Integration.integration(
+      spec_repo: 'enc-overrides',
+      spec_fact_file: 'valid-facts.yaml',
+      hiera_config: 'hiera.yaml',
+      hiera_path: 'hieradata',
+      argv: [
+        '--no-parallel',
+        '--enc',
+        OctocatalogDiff::Spec.fixture_path('repos/enc-overrides/enc.sh'),
+        '--to-enc-override', 'role=two'
+      ]
+    )
+  end
+
+  it 'should succeed' do
+    expect(@result.exitcode).not_to eq(-1), OctocatalogDiff::Integration.format_exception(@result)
+    expect(@result.exitcode).to eq(2), "Runtime error: #{@result.logs}"
+  end
+
+  it 'should show expected changes' do
+    diffs = @result.diffs.map { |x| OctocatalogDiff::Spec.remove_file_and_line(x) }
+    expect(diffs).to include(
+      diff_type: '~',
+      type: 'File',
+      title: '/tmp/one',
+      structure: %w(parameters content),
+      old_value: 'one',
+      new_value: 'two'
+    )
+    expect(diffs).to include(
+      diff_type: '~',
+      type: 'File',
+      title: '/tmp/two',
+      structure: %w(parameters content),
+      old_value: 'one',
+      new_value: 'two'
+    )
+  end
+
+  it 'should log proper messages' do
+    expect(@result.log_messages).to include('DEBUG - ENC override: role = "two"')
+  end
 end
 
 describe 'ENC override integration with --from-enc-override' do
+  before(:all) do
+    @result = OctocatalogDiff::Integration.integration(
+      spec_repo: 'enc-overrides',
+      spec_fact_file: 'valid-facts.yaml',
+      hiera_config: 'hiera.yaml',
+      hiera_path: 'hieradata',
+      argv: [
+        '--no-parallel',
+        '--enc',
+        OctocatalogDiff::Spec.fixture_path('repos/enc-overrides/enc.sh'),
+        '--from-enc-override', 'role=two'
+      ]
+    )
+  end
+
+  it 'should succeed' do
+    expect(@result.exitcode).not_to eq(-1), OctocatalogDiff::Integration.format_exception(@result)
+    expect(@result.exitcode).to eq(2), "Runtime error: #{@result.logs}"
+  end
+
+  it 'should show expected changes' do
+    diffs = @result.diffs.map { |x| OctocatalogDiff::Spec.remove_file_and_line(x) }
+    expect(diffs).to include(
+      diff_type: '~',
+      type: 'File',
+      title: '/tmp/one',
+      structure: %w(parameters content),
+      old_value: 'two',
+      new_value: 'one'
+    )
+    expect(diffs).to include(
+      diff_type: '~',
+      type: 'File',
+      title: '/tmp/two',
+      structure: %w(parameters content),
+      old_value: 'two',
+      new_value: 'one'
+    )
+  end
+
+  it 'should log proper messages' do
+    expect(@result.log_messages).to include('DEBUG - ENC override: role = "two"')
+  end
 end
 
 describe 'ENC override integration with catalog compilation only' do
+  before(:all) do
+    @result = OctocatalogDiff::Integration.integration(
+      spec_repo: 'enc-overrides',
+      spec_fact_file: 'valid-facts.yaml',
+      hiera_config: 'hiera.yaml',
+      hiera_path: 'hieradata',
+      argv: [
+        '--no-parallel',
+        '--enc',
+        OctocatalogDiff::Spec.fixture_path('repos/enc-overrides/enc.sh'),
+        '--enc-override', 'role=two',
+        '--catalog-only'
+      ]
+    )
+  end
+
+  it 'should succeed' do
+    expect(@result.exitcode).not_to eq(-1), OctocatalogDiff::Integration.format_exception(@result)
+    expect(@result.exitcode).to eq(0), "Runtime error: #{@result.logs}"
+  end
+
+  it 'should show no changes' do
+    expect(@result.to).to eq([])
+  end
+
+  it 'should log proper messages' do
+    expect(@result.log_messages).to include('DEBUG - ENC override: role = "two"')
+  end
 end

spec/octocatalog-diff/tests/spec_helper.rb

@@ -217,6 +217,11 @@ def self.setup_logger
     # remove the file and line locations. This takes the JSON result from catalog-diff and returns
     # a cleaned-up array of diffs.
     def self.remove_file_and_line(diff)
+      if diff.is_a?(OctocatalogDiff::API::V1::Diff)
+        result = diff.to_h.dup
+        %w(new_location old_location new_line old_line new_file old_file).each { |x| result.delete(x.to_sym) }
+        return result
+      end
       if diff.is_a?(Hash)
         result = diff.dup
         %w(new_location old_location new_line old_line new_file old_file).each { |x| result.delete(x) }