fix: use regex to strip IDs in import/export test

Simplify the approach by using regex to remove ID fields directly
rather than parsing and normalizing YAML.

Signed-off-by: markphelps <[email protected]>

Author: markphelps

build/testing/integration.go

@@ -14,6 +14,7 @@ import (
 	"math/big"
 	"os"
 	"path"
+	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
@@ -648,19 +649,19 @@ func importExport(ctx context.Context, _ *dagger.Client, base, flipt *dagger.Con
 			// remove line that starts with comment character '#' and newline after
 			generated = generated[strings.Index(generated, "\n")+2:]
 
-			// Normalize both YAMLs by removing IDs before comparison
-			// IDs are server-generated and not stable across import/export
-			expectedNormalized, err := normalizeYAMLForComparison(expected)
-			if err != nil {
-				return fmt.Errorf("normalizing expected YAML: %w", err)
-			}
+			// Remove ID fields from constraints and rollouts before comparison
+			// IDs are server-generated UUIDs and not stable across import/export
+			// Using regex to remove id: lines from the YAML
+			idLineRegex := regexp.MustCompile(`(?m)^\s*- id: "[^"]*"\n`)
+			expected = idLineRegex.ReplaceAllString(expected, "")
+			generated = idLineRegex.ReplaceAllString(generated, "")
 
-			generatedNormalized, err := normalizeYAMLForComparison(generated)
-			if err != nil {
-				return fmt.Errorf("normalizing generated YAML: %w", err)
-			}
+			// Also handle case where id is not first in the list
+			idFieldRegex := regexp.MustCompile(`(?m)^\s+id: "[^"]*"\n`)
+			expected = idFieldRegex.ReplaceAllString(expected, "")
+			generated = idFieldRegex.ReplaceAllString(generated, "")
 
-			diff := cmp.Diff(expectedNormalized, generatedNormalized)
+			diff := cmp.Diff(expected, generated)
 			if diff != "" {
 				fmt.Printf("Unexpected difference in %q exported output: \n", conf.name)
 				fmt.Println(diff)