fix(trait): merge integrationplatform trait

Closes #6006

Author: squakez

pkg/trait/util.go

@@ -382,27 +382,22 @@ func extractAsArray(value string) []string {
 	return []string{value}
 }
 
+// NewSpecTraitsOptionsForIntegrationAndPlatform will merge traits giving priority to Integration configuration over Platform configuration.
 func NewSpecTraitsOptionsForIntegrationAndPlatform(c client.Client, i *v1.Integration, pl *v1.IntegrationPlatform) (Options, error) {
-	var options Options
-	var err error
+	var mergedTraits v1.Traits
 	if pl != nil {
-		options, err = ToTraitMap(pl.Status.Traits)
-		if err != nil {
+		mergedTraits = pl.Status.Traits
+		if err := mergedTraits.Merge(i.Spec.Traits); err != nil {
 			return nil, err
 		}
 	} else {
-		options = Options{}
+		mergedTraits = i.Spec.Traits
 	}
-
-	m1, err := ToTraitMap(i.Spec.Traits)
+	options, err := ToTraitMap(mergedTraits)
 	if err != nil {
 		return nil, err
 	}
 
-	for k, v := range m1 {
-		options[k] = v
-	}
-
 	// Deprecated: to remove when we remove support for traits annotations.
 	// IMPORTANT: when we remove this we'll need to remove the client.Client from the func,
 	// which will bring to more cascade removal. It had to be introduced to support the deprecated feature

pkg/trait/util_test.go

@@ -265,3 +265,76 @@ func TestIntegrationAndPipeSameTraits(t *testing.T) {
 	require.NoError(t, err)
 	assert.True(t, result)
 }
+
+func TestMergePlatformTraits(t *testing.T) {
+	integration := &v1.Integration{
+		Spec: v1.IntegrationSpec{
+			Traits: v1.Traits{
+				Camel: &traitv1.CamelTrait{
+					Properties: []string{"hello=world"},
+				},
+			},
+		},
+	}
+	platform := &v1.IntegrationPlatform{
+		Status: v1.IntegrationPlatformStatus{
+			IntegrationPlatformSpec: v1.IntegrationPlatformSpec{
+				Traits: v1.Traits{
+					Camel: &traitv1.CamelTrait{
+						RuntimeVersion: "1.2.3",
+					},
+				},
+			},
+		},
+	}
+
+	expectedOptions := Options{
+		"camel": {
+			"properties":     []any{"hello=world"},
+			"runtimeVersion": "1.2.3",
+		},
+	}
+
+	c, err := internal.NewFakeClient()
+	require.NoError(t, err)
+	mergedOptions, err := NewSpecTraitsOptionsForIntegrationAndPlatform(c, integration, platform)
+	require.NoError(t, err)
+	assert.Equal(t, expectedOptions, mergedOptions)
+}
+
+func TestMergePlatformTraitsIntegrationPriority(t *testing.T) {
+	integration := &v1.Integration{
+		Spec: v1.IntegrationSpec{
+			Traits: v1.Traits{
+				Camel: &traitv1.CamelTrait{
+					Properties:     []string{"hello=world"},
+					RuntimeVersion: "0.0.0",
+				},
+			},
+		},
+	}
+	platform := &v1.IntegrationPlatform{
+		Status: v1.IntegrationPlatformStatus{
+			IntegrationPlatformSpec: v1.IntegrationPlatformSpec{
+				Traits: v1.Traits{
+					Camel: &traitv1.CamelTrait{
+						RuntimeVersion: "1.2.3",
+					},
+				},
+			},
+		},
+	}
+
+	expectedOptions := Options{
+		"camel": {
+			"properties":     []any{"hello=world"},
+			"runtimeVersion": "0.0.0",
+		},
+	}
+
+	c, err := internal.NewFakeClient()
+	require.NoError(t, err)
+	mergedOptions, err := NewSpecTraitsOptionsForIntegrationAndPlatform(c, integration, platform)
+	require.NoError(t, err)
+	assert.Equal(t, expectedOptions, mergedOptions)
+}