From 5837f52a6bef1685155d136dc278af514e9f83b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= <mswiatek@sumologic.com>
Date: Fri, 25 Nov 2022 09:03:09 +0100
Subject: [PATCH] feat(update-collection-v3): migrate
 otelevents.config.override

---
 .../migrations/events/events.go               |  4 +++
 .../migrations/events/events_test.go          | 25 +++++++++++++++++++
 .../migrations/events/valuesv2.go             |  3 +++
 .../migrations/events/valuesv3.go             |  4 +++
 4 files changed, 36 insertions(+)

diff --git a/src/go/cmd/update-collection-v3/migrations/events/events.go b/src/go/cmd/update-collection-v3/migrations/events/events.go
index 302404bc..c1fc5317 100644
--- a/src/go/cmd/update-collection-v3/migrations/events/events.go
+++ b/src/go/cmd/update-collection-v3/migrations/events/events.go
@@ -76,6 +76,10 @@ func migrateEvents(
 			commonPersistence.PersistentVolume.PvcLabels = otPersistence.PvcLabels
 		}
 	}
+
+	// move config.override to config.merge
+	otelV3.Config.Merge = otelV2.Config.Override
+
 	return commonV3, fluentDV3, otelV3
 }
 
diff --git a/src/go/cmd/update-collection-v3/migrations/events/events_test.go b/src/go/cmd/update-collection-v3/migrations/events/events_test.go
index 1af293f8..af0c6685 100644
--- a/src/go/cmd/update-collection-v3/migrations/events/events_test.go
+++ b/src/go/cmd/update-collection-v3/migrations/events/events_test.go
@@ -180,3 +180,28 @@ fluentd:
 		})
 	}
 }
+
+func Test_EventsConfig(t *testing.T) {
+	testCases := []TestCase{
+		{
+			inputYaml: `
+otelevents:
+  config:
+    override:
+      key: value
+`,
+			outputYaml: `
+otelevents:
+  config:
+    merge:
+      key: value
+`,
+			description: "Move config.override to config.merge",
+		},
+	}
+	for _, testCase := range testCases {
+		t.Run(testCase.description, func(t *testing.T) {
+			runYamlTest(t, testCase)
+		})
+	}
+}
diff --git a/src/go/cmd/update-collection-v3/migrations/events/valuesv2.go b/src/go/cmd/update-collection-v3/migrations/events/valuesv2.go
index 70d98156..c2b62fe0 100644
--- a/src/go/cmd/update-collection-v3/migrations/events/valuesv2.go
+++ b/src/go/cmd/update-collection-v3/migrations/events/valuesv2.go
@@ -39,5 +39,8 @@ type OteleventsV2 struct {
 		Size       *string                `yaml:"size,omitempty"`
 		PvcLabels  map[string]interface{} `yaml:"pvcLabels,omitempty"`
 	} `yaml:"persistence,omitempty"`
+	Config struct {
+		Override map[string]interface{} `yaml:"override,omitempty"`
+	} `yaml:"config,omitempty"`
 	Rest map[string]interface{} `yaml:",inline"`
 }
diff --git a/src/go/cmd/update-collection-v3/migrations/events/valuesv3.go b/src/go/cmd/update-collection-v3/migrations/events/valuesv3.go
index ae184b41..659c2767 100644
--- a/src/go/cmd/update-collection-v3/migrations/events/valuesv3.go
+++ b/src/go/cmd/update-collection-v3/migrations/events/valuesv3.go
@@ -34,5 +34,9 @@ type CommonEventsV3 struct {
 }
 
 type OteleventsV3 struct {
+	Config struct {
+		Merge map[string]interface{} `yaml:"merge,omitempty"`
+		Override map[string]interface{} `yaml:"override,omitempty"`
+	} `yaml:"config,omitempty"`
 	Rest map[string]interface{} `yaml:",inline"`
 }