From 534ac517c95a0df8dbf8e605028dc56f93d3da78 Mon Sep 17 00:00:00 2001
From: Jonathan King <jonathanlking@me.com>
Date: Fri, 7 Jul 2023 01:28:28 +0100
Subject: [PATCH] Update PrefixesSuffixesEquals function

---
 api/resource/resource.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/resource/resource.go b/api/resource/resource.go
index ae1a98be0e..c8405a4af6 100644
--- a/api/resource/resource.go
+++ b/api/resource/resource.go
@@ -291,8 +291,11 @@ func (r *Resource) getCsvAnnotation(name string) []string {
 // as OutermostPrefixSuffix but performs a deeper comparison
 // of the suffix and prefix slices.
 func (r *Resource) PrefixesSuffixesEquals(o ResCtx) bool {
-	return utils.SameEndingSubSlice(r.GetNamePrefixes(), o.GetNamePrefixes()) &&
-		utils.SameEndingSubSlice(r.GetNameSuffixes(), o.GetNameSuffixes())
+	eitherPrefixEmpty := len(r.GetNamePrefixes()) == 0 || len(o.GetNamePrefixes()) == 0
+	eitherSuffixEmpty := len(r.GetNameSuffixes()) == 0 || len(o.GetNameSuffixes()) == 0
+
+	return (eitherPrefixEmpty || utils.SameEndingSubSlice(r.GetNamePrefixes(), o.GetNamePrefixes())) &&
+		(eitherSuffixEmpty || utils.SameEndingSubSlice(r.GetNameSuffixes(), o.GetNameSuffixes()))
 }
 
 // RemoveBuildAnnotations removes annotations created by the build process.