Update to error with --hiera-path plus a datadir in a source

Author: kpaulisse

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

@@ -318,7 +318,16 @@ def update_hiera_config_v5(_logger, options, obj)
           obj[hierarchy_key].each do |level|
             [:datadir, 'datadir'].each do |key|
               next unless level.key?(key)
-              level[key] = hiera_munge(options, level[key])
+              if options[:hiera_path_strip].is_a?(String)
+                level[key] = hiera_munge(options, level[key])
+              elsif options[:hiera_path].is_a?(String)
+                message = [
+                  "Hierarchy item #{level.inspect} has a datadir.",
+                  '--hiera-path is not supported in this situation.',
+                  'Please use --hiera-path-strip.'
+                ].join(' ')
+                raise ArgumentError, message
+              end
             end
           end
         end

spec/octocatalog-diff/tests/catalog-util/builddir_spec.rb

@@ -537,22 +537,15 @@
 
     context 'hiera 5' do
       context 'with hiera_path specified' do
-        it 'should replace hiera path in defaults and hierarchy' do
+        it 'should raise error due to datadir in hierarchy' do
           options = default_options.merge(
             hiera_config: OctocatalogDiff::Spec.fixture_path('repos/default/config/hiera5.yaml'),
             hiera_path: 'hieradata'
           )
           logger, _logger_str = OctocatalogDiff::Spec.setup_logger
-          testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
-          hiera_yaml = File.join(testobj.tempdir, 'hiera.yaml')
-          expect(File.file?(hiera_yaml)).to eq(true)
-          hiera_cfg = YAML.load_file(hiera_yaml)
-          expect(hiera_cfg['defaults']).to eq('datadir' => File.join(testobj.tempdir, '/environments/production/hieradata'))
-          expect(hiera_cfg['hierarchy']).to include('name' => 'fqdn', 'path' => 'servers/%{::fqdn}.yaml')
-          expect(hiera_cfg['hierarchy']).to include('name' => 'datacenter', 'path' => 'datacenter/%{::datacenter}.yaml')
-          expect(hiera_cfg['hierarchy']).to include('name' => 'special',
-                                                    'path' => 'special/%{::operatingsystem}.yaml',
-                                                    'datadir' => File.join(testobj.tempdir, '/environments/production/hieradata'))
+          expect do
+            OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
+          end.to raise_error(ArgumentError, /--hiera-path is not supported in this situation/)
         end
 
         it 'should handle symbolized keys' do
@@ -561,46 +554,47 @@
             hiera_path: 'hieradata'
           )
           logger, _logger_str = OctocatalogDiff::Spec.setup_logger
-          testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
-          hiera_yaml = File.join(testobj.tempdir, 'hiera.yaml')
-          expect(File.file?(hiera_yaml)).to eq(true)
-          hiera_cfg = YAML.load_file(hiera_yaml)
-          expect(hiera_cfg[:defaults]).to eq(datadir: File.join(testobj.tempdir, '/environments/production/hieradata'))
-          expect(hiera_cfg[:hierarchy]).to include(name: 'fqdn', path: 'servers/%{::fqdn}.yaml')
-          expect(hiera_cfg[:hierarchy]).to include(name: 'datacenter', path: 'datacenter/%{::datacenter}.yaml')
-          expect(hiera_cfg[:hierarchy]).to include(name: 'special',
-                                                   path: 'special/%{::operatingsystem}.yaml',
-                                                   datadir: File.join(testobj.tempdir, '/environments/production/hieradata'))
+          expect do
+            OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
+          end.to raise_error(ArgumentError, /--hiera-path is not supported in this situation/)
         end
       end
 
       context 'with hiera_path_strip specified' do
         it 'should replace hiera path in defaults and hierarchy' do
           options = default_options.merge(
             hiera_config: OctocatalogDiff::Spec.fixture_path('repos/default/config/hiera5.yaml'),
-            hiera_path: 'hieradata'
+            hiera_path_strip: '/var/lib/puppet'
           )
           logger, _logger_str = OctocatalogDiff::Spec.setup_logger
           testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
           hiera_yaml = File.join(testobj.tempdir, 'hiera.yaml')
           expect(File.file?(hiera_yaml)).to eq(true)
           hiera_cfg = YAML.load_file(hiera_yaml)
-          expect(hiera_cfg[:backends]).to eq(['yaml'])
-          expect(hiera_cfg[:yaml]).to eq(datadir: File.join(testobj.tempdir, 'environments', 'production', 'hieradata'))
+          expect(hiera_cfg['defaults']).to eq('datadir' => File.join(testobj.tempdir, '/environments/production/hieradata'))
+          expect(hiera_cfg['hierarchy']).to include('name' => 'fqdn', 'path' => 'servers/%{::fqdn}.yaml')
+          expect(hiera_cfg['hierarchy']).to include('name' => 'datacenter', 'path' => 'datacenter/%{::datacenter}.yaml')
+          expect(hiera_cfg['hierarchy']).to include('name' => 'special',
+                                                    'path' => 'special/%{::operatingsystem}.yaml',
+                                                    'datadir' => File.join(testobj.tempdir, '/environments/production/special'))
         end
 
         it 'should handle symbolized keys' do
           options = default_options.merge(
             hiera_config: OctocatalogDiff::Spec.fixture_path('repos/default/config/hiera5-symbols.yaml'),
-            hiera_path: 'hieradata'
+            hiera_path_strip: '/var/lib/puppet'
           )
           logger, _logger_str = OctocatalogDiff::Spec.setup_logger
           testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
           hiera_yaml = File.join(testobj.tempdir, 'hiera.yaml')
           expect(File.file?(hiera_yaml)).to eq(true)
           hiera_cfg = YAML.load_file(hiera_yaml)
-          expect(hiera_cfg[:backends]).to eq(['yaml'])
-          expect(hiera_cfg[:yaml]).to eq(datadir: File.join(testobj.tempdir, 'environments', 'production', 'hieradata'))
+          expect(hiera_cfg['defaults']).to eq('datadir' => File.join(testobj.tempdir, '/environments/production/hieradata'))
+          expect(hiera_cfg['hierarchy']).to include('name' => 'fqdn', 'path' => 'servers/%{::fqdn}.yaml')
+          expect(hiera_cfg['hierarchy']).to include('name' => 'datacenter', 'path' => 'datacenter/%{::datacenter}.yaml')
+          expect(hiera_cfg['hierarchy']).to include('name' => 'special',
+                                                    'path' => 'special/%{::operatingsystem}.yaml',
+                                                    'datadir' => File.join(testobj.tempdir, '/environments/production/special'))
         end
       end
     end