Commit WIP

Author: Kevin Paulisse

spec/octocatalog-diff/integration/enc_override_spec.rb

@@ -56,7 +56,7 @@
         '--no-parallel',
         '--enc',
         OctocatalogDiff::Spec.fixture_path('repos/enc-overrides/enc.sh'),
-        '--enc-override', 'role=two'
+        '--enc-override', 'parameters::role=two'
       ]
     )
   end
@@ -97,7 +97,7 @@
         '--no-parallel',
         '--enc',
         OctocatalogDiff::Spec.fixture_path('repos/enc-overrides/enc.sh'),
-        '--to-enc-override', 'role=two'
+        '--to-enc-override', 'parameters::role=two'
       ]
     )
   end
@@ -143,7 +143,7 @@
         '--no-parallel',
         '--enc',
         OctocatalogDiff::Spec.fixture_path('repos/enc-overrides/enc.sh'),
-        '--from-enc-override', 'role=two'
+        '--from-enc-override', 'parameters::role=two'
       ]
     )
   end
@@ -189,7 +189,7 @@
         '--no-parallel',
         '--enc',
         OctocatalogDiff::Spec.fixture_path('repos/enc-overrides/enc.sh'),
-        '--enc-override', 'role=two',
+        '--enc-override', 'parameters::role=two',
         '--catalog-only'
       ]
     )
@@ -208,3 +208,54 @@
     expect(@result.log_messages).to include('DEBUG - ENC override: role = "two"')
   end
 end
+
+describe 'ENC override via CLI' do
+  before(:all) do
+    @result = OctocatalogDiff::Integration.integration_cli(
+      [
+        '-n', 'rspec-node.github.net',
+        '--bootstrapped-to-dir', OctocatalogDiff::Spec.fixture_path('repos/enc-overrides'),
+        '--bootstrapped-from-dir', OctocatalogDiff::Spec.fixture_path('repos/enc-overrides'),
+        '--to-enc-override', 'parameters::role=two',
+        '--output-format', 'json',
+        '--fact-file', OctocatalogDiff::Spec.fixture_path('facts/valid-facts.yaml'),
+        '--hiera-config', 'hiera.yaml',
+        '--hiera-path', 'hieradata',
+        '--puppet-binary', OctocatalogDiff::Spec::PUPPET_BINARY,
+        '-d'
+      ]
+    )
+  end
+
+  it 'should exit with status 2' do
+    expect(@result.exitcode).to eq(2), @result.stderr
+  end
+
+  it 'should contain the correct diffs' do
+    parse_result = JSON.parse(@result.stdout)['diff'].map { |x| OctocatalogDiff::Spec.remove_file_and_line(x) }
+    expect(parse_result.size).to eq(2)
+    expect(parse_result).to include(
+      diff_type: '~',
+      type: 'File',
+      title: '/tmp/one',
+      structure: %w(parameters content),
+      old_value: 'two',
+      new_value: 'one'
+    )
+    expect(parse_result).to include(
+      diff_type: '~',
+      type: 'File',
+      title: '/tmp/two',
+      structure: %w(parameters content),
+      old_value: 'two',
+      new_value: 'one'
+    )
+  end
+
+  it 'should log the correct messages' do
+    expect(@result.stderr).to match(/Catalog for . will be built with OctocatalogDiff::Catalog::Computed/)
+    expect(@result.stderr).to match(/Override ipaddress from "10.20.30.40" to "10.30.50.70"/)
+    expect(@result.stderr).to match(/Override foofoo from nil to "barbar"/)
+    expect(@result.stderr).to match(/Diffs computed for rspec-node.github.net/)
+  end
+end