Merge branch 'main' into dependabot/github_actions/anchore/scan-action-6

.github/workflows/ci.yaml

@@ -86,7 +86,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.2.0
+        uses: dependabot/fetch-metadata@v2.3.0
         with:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
 

app/models/hiera_data/config.rb

@@ -29,11 +29,13 @@ def load_content
     end
 
     def initialize_hierarchies
-      @hierarchies = content['hierarchy'].map do |hierarchy|
-        Hierarchy.new(
-          raw_hash: content['defaults'].merge(hierarchy),
-          base_path: @base_path
-        )
+      @hierarchies = content['hierarchy'].filter_map do |hierarchy|
+        unless hierarchy['data_hash'] == 'classifier_data'
+          Hierarchy.new(
+            raw_hash: content['defaults'].merge(hierarchy),
+            base_path: @base_path
+          )
+        end
       end
     end
   end

test/fixtures/files/puppet/environments/enterprise/hiera.yaml

@@ -0,0 +1,6 @@
+---
+version: 5
+
+hierarchy:
+ - name: Classifier Configuration Data
+   data_hash: classifier_data

test/models/environment_test.rb

@@ -6,6 +6,7 @@ class EnvironmentTest < ActiveSupport::TestCase
       development
       dynamic_datadir
       empty_defaults
+      enterprise
       eyaml
       globs
       hdm

test/models/hiera_data/config_test.rb

@@ -70,5 +70,14 @@ def base_path
         Pathname.new(Rails.configuration.hdm["config_dir"]).join("environments", "empty_defaults")
       end
     end
+
+    class ConfigWithClassifierDataHierarchyTest < ActiveSupport::TestCase
+      test "`classifier_data` hierarchy is being ignored" do
+        base_path = Pathname.new(Rails.configuration.hdm["config_dir"]).join("environments", "enterprise")
+        config = HieraData::Config.new(base_path.join("hiera.yaml"))
+
+        assert_equal [], config.hierarchies
+      end
+    end
   end
 end