From 3e8e4da6932f66738dbb3a8938cf05335c9a22bf Mon Sep 17 00:00:00 2001
From: test-cli-e2e-aws <test-cli-e2e-aws@srv.plural.sh>
Date: Thu, 30 Jan 2025 14:52:43 +0100
Subject: [PATCH 1/2] support multiline regexes in regexReplacements

---
 pkg/pr/apply_test.go | 74 ++++++++++++++++++++++++++++++++++++++++++++
 pkg/pr/updates.go    | 34 +++++++++++++-------
 2 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/pkg/pr/apply_test.go b/pkg/pr/apply_test.go
index 46c07bc7a..e906e9c3f 100644
--- a/pkg/pr/apply_test.go
+++ b/pkg/pr/apply_test.go
@@ -213,6 +213,80 @@ func TestApply(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
+		{
+			name: "should work with multi line regex replacements, example 1",
+			files: map[string]string{
+				filepath.Join(dir, "workload.tf"): `Line 1
+Line 2
+Line 3`,
+			},
+			template: &pr.PrTemplate{
+				Context: map[string]interface{}{},
+				Spec: pr.PrTemplateSpec{
+					Updates: &pr.UpdateSpec{
+						RegexReplacements: []pr.RegexReplacement{
+							{
+								Regex:       `Line (\d+)`,
+								Replacement: "Replaced $1",
+								File:        filepath.Join(dir, "workload.tf"),
+								Templated:   false,
+							},
+						},
+					},
+				},
+			},
+			expectedFiles: map[string]string{
+				filepath.Join(dir, "workload.tf"): `Replaced 1
+Replaced 2
+Replaced 3`,
+			},
+			expectedErr: nil,
+		},
+		{
+			name: "should work with multi line regex replacements, example 2",
+			files: map[string]string{
+				filepath.Join(dir, "workload.tf"): `
+					module "staging" {
+					  source       = "./eks"
+					  START
+					  vpc_name     = "plural-stage"
+					  kubernetes_version = "1.28"
+					  create_db    = false
+                      END
+					  providers = {
+						helm = helm.staging
+					  }
+					}`,
+			},
+			template: &pr.PrTemplate{
+				Context: map[string]interface{}{
+					"version": "1.28",
+				},
+				Spec: pr.PrTemplateSpec{
+					Updates: &pr.UpdateSpec{
+						RegexReplacements: []pr.RegexReplacement{
+							{
+								Regex:       `START.*END`,
+								Replacement: "kubernetes_version = \"{{ context.version }}\"",
+								File:        filepath.Join(dir, "workload.tf"),
+								Templated:   false,
+							},
+						},
+					},
+				},
+			},
+			expectedFiles: map[string]string{
+				filepath.Join(dir, "workload.tf"): `
+					module "staging" {
+					  source       = "./eks"
+					  kubernetes_version = "1.28"
+					  providers = {
+						helm = helm.staging
+					  }
+					}`,
+			},
+			expectedErr: nil,
+		},
 		{
 			name: "should template and overlay with overwrite yaml file",
 			files: map[string]string{
diff --git a/pkg/pr/updates.go b/pkg/pr/updates.go
index c54604dea..8a78d7bf9 100644
--- a/pkg/pr/updates.go
+++ b/pkg/pr/updates.go
@@ -2,13 +2,13 @@ package pr
 
 import (
 	"bytes"
-	"io/fs"
-	"path/filepath"
-	"regexp"
-
 	"dario.cat/mergo"
 	"github.com/samber/lo"
 	"gopkg.in/yaml.v3"
+	"io/fs"
+	"path/filepath"
+	"regexp"
+	"strings"
 )
 
 func applyUpdates(updates *UpdateSpec, ctx map[string]interface{}) error {
@@ -75,13 +75,7 @@ func processRegexReplacements(replacements []RegexReplacement, ctx map[string]in
 			if err != nil {
 				rx = []byte(replacement.Regex)
 			}
-
-			r, err := regexp.Compile(string(rx))
-			if err != nil {
-				return data, err
-			}
-
-			return r.ReplaceAll(data, replaceWith), nil
+			return replaceMultiline(rx, replaceWith, data)
 		}
 
 		dest, err := templateReplacement([]byte(replacement.File), ctx)
@@ -97,6 +91,24 @@ func processRegexReplacements(replacements []RegexReplacement, ctx map[string]in
 	return nil
 }
 
+// replaceMultiline applies regex-based replacements on a multiline string
+func replaceMultiline(pattern, replacement, text []byte) ([]byte, error) {
+	// Replace all newlines with a unique placeholder
+	placeholder := "__NL__"
+	flattenedText := strings.ReplaceAll(string(text), "\n", placeholder)
+
+	// Apply the regex replacement on the flattened text
+	re, err := regexp.Compile(string(pattern))
+	if err != nil {
+		return nil, err
+	}
+	flattenedText = re.ReplaceAllString(flattenedText, string(replacement))
+
+	// Revert the placeholder back to newlines
+	finalText := strings.ReplaceAll(flattenedText, placeholder, "\n")
+	return []byte(finalText), nil
+}
+
 func processYamlOverlays(overlays []YamlOverlay, ctx map[string]interface{}) error {
 	if len(overlays) == 0 {
 		return nil

From ec1abe95270c77e15db912eb3a076470eee80ea0 Mon Sep 17 00:00:00 2001
From: test-cli-e2e-aws <test-cli-e2e-aws@srv.plural.sh>
Date: Thu, 30 Jan 2025 15:38:40 +0100
Subject: [PATCH 2/2] linter

---
 pkg/pr/updates.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/pr/updates.go b/pkg/pr/updates.go
index 8a78d7bf9..1118e9b86 100644
--- a/pkg/pr/updates.go
+++ b/pkg/pr/updates.go
@@ -2,13 +2,14 @@ package pr
 
 import (
 	"bytes"
-	"dario.cat/mergo"
-	"github.com/samber/lo"
-	"gopkg.in/yaml.v3"
 	"io/fs"
 	"path/filepath"
 	"regexp"
 	"strings"
+
+	"dario.cat/mergo"
+	"github.com/samber/lo"
+	"gopkg.in/yaml.v3"
 )
 
 func applyUpdates(updates *UpdateSpec, ctx map[string]interface{}) error {