Merge pull request #73 from github/kpaulisse-override-facts

Add additional integration test to fact override, to exercise CLI

Author: kpaulisse

spec/octocatalog-diff/fixtures/cli-configs/no-op.rb

@@ -0,0 +1,9 @@
+# This is a configuration file for octocatalog-diff
+
+module OctocatalogDiff
+  class Config
+    def self.config
+      {}
+    end
+  end
+end

spec/octocatalog-diff/integration/fact_override_spec.rb

@@ -2,6 +2,8 @@
 
 require_relative 'integration_helper'
 
+require 'json'
+
 describe 'fact override integration' do
   # The 'answer' to one of the tests below
   let(:foofoo_params) do
@@ -163,3 +165,59 @@
     end
   end
 end
+
+describe 'fact 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/fact-overrides'),
+        '--bootstrapped-from-dir', OctocatalogDiff::Spec.fixture_path('repos/fact-overrides'),
+        '--to-fact-override', 'ipaddress=10.30.50.70',
+        '--from-fact-override', 'foofoo=barbar',
+        '--output-format', 'json',
+        '--fact-file', OctocatalogDiff::Spec.fixture_path('facts/valid-facts.yaml'),
+        '--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/ipaddress',
+      'structure' => %w(parameters content),
+      'old_value' => '10.20.30.40',
+      'new_value' => '10.30.50.70'
+    )
+    expect(parse_result).to include(
+      'diff_type' => '-',
+      'type' => 'File',
+      'title' => '/tmp/foofoo',
+      'structure' => [],
+      'old_value' => {
+        'type' => 'File',
+        'title' => '/tmp/foofoo',
+        'tags' => %w(class default file node test),
+        'exported' => false,
+        'parameters' => { 'content' => 'barbar' }
+      },
+      'new_value' => nil
+    )
+  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

spec/octocatalog-diff/integration/integration_helper.rb

@@ -3,6 +3,7 @@
 require OctocatalogDiff::Spec.require_path('/errors')
 
 require 'json'
+require 'open3'
 require 'ostruct'
 require 'shellwords'
 require 'stringio'
@@ -29,6 +30,19 @@ def self.integration_with_puppetdb(server_opts, opts)
       ENV['PUPPETDB_URL'] = puppetdb_url_save
     end
 
+    # For an integration test, run the full CLI and get results
+    def self.integration_cli(argv)
+      script = File.expand_path('../../../bin/octocatalog-diff', File.dirname(__FILE__))
+      cmdline = [script, argv].flatten.map { |x| Shellwords.escape(x) }.join(' ')
+      env = { 'OCTOCATALOG_DIFF_CONFIG_FILE' => OctocatalogDiff::Spec.fixture_path('cli-configs/no-op.rb') }
+      stdout, stderr, status = Open3.capture3(env, cmdline)
+      OpenStruct.new(
+        stdout: stdout,
+        stderr: stderr,
+        exitcode: status.exitstatus
+      )
+    end
+
     # For an integration test, run catalog-diff and get results
     def self.integration(options = {})
       # Passed argv -- can be a string or an array

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?(Hash)
+        result = diff.dup
+        %w(new_location old_location new_line old_line new_file old_file).each { |x| result.delete(x) }
+        return result
+      end
       obj = diff if diff.is_a?(Array)
       obj = diff['diff'] if diff.is_a?(Hash) && diff.key?('diff')
       raise ArgumentError, diff.inspect unless obj.is_a?(Array)