Display error message if lookup fails #264

betadots · Feb 2, 2024 · ee02fc0 · ee02fc0
1 parent 5c70043
commit ee02fc0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/app/controllers/lookups_controller.rb b/app/controllers/lookups_controller.rb
@@ -5,6 +5,10 @@ class LookupsController < ApplicationController
 
   def show
     @result = @key.lookup(@node)
+  rescue Hdm::Error => error
+    @error = error
+
+    render action: "error"
   end
 
   private

diff --git a/app/views/lookups/error.html.erb b/app/views/lookups/error.html.erb
@@ -0,0 +1,5 @@
+<%= turbo_frame_tag "lookup-result-frame" do %>
+  <p class="alert alert-danger">
+    <%= @error.message %>
+  </p>
+<% end %>
diff --git a/test/fixtures/files/puppet/environments/lookup_tests/data/common.yaml b/test/fixtures/files/puppet/environments/lookup_tests/data/common.yaml
@@ -18,6 +18,7 @@ hdm_nested_hash:
   nested_hash:
     integer: 32
     added_by_common: common
+hdm_mixed_types: 42
 lookup_options:
   '^hdm_duplicates':
     merge: hash
@@ -26,4 +27,6 @@ lookup_options:
   hash_syntax:
     merge:
       strategy: deep
+  hdm_mixed_types:
+    merge: deep
 
diff --git a/.../fixtures/files/puppet/environments/lookup_tests/data/nodes/lookup.betadots.training.yaml b/.../fixtures/files/puppet/environments/lookup_tests/data/nodes/lookup.betadots.training.yaml
@@ -14,3 +14,5 @@ hdm_nested_hash:
   origin: node
   nested_hash:
     integer: 5
+hdm_mixed_types:
+  from_node: 23