Merge pull request #489 from akgalwas/fix-audit-lo-matcher

Fixed issue with audit log extension comparison

hack/runtime-migrator/cmd/migration.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"github.com/pkg/errors"
 	"log/slog"
 
 	"github.com/gardener/gardener/pkg/apis/core/v1beta1"
@@ -85,7 +86,7 @@ func (m Migration) Do(ctx context.Context, runtimeIDs []string) error {
 	run := func(runtimeID string) {
 		shoot := findShoot(runtimeID, shootList)
 		if shoot == nil {
-			reportError(runtimeID, "", "Failed to find shoot", nil)
+			reportError(runtimeID, "", "Failed to find shoot", errors.New("no shoot with given runtimeID found"))
 			return
 		}
 

hack/shoot-comparator/pkg/runtime/raw_extension_matcher.go

@@ -2,6 +2,7 @@ package runtime
 
 import (
 	"sort"
+	"strings"
 
 	"github.com/kyma-project/infrastructure-manager/hack/shoot-comparator/pkg/utilz"
 	"github.com/onsi/gomega"
@@ -43,7 +44,9 @@ func (m *RawExtensionMatcher) Match(actual interface{}) (bool, error) {
 	sort.Sort(sortBytes(rawActual))
 	sort.Sort(sortBytes(rawToMatch))
 
-	return gomega.BeComparableTo(rawActual).Match(rawToMatch)
+	return gomega.
+		BeComparableTo(strings.TrimSpace(string(rawActual))).
+		Match(strings.TrimSpace(string(rawToMatch)))
 }
 
 func (m *RawExtensionMatcher) NegatedFailureMessage(_ interface{}) string {