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

Author: ss75710541

expr/shared/appdetail.go

@@ -1,14 +1,17 @@
 package shared
 
-import "github.com/argoproj/argo-cd/v2/reposerver/apiclient"
+import (
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
+)
 
 type AppDetail struct {
 	// AppDetail Type
 	Type string
 	// Ksonnet details
 	Ksonnet *apiclient.KsonnetAppSpec
 	// Helm details
-	Helm *apiclient.HelmAppSpec
+	Helm *v1alpha1.ApplicationSourceHelm
 	// Kustomize details
 	Kustomize *apiclient.KustomizeAppSpec
 	// Directory details

expr/shared/helmappspec.go

@@ -1,18 +1,18 @@
 package shared
 
 import (
-	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 type HelmAppSpec struct {
-	HAS *apiclient.HelmAppSpec
+	ASH *v1alpha1.ApplicationSourceHelm
 }
 
 func (has HelmAppSpec) GetParameterValueByName(Name string) string {
 	var value string
-	for i := range has.HAS.Parameters {
-		if has.HAS.Parameters[i].Name == Name {
-			value = has.HAS.Parameters[i].Value
+	for i := range has.ASH.Parameters {
+		if has.ASH.Parameters[i].Name == Name {
+			value = has.ASH.Parameters[i].Value
 			break
 		}
 	}
@@ -21,9 +21,9 @@ func (has HelmAppSpec) GetParameterValueByName(Name string) string {
 
 func (has HelmAppSpec) GetFileParameterPathByName(Name string) string {
 	var path string
-	for i := range has.HAS.FileParameters {
-		if has.HAS.FileParameters[i].Name == Name {
-			path = has.HAS.FileParameters[i].Path
+	for i := range has.ASH.FileParameters {
+		if has.ASH.FileParameters[i].Name == Name {
+			path = has.ASH.FileParameters[i].Path
 			break
 		}
 	}

shared/argocd/service.go

@@ -172,7 +172,7 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
 	//}
 	return &shared.AppDetail{
 		Type:      appDetail.Type,
-		Helm:      appDetail.Helm,
+		Helm:      appSource.Helm,
 		Ksonnet:   appDetail.Ksonnet,
 		Kustomize: appDetail.Kustomize,
 		Directory: appDetail.Directory,