From 15585852365a353b942a24236a8ed7d320a84fbe Mon Sep 17 00:00:00 2001
From: Robin Schneider <robin.schneider@geberit.com>
Date: Fri, 13 Aug 2021 16:17:00 +0200
Subject: [PATCH 1/2] fix: Prevent failure if no files need to be deleted `find
 | xargs rm`

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5d31192597..f0cd237d8a 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ generator: ve
 # Generate Go code from the schema.
 .PHONY: gocodegen
 gocodegen:
-	find code/go/ecs -name '*.go' -not -name 'doc.go' | xargs rm
+	find code/go/ecs -name '*.go' -not -name 'doc.go' -delete
 	cd scripts \
 	  && $(FORCE_GO_MODULES) go run cmd/gocodegen/gocodegen.go \
 	        -version=$(VERSION) \

From 438023e26e02d6e0adab13571f3b0712a3a29a10 Mon Sep 17 00:00:00 2001
From: Eric Beahan <eric.beahan@elastic.co>
Date: Mon, 23 Aug 2021 12:03:35 -0500
Subject: [PATCH 2/2] changelog entry

---
 CHANGELOG.next.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
index 7f9b8939ff..8cc494b9a0 100644
--- a/CHANGELOG.next.md
+++ b/CHANGELOG.next.md
@@ -66,6 +66,10 @@ Thanks, you're awesome :-) -->
 
 * Support ES 6.x type fallback for `match_only_text` field types. #1528
 
+#### Bugfixes
+
+* Prevent failure if no files need to be deleted `find | xargs rm`. #1588
+
 <!-- All empty sections:
 
 ## Unreleased