@@ -14,43 +14,9 @@ import (
14
14
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
15
15
"github.com/argoproj/argo-cd/v3/reposerver/apiclient"
16
16
"github.com/argoproj/argo-cd/v3/test"
17
+ "github.com/argoproj/argo-cd/v3/util/settings"
17
18
)
18
19
19
- var commitMessageTemplate = ` {{- if .metadata }}
20
- {{- if .metadata.repoURL }}
21
- repoURL: {{ .metadata.repoURL }}
22
- {{- end }}
23
-
24
- {{- if .metadata.drySha }}
25
- drySha: {{ .metadata.drySha }}
26
- {{- end }}
27
-
28
- {{- if .metadata.author }}
29
- Co-authored-by: {{ .metadata.author }}
30
- {{- end }}
31
-
32
- {{- if .metadata.subject }}
33
- subject: {{ .metadata.subject }}
34
- {{- end }}
35
-
36
- {{- if .metadata.body }}
37
- body: {{ .metadata.body }}
38
- {{- end }}
39
- {{- if .metadata.references }}
40
- References:
41
- {{- range $reference := .metadata.references }}
42
- {{- if kindIs "map" $reference.commit }}
43
- Commit:
44
- {{- range $key, $value := $reference.commit }}
45
- {{- if eq $key "author" }}
46
- Co-authored-by: {{ $value }}
47
- {{- end }}
48
- {{- end }}
49
- {{- end }}
50
- {{- end }}
51
- {{- end }}
52
- {{- end }}`
53
-
54
20
func TestGetRepoObjs (t * testing.T ) {
55
21
cm := test .NewConfigMap ()
56
22
cm .SetAnnotations (map [string ]string {
@@ -113,7 +79,7 @@ func TestGetRepoObjs(t *testing.T) {
113
79
assert .Equal (t , "ConfigMap" , objs [0 ].GetKind ())
114
80
}
115
81
116
- func TestGetHydratorCommitMessageTemplate_WhenTemplateisNotDefined (t * testing.T ) {
82
+ func TestGetHydratorCommitMessageTemplate_WhenTemplateisNotDefined_FallbackToDefault (t * testing.T ) {
117
83
cm := test .NewConfigMap ()
118
84
cmBytes , _ := json .Marshal (cm )
119
85
@@ -130,13 +96,13 @@ func TestGetHydratorCommitMessageTemplate_WhenTemplateisNotDefined(t *testing.T)
130
96
131
97
tmpl , err := ctrl .GetHydratorCommitMessageTemplate ()
132
98
require .NoError (t , err )
133
- assert .NotNil (t , tmpl )
134
- assert .Empty ( t , tmpl )
99
+ assert .NotEmpty (t , tmpl ) // should fallback to default
100
+ assert .Equal ( t , settings . CommitMessageTemplate , tmpl )
135
101
}
136
102
137
103
func TestGetHydratorCommitMessageTemplate (t * testing.T ) {
138
104
cm := test .NewFakeConfigMap ()
139
- cm .Data ["sourceHydrator.commitMessageTemplate" ] = commitMessageTemplate
105
+ cm .Data ["sourceHydrator.commitMessageTemplate" ] = settings . CommitMessageTemplate
140
106
cmBytes , _ := json .Marshal (cm )
141
107
142
108
data := fakeData {
@@ -153,7 +119,5 @@ func TestGetHydratorCommitMessageTemplate(t *testing.T) {
153
119
154
120
tmpl , err := ctrl .GetHydratorCommitMessageTemplate ()
155
121
require .NoError (t , err )
156
- assert .NotNil (t , tmpl )
157
122
assert .NotEmpty (t , tmpl )
158
- assert .Contains (t , tmpl , "Commit" )
159
123
}
0 commit comments