foreman_webhooks 3.2.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 457b89d953e3410524cd3ad5aee4d63ca47192037523ee2c606e69d291e0e8e2
-  data.tar.gz: 9e43a93a35c44a7e8d0d3fdcecef2f4196120645ffe9b0517fba5a3ded221620
+  metadata.gz: 8624e8cbf87d117b0c2af79063eaee6f074c274a7dd80bb77e95f2968b2ef490
+  data.tar.gz: e8815d672c53bccd6b2495d22e72d280cb9aa5ba5c1282de0bb9d38779f5f357
 SHA512:
-  metadata.gz: 7dca14e67eb8d98c5677ecdbb0e11a1a580fa9d6499f4c164aa263668a7709cee10441cd552fb4f0d2b9a74965520d0e4f29f7c311020817e70d4de3af96ca71
-  data.tar.gz: 939a492793d040c4555e73eedf6dc8a66cc4c72121addfdc3ac659ba5642599ad6960c1a3182299e0e98321d7dec52e524b52450d11d0eb5766e546e612a387c
+  metadata.gz: a881ed5043657b90161a2eeba668975e2824ad246b566f4baa9b8ba094ab8504e4bbdd41ad27efa7c55cad4c599577aa5142dca8c0d969556fd117239605514f
+  data.tar.gz: 140c159bf311194d8baace102462969c02e941f06654a0bc8de7362b4d328513844b5a631bfd7eafbad365c395b4f645430593cee70d6a3b2f9246ada5718374

data/app/lib/foreman_webhooks/renderer/scope/webhook_template.rb

@@ -21,14 +21,17 @@ module ForemanWebhooks
         end
 
         apipie :method, 'Creates final payload' do
-          required :hash, Hash, 'Key=value object with with data that should be present in payload'
+          optional :hash, Hash, 'Key:value object with with data that should be present in payload', default: {}
           keyword :with_defaults, [true, false], 'If set to true, adds default entries to the payload', default: true
+          kwlist :kwargs, 'Additional key:value pairs that should be added to the payload'
           returns String, 'JSON string with the final payload'
           example 'payload({ id: @object.id, name: @object.name }) #=> ' \
                   '"{ "id": 1, "name": "host.example.com", "context": { ... }, ' \
                   '"event_name": "host_created.event.foreman" }"'
         end
-        def payload(hash, with_defaults: true)
+        def payload(hash = {}, with_defaults: true, **kwargs)
+          raise ArgumentError, 'The first argument must be either a hash or a comma-separated list with key:value pairs' unless hash.is_a?(Hash)
+          hash.merge!(kwargs)
           hash.merge!(@defaults) if with_defaults
           hash.to_json
         end

data/app/models/webhook.rb

@@ -130,6 +130,7 @@ class Webhook < ApplicationRecord
   end
 
   def rendered_payload(event_name, payload)
+    raise ::Foreman::Exception.new(N_("Webhook template not found while firing webhook '%s'. Possible organization/location mismatch in the webhook template?"), name) if webhook_template.nil?
     webhook_template.render(variables: variables(event_name, payload))
   end
 

data/app/subscribers/foreman_webhooks/event_subscriber.rb

@@ -4,6 +4,8 @@ module ForemanWebhooks
   class EventSubscriber < ::Foreman::BaseSubscriber
     def call(event)
       ::Webhook.deliver(event_name: event.name, payload: event.payload)
+    rescue ::Foreman::Exception => e
+      Rails.logger.error e.message
     end
   end
 end

data/lib/foreman_webhooks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanWebhooks
-  VERSION = "3.2.2"
+  VERSION = "3.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.4
 platform: ruby
 authors:
 - Timo Goebel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2025-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: theforeman-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Plugin for Foreman that allows to configure Webhooks.
 email:
 - mail@timogoebel.name
@@ -253,14 +267,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Configure webhooks for Foreman.