Make hiera config specifiable per branch

Author: kpaulisse

lib/octocatalog-diff/cli.rb

@@ -70,8 +70,14 @@ def self.cli(argv = ARGV, logger = Logger.new(STDERR), opts = {})
       # Note: do NOT use 'options[k] ||= v' here because if the value of options[k] is boolean(false)
       # it will then be overridden. Whereas the intent is to define values only for those keys that don't exist.
       opts.each { |k, v| options[k] = v unless options.key?(k) }
-      veto_options = %w(enc header hiera_config include_tags)
+      veto_options = %w(enc header include_tags)
       veto_options.each { |x| options.delete(x.to_sym) if options["no_#{x}".to_sym] }
+      if options[:no_hiera_config]
+        vetoes = %w[hiera_config to_hiera_config from_hiera_config]
+        vetoes.each do |key|
+          options.delete(key.to_sym)
+        end
+      end
       options[:ignore].concat opts.fetch(:additional_ignores, [])
 
       # Incorporate default options where needed.

lib/octocatalog-diff/cli/options/hiera_config.rb

@@ -7,13 +7,21 @@
   has_weight 180
 
   def parse(parser, options)
-    parser.on('--hiera-config PATH', 'Relative path to hiera YAML file') do |path_in|
-      raise ArgumentError, '--no-hiera-config incompatible with --hiera-config' if options[:no_hiera_config]
-      options[:hiera_config] = path_in
-    end
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
+      parser: parser,
+      options: options,
+      cli_name: 'hiera-config',
+      option_name: 'hiera_config',
+      desc: 'Full or relative path to global Hiera configuration file',
+      post_process: lambda do |opts|
+        raise ArgumentError, '--no-hiera-config incompatible with --hiera-config' if opts[:no_hiera_config]
+      end
+    )
 
     parser.on('--no-hiera-config', 'Disable hiera config file installation') do
-      raise ArgumentError, '--no-hiera-config incompatible with --hiera-config' if options[:hiera_config]
+      if options[:to_hiera_config] || options[:from_hiera_config]
+        raise ArgumentError, '--no-hiera-config incompatible with --hiera-config'
+      end
       options[:no_hiera_config] = true
     end
   end

spec/octocatalog-diff/tests/cli/options/hiera_config_spec.rb

@@ -6,10 +6,14 @@
   describe '#opt_hiera_config' do
     it 'should handle --hiera-config' do
       result = run_optparse(['--hiera-config', 'adflkadfs'])
-      expect(result[:hiera_config]).to eq('adflkadfs')
+      expect(result[:to_hiera_config]).to eq('adflkadfs')
+      expect(result[:from_hiera_config]).to eq('adflkadfs')
       expect(result.key?(:no_hiera_config)).to eq(false)
     end
 
+    it 'should handle separate to and from hiera config arguments' do
+    end
+
     it 'should handle --no-hiera-config' do
       result = run_optparse(['--no-hiera-config'])
       expect(result.key?(:hiera_config)).to eq(false)

spec/octocatalog-diff/tests/cli_spec.rb

@@ -18,6 +18,33 @@
   end
 
   describe '#cli' do
+    context 'with --no-hiera-config' do
+      it 'should not pass a hiera config file' do
+        opts = { hiera_config: 'abcdefg', to_hiera_config: 'xyz123', from_hiera_config: 'qwerty' }
+        argv = ['--no-hiera-config', '--catalog-only']
+        answer = {
+          ignore: [{ type: 'Class' }],
+          no_hiera_config: true,
+          catalog_only: true,
+          from_env: 'origin/master',
+          to_env: '.',
+          colors: true,
+          debug: false,
+          quiet: false,
+          format: :color_text,
+          display_source_file_line: false,
+          compare_file_text: true,
+          display_datatype_changes: true,
+          parallel: true,
+          suppress_absent_file_details: true,
+          hiera_path: 'hieradata'
+        }
+        logger, _logger_str = OctocatalogDiff::Spec.setup_logger
+        expect(described_class).to receive(:catalog_only).with(logger, answer)
+        OctocatalogDiff::Cli.cli(argv, logger, opts)
+      end
+    end
+
     context 'Additional ARGV' do
       let(:default_argv) do
         [