Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.

Commit 7d4d53d

Browse files
ss75710541ss75710541
committed
fix: repo.GetAppDetails().Helm.GetParameterValueByName not get helm.values
1 parent 339b6c8 commit 7d4d53d

File tree

3 files changed

+62
-67
lines changed

3 files changed

+62
-67
lines changed

‎expr/shared/appdetail.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ type AppDetail struct {
88
// Ksonnet details
99
Ksonnet *apiclient.KsonnetAppSpec
1010
// Helm details
11-
Helm *HelmAppSpec
11+
Helm *apiclient.HelmAppSpec
1212
// Kustomize details
1313
Kustomize *apiclient.KustomizeAppSpec
1414
// Directory details

‎expr/shared/helmappspec.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
package shared
22

33
import (
4-
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
4+
"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
55
)
66

77
type HelmAppSpec struct {
8-
Name string
9-
ValueFiles []string
10-
Parameters []*v1alpha1.HelmParameter
11-
Values string
12-
FileParameters []*v1alpha1.HelmFileParameter
8+
HAS *apiclient.HelmAppSpec
139
}
1410

1511
func (has HelmAppSpec) GetParameterValueByName(Name string) string {
1612
var value string
17-
for i := range has.Parameters {
18-
if has.Parameters[i].Name == Name {
19-
value = has.Parameters[i].Value
13+
for i := range has.HAS.Parameters {
14+
if has.HAS.Parameters[i].Name == Name {
15+
value = has.HAS.Parameters[i].Value
2016
break
2117
}
2218
}
@@ -25,9 +21,9 @@ func (has HelmAppSpec) GetParameterValueByName(Name string) string {
2521

2622
func (has HelmAppSpec) GetFileParameterPathByName(Name string) string {
2723
var path string
28-
for i := range has.FileParameters {
29-
if has.FileParameters[i].Name == Name {
30-
path = has.FileParameters[i].Path
24+
for i := range has.HAS.FileParameters {
25+
if has.HAS.FileParameters[i].Name == Name {
26+
path = has.HAS.FileParameters[i].Path
3127
break
3228
}
3329
}

‎shared/argocd/service.go

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package argocd
33
import (
44
"context"
55
"fmt"
6-
"gopkg.in/yaml.v2"
76
"strings"
87

98
"github.com/argoproj-labs/argocd-notifications/expr/shared"
@@ -119,61 +118,61 @@ func (svc *argoCDService) GetAppDetails(ctx context.Context, appSource *v1alpha1
119118
if err != nil {
120119
return nil, err
121120
}
122-
var has *shared.HelmAppSpec
123-
if appDetail.Helm != nil {
124-
if appSource.Helm.Parameters != nil {
125-
for _, overrideParam := range appSource.Helm.Parameters {
126-
for _, defaultParam := range appDetail.Helm.Parameters {
127-
if overrideParam.Name == defaultParam.Name {
128-
defaultParam.Value = overrideParam.Value
129-
defaultParam.ForceString = overrideParam.ForceString
130-
}
131-
}
132-
}
133-
}
134-
135-
if appSource.Helm.Values != "" {
136-
137-
fmt.Printf("-------start output\n")
138-
output := map[string]string{}
139-
valuesMap := make(map[interface{}]interface{})
140-
if err := yaml.Unmarshal([]byte(appSource.Helm.Values), valuesMap); err != nil {
141-
return nil, fmt.Errorf("failed to parse : %s, appSource.Helm.Values: %v", err, appSource.Helm.Values)
142-
}
143-
flatVals(valuesMap, output)
144-
145-
fmt.Printf("-------flatVals output\n")
146-
//for i := range appDetail.Helm.Parameters {
147-
// if v, ok := output[has.Parameters[i].Name]; ok {
148-
// has.Parameters[i].Value = v
149-
// //delete(output, has.Parameters[i].Name)
150-
// break
151-
// }
152-
//}
153-
154-
fmt.Printf("-------after delete output: %v\n", output)
155-
for i := range appDetail.Helm.Parameters {
156-
if v, ok := output[appDetail.Helm.Parameters[i].Name]; ok {
157-
parameter := &v1alpha1.HelmParameter{Name: appDetail.Helm.Parameters[i].Name, Value: v}
158-
appDetail.Helm.Parameters[i] = parameter
159-
}
160-
}
161-
162-
fmt.Printf("-------appSource.Helm.Parameters: %v\n", appSource.Helm.Parameters)
163-
fmt.Printf("-------appDetail.Helm.Parameters: %v\n", appDetail.Helm.Parameters)
164-
}
165-
166-
has = &shared.HelmAppSpec{
167-
Name: appDetail.Helm.Name,
168-
ValueFiles: appSource.Helm.ValueFiles,
169-
Parameters: appDetail.Helm.Parameters,
170-
Values: appSource.Helm.Values,
171-
FileParameters: appDetail.Helm.FileParameters,
172-
}
173-
}
121+
//var has *shared.HelmAppSpec
122+
//if appDetail.Helm != nil {
123+
// if appSource.Helm.Parameters != nil {
124+
// for _, overrideParam := range appSource.Helm.Parameters {
125+
// for _, defaultParam := range appDetail.Helm.Parameters {
126+
// if overrideParam.Name == defaultParam.Name {
127+
// defaultParam.Value = overrideParam.Value
128+
// defaultParam.ForceString = overrideParam.ForceString
129+
// }
130+
// }
131+
// }
132+
// }
133+
//
134+
// if appSource.Helm.Values != "" {
135+
//
136+
// fmt.Printf("-------start output\n")
137+
// output := map[string]string{}
138+
// valuesMap := make(map[interface{}]interface{})
139+
// if err := yaml.Unmarshal([]byte(appSource.Helm.Values), valuesMap); err != nil {
140+
// return nil, fmt.Errorf("failed to parse : %s, appSource.Helm.Values: %v", err, appSource.Helm.Values)
141+
// }
142+
// flatVals(valuesMap, output)
143+
//
144+
// fmt.Printf("-------flatVals output\n")
145+
// //for i := range appDetail.Helm.Parameters {
146+
// // if v, ok := output[has.Parameters[i].Name]; ok {
147+
// // has.Parameters[i].Value = v
148+
// // //delete(output, has.Parameters[i].Name)
149+
// // break
150+
// // }
151+
// //}
152+
//
153+
// fmt.Printf("-------after delete output: %v\n", output)
154+
// for i := range appDetail.Helm.Parameters {
155+
// if v, ok := output[appDetail.Helm.Parameters[i].Name]; ok {
156+
// parameter := &v1alpha1.HelmParameter{Name: appDetail.Helm.Parameters[i].Name, Value: v}
157+
// appDetail.Helm.Parameters[i] = parameter
158+
// }
159+
// }
160+
//
161+
// fmt.Printf("-------appSource.Helm.Parameters: %v\n", appSource.Helm.Parameters)
162+
// fmt.Printf("-------appDetail.Helm.Parameters: %v\n", appDetail.Helm.Parameters)
163+
// }
164+
//
165+
// has = &shared.HelmAppSpec{
166+
// Name: appDetail.Helm.Name,
167+
// ValueFiles: appSource.Helm.ValueFiles,
168+
// Parameters: appDetail.Helm.Parameters,
169+
// Values: appSource.Helm.Values,
170+
// FileParameters: appDetail.Helm.FileParameters,
171+
// }
172+
//}
174173
return &shared.AppDetail{
175174
Type: appDetail.Type,
176-
Helm: has,
175+
Helm: appDetail.Helm,
177176
Ksonnet: appDetail.Ksonnet,
178177
Kustomize: appDetail.Kustomize,
179178
Directory: appDetail.Directory,

0 commit comments

Comments
 (0)