Test environment config + global config

Author: kpaulisse

spec/octocatalog-diff/fixtures/repos/hiera5/data/common.yaml

@@ -0,0 +1,4 @@
+---
+test::param_from_node: Should not be displayed from common
+test::param_from_special: Should not be displayed from common
+test::param_from_common: Greets from data/common

spec/octocatalog-diff/fixtures/repos/hiera5/data/nodes/rspec-node.xyz.github.net.yaml

@@ -0,0 +1,2 @@
+---
+test::param_from_nodes: Greets from data/nodes

spec/octocatalog-diff/fixtures/repos/hiera5/data/rspec-node.xyz.github.net.yaml

@@ -0,0 +1,2 @@
+---
+test::param_from_nodes: Greets from data/nodes

spec/octocatalog-diff/fixtures/repos/hiera5/data/xyz.yaml

@@ -0,0 +1,2 @@
+---
+test::param_from_special: This should never be displayed!

spec/octocatalog-diff/fixtures/repos/hiera5/extra-special/xyz.yaml

@@ -0,0 +1,2 @@
+---
+test::param_from_extra_special: Greets from extra-special

spec/octocatalog-diff/fixtures/repos/hiera5/hiera.yaml

@@ -1,7 +1,7 @@
 ---
 version: 5
 defaults:
-  datadir: hieradata
+  datadir: data
   data_hash: yaml_data
 
 hierarchy:
@@ -12,5 +12,9 @@ hierarchy:
     path: "%{::datacenter}.yaml"
     datadir: special
 
+  - name: "Extra-special data"
+    path: "%{::datacenter}.yaml"
+    datadir: extra-special
+
   - name: "Common data"
     path: "common.yaml"

spec/octocatalog-diff/fixtures/repos/hiera5/modules/test/manifests/init.pp

@@ -1,9 +1,11 @@
 class test (
-  $param_from_nodes   = 'hard-coded',
-  $param_from_special = 'hard-coded',
-  $param_from_common  = 'hard-coded'
+  $param_from_nodes         = 'hard-coded',
+  $param_from_special       = 'hard-coded',
+  $param_from_extra_special = 'hard-coded',
+  $param_from_common        = 'hard-coded'
 ) {
   file { '/tmp/nodes': content => $param_from_nodes }
   file { '/tmp/special': content => $param_from_special }
+  file { '/tmp/extra-special': content => $param_from_extra_special }
   file { '/tmp/common': content => $param_from_common }
 }

spec/octocatalog-diff/integration/hiera5_spec.rb

@@ -19,31 +19,10 @@
     end
   end
 
-  context 'with --hiera-path-strip and per-item data directory' do
-    if ENV['PUPPET_VERSION'].start_with?('3')
-      it 'should run but not use hiera values under puppet 3' do
-        argv = ['-n', 'rspec-node.github.net', '--hiera-path-strip', '/var/lib/puppet']
-        hash = {
-          hiera_config: 'config/hiera5-global.yaml',
-          spec_fact_file: 'facts.yaml',
-          spec_repo: 'hiera5',
-          spec_catalog_old: 'catalog-empty.json'
-        }
-        result = OctocatalogDiff::Integration.integration(hash.merge(argv: argv))
-        expect(result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(result)
-
-        to_catalog = result.to
-
-        param1 = { 'content' => 'hard-coded' }
-        expect(to_catalog.resource(type: 'File', title: '/tmp/nodes')['parameters']).to eq(param1)
-
-        param2 = { 'content' => 'hard-coded' }
-        expect(to_catalog.resource(type: 'File', title: '/tmp/special')['parameters']).to eq(param2)
-
-        param3 = { 'content' => 'hard-coded' }
-        expect(to_catalog.resource(type: 'File', title: '/tmp/common')['parameters']).to eq(param3)
-      end
-    else
+  if ENV['PUPPET_VERSION'].start_with?('3')
+    # Hiera 5 tests are not applicable
+  else
+    context 'with --hiera-path-strip and per-item data directory' do
       it 'should succeed in building the catalog' do
         argv = ['-n', 'rspec-node.github.net', '--hiera-path-strip', '/var/lib/puppet']
         hash = {
@@ -57,6 +36,7 @@
 
         to_catalog = result.to
 
+        # Global configuration overrides environment configuration
         param1 = { 'content' => 'Greets from nodes' }
         expect(to_catalog.resource(type: 'File', title: '/tmp/nodes')['parameters']).to eq(param1)
 
@@ -65,13 +45,15 @@
 
         param3 = { 'content' => 'Greets from common' }
         expect(to_catalog.resource(type: 'File', title: '/tmp/common')['parameters']).to eq(param3)
+
+        # Comes from environment because there is no global configuration
+        param4 = { 'content' => 'Greets from extra-special' }
+        expect(to_catalog.resource(type: 'File', title: '/tmp/extra-special')['parameters']).to eq(param4)
       end
     end
-  end
 
-  context 'with hiera 5 non-global, environment specific configuration' do
-    if ENV['PUPPET_VERSION'].start_with?('3')
-      it 'should run but not use hiera values under puppet 3' do
+    context 'with hiera 5 non-global, environment specific configuration' do
+      it 'should succeed in building the catalog and have proper diffs' do
         argv = ['-n', 'rspec-node.github.net']
         hash = {
           spec_fact_file: 'facts.yaml',
@@ -83,36 +65,18 @@
 
         to_catalog = result.to
 
-        param1 = { 'content' => 'hard-coded' }
-        expect(to_catalog.resource(type: 'File', title: '/tmp/nodes')['parameters']).to eq(param1)
-
-        param2 = { 'content' => 'hard-coded' }
-        expect(to_catalog.resource(type: 'File', title: '/tmp/special')['parameters']).to eq(param2)
-
-        param3 = { 'content' => 'hard-coded' }
-        expect(to_catalog.resource(type: 'File', title: '/tmp/common')['parameters']).to eq(param3)
-      end
-    else
-      it 'should succeed in building the catalog' do
-        argv = ['-n', 'rspec-node.github.net']
-        hash = {
-          spec_fact_file: 'facts.yaml',
-          spec_repo: 'hiera5',
-          spec_catalog_old: 'catalog-empty.json'
-        }
-        result = OctocatalogDiff::Integration.integration(hash.merge(argv: argv))
-        expect(result.exitcode).to eq(2), OctocatalogDiff::Integration.format_exception(result)
-
-        to_catalog = result.to
-
-        param1 = { 'content' => 'Greets from nodes' }
+        # All come from environment
+        param1 = { 'content' => 'Greets from data/nodes' }
         expect(to_catalog.resource(type: 'File', title: '/tmp/nodes')['parameters']).to eq(param1)
 
         param2 = { 'content' => 'Greets from special' }
         expect(to_catalog.resource(type: 'File', title: '/tmp/special')['parameters']).to eq(param2)
 
-        param3 = { 'content' => 'Greets from common' }
+        param3 = { 'content' => 'Greets from data/common' }
         expect(to_catalog.resource(type: 'File', title: '/tmp/common')['parameters']).to eq(param3)
+
+        param4 = { 'content' => 'Greets from extra-special' }
+        expect(to_catalog.resource(type: 'File', title: '/tmp/extra-special')['parameters']).to eq(param4)
       end
     end
   end