Add missing hostname attribute

boxcutter · Apr 20, 2024 · 2469900 · 2469900
1 parent 79468ee
commit 2469900
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/cookbooks/boxcutter_tailscale/libraries/default.rb b/cookbooks/boxcutter_tailscale/libraries/default.rb
@@ -6,8 +6,16 @@ module Helpers
       include Chef::Mixin::ShellOut
 
       def load_config
-        result = shell_out!('/usr/bin/tailscale debug prefs')
-        JSON.parse(result.stdout)
+        begin
+          result = shell_out!('/usr/bin/tailscale debug prefs')
+          JSON.parse(result.stdout)
+        rescue Mixlib::ShellOut::ShellCommandFailed => e
+          Chef::Log.error("boxcutter_tailscale: load_config() failed to execute command: #{e.message}")
+          return nil
+        rescue JSON::ParserError => e
+          Chef::Log.error("boxcutter_tailscale: load_config() JSON parsing failed: #{e.message}")
+          return nil
+        end
       end
     end
   end

diff --git a/cookbooks/boxcutter_tailscale/recipes/default.rb b/cookbooks/boxcutter_tailscale/recipes/default.rb
@@ -32,6 +32,7 @@
 end
 
 boxcutter_tailscale 'default' do
+  hostname lazy { node['boxcutter_tailscale']['hostname'] }
   api_base_url lazy { node['boxcutter_tailscale']['api_base_url'] }
   tailnet lazy { node['boxcutter_tailscale']['tailnet'] }
   ephemeral lazy { node['boxcutter_tailscale']['ephemeral'] }