fix: repo.GetAppDetails().Helm.GetParameterValueByName not get helm.v…

…alues
argoproj-labs · Apr 27, 2022 · 62a81a1 · 62a81a1
1 parent ebecda7
commit 62a81a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/expr/shared/appdetail.go b/expr/shared/appdetail.go
@@ -1,8 +1,6 @@
 package shared
 
-import (
-	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-)
+import "github.com/argoproj/argo-cd/v2/reposerver/apiclient"
 
 type AppDetail struct {
 	// AppDetail Type

diff --git a/shared/argocd/service.go b/shared/argocd/service.go
@@ -123,6 +123,9 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
 	var has *shared.HelmAppSpec
 	if appDetail.Helm != nil {
 		paramsMap := map[string]*v1alpha1.HelmParameter{}
+		for _, param := range appDetail.Helm.Parameters {
+			paramsMap[param.Name] = param
+		}
 		if appSource.Helm.Parameters != nil {
 			for _, overrideParam := range appSource.Helm.Parameters {
 				paramsMap[overrideParam.Name] = &v1alpha1.HelmParameter{
@@ -133,9 +136,6 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
 			}
 		}
 		if appSource.Helm.Values != "" {
-			for _, param := range appDetail.Helm.Parameters {
-				paramsMap[param.Name] = param
-			}
 			valuesParams, err := GetHelmParametersByValues(appSource.Helm.Values)
 			if err != nil {
 				return nil, err