fix(notifications): Helm.GetParameterValueByName should take helm.parametes first (#17472) (#17512)

* fix: Helm.GetParameterValueByName should take helm.parametes first



* fix linters



---------

Signed-off-by: pashakostohrys <pavel@codefresh.io>
Co-authored-by: pasha-codefresh <pavel@codefresh.io>

Author: gcp-cherry-pick-bot[bot]

util/notification/argocd/service.go

@@ -107,11 +107,14 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
 	var has *shared.CustomHelmAppSpec
 	if appDetail.Helm != nil {
 		has = &shared.CustomHelmAppSpec{
-			Name:           appDetail.Helm.Name,
-			ValueFiles:     appDetail.Helm.ValueFiles,
-			Parameters:     appDetail.Helm.Parameters,
-			Values:         appDetail.Helm.Values,
-			FileParameters: appDetail.Helm.FileParameters,
+			HelmAppSpec: apiclient.HelmAppSpec{
+				Name:           appDetail.Helm.Name,
+				ValueFiles:     appDetail.Helm.ValueFiles,
+				Parameters:     appDetail.Helm.Parameters,
+				Values:         appDetail.Helm.Values,
+				FileParameters: appDetail.Helm.FileParameters,
+			},
+			HelmParameterOverrides: appSource.Helm.Parameters,
 		}
 	}
 	return &shared.AppDetail{

util/notification/expression/shared/appdetail.go

@@ -1,6 +1,7 @@
 package shared
 
 import (
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"time"
 
 	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
@@ -28,24 +29,32 @@ type AppDetail struct {
 	Directory *apiclient.DirectoryAppSpec
 }
 
-type CustomHelmAppSpec apiclient.HelmAppSpec
+type CustomHelmAppSpec struct {
+	HelmAppSpec            apiclient.HelmAppSpec
+	HelmParameterOverrides []v1alpha1.HelmParameter
+}
 
 func (has CustomHelmAppSpec) GetParameterValueByName(Name string) string {
-	var value string
-	for i := range has.Parameters {
-		if has.Parameters[i].Name == Name {
-			value = has.Parameters[i].Value
-			break
+	// Check in overrides first
+	for i := range has.HelmParameterOverrides {
+		if has.HelmParameterOverrides[i].Name == Name {
+			return has.HelmParameterOverrides[i].Value
+		}
+	}
+
+	for i := range has.HelmAppSpec.Parameters {
+		if has.HelmAppSpec.Parameters[i].Name == Name {
+			return has.HelmAppSpec.Parameters[i].Value
 		}
 	}
-	return value
+	return ""
 }
 
 func (has CustomHelmAppSpec) GetFileParameterPathByName(Name string) string {
 	var path string
-	for i := range has.FileParameters {
-		if has.FileParameters[i].Name == Name {
-			path = has.FileParameters[i].Path
+	for i := range has.HelmAppSpec.FileParameters {
+		if has.HelmAppSpec.FileParameters[i].Name == Name {
+			path = has.HelmAppSpec.FileParameters[i].Path
 			break
 		}
 	}

util/notification/expression/shared/appdetail_test.go

@@ -0,0 +1,30 @@
+package shared
+
+import (
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestGetParameterValueByName(t *testing.T) {
+	helmAppSpec := CustomHelmAppSpec{
+		HelmAppSpec: apiclient.HelmAppSpec{
+			Parameters: []*v1alpha1.HelmParameter{
+				{
+					Name:  "param1",
+					Value: "value1",
+				},
+			},
+		},
+		HelmParameterOverrides: []v1alpha1.HelmParameter{
+			{
+				Name:  "param1",
+				Value: "value-override",
+			},
+		},
+	}
+
+	value := helmAppSpec.GetParameterValueByName("param1")
+	assert.Equal(t, "value-override", value)
+}