From 9ed72539b5abbc2a970767b4bb9616356b1ffa76 Mon Sep 17 00:00:00 2001
From: Andreas Zuber <zuber@puzzle.ch>
Date: Wed, 6 Nov 2019 15:01:05 +0100
Subject: [PATCH] Report sanitizer: Add 'kind' if missing

Puppetserver seems to remove 'kind' even from older formats than format
6 when forwarding the report, even if the original reports contains the
key.
---
 lib/puppet/report_sanitizer.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/puppet/report_sanitizer.rb b/lib/puppet/report_sanitizer.rb
index 8d8249224..7ca0a0437 100644
--- a/lib/puppet/report_sanitizer.rb
+++ b/lib/puppet/report_sanitizer.rb
@@ -357,6 +357,8 @@ def initialize(
     end
 
     def sanitize(raw)
+      # Puppetserver seems to remove 'kind' even from format version 6 reports.
+      raw['kind'] ||= 'apply'
       sanitized = super
       raw['master_used'] ||= nil
       Util.verify_attributes(raw, %w[noop noop_pending corrective_change master_used])