Skip to content

Commit 582dfb2

Browse files
committed
internal/helm: add tests for getter helpers
1 parent 594cfd0 commit 582dfb2

File tree

2 files changed

+130
-2
lines changed

2 files changed

+130
-2
lines changed

internal/helm/getter.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@ func ClientOptionsFromSecret(secret corev1.Secret) ([]getter.Option, func(), err
1616
if err != nil {
1717
return opts, nil, err
1818
}
19-
opts = append(opts, basicAuth)
19+
if basicAuth != nil {
20+
opts = append(opts, basicAuth)
21+
}
2022
tlsClientConfig, cleanup, err := TLSClientConfigFromSecret(secret)
2123
if err != nil {
2224
return opts, nil, err
2325
}
24-
opts = append(opts, tlsClientConfig)
26+
if tlsClientConfig != nil {
27+
opts = append(opts, tlsClientConfig)
28+
}
2529
return opts, cleanup, nil
2630
}
2731

internal/helm/getter_test.go

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
package helm
2+
3+
import (
4+
"testing"
5+
6+
corev1 "k8s.io/api/core/v1"
7+
)
8+
9+
var (
10+
basicAuthSecretFixture = corev1.Secret{
11+
Data: map[string][]byte{
12+
"username": []byte("user"),
13+
"password": []byte("password"),
14+
},
15+
}
16+
tlsSecretFixture = corev1.Secret{
17+
Data: map[string][]byte{
18+
"certFile": []byte(`fixture`),
19+
"keyFile": []byte(`fixture`),
20+
"caFile": []byte(`fixture`),
21+
},
22+
}
23+
)
24+
25+
func TestClientOptionsFromSecret(t *testing.T) {
26+
tests := []struct {
27+
name string
28+
secrets []corev1.Secret
29+
}{
30+
{"basic auth", []corev1.Secret{basicAuthSecretFixture}},
31+
{"TLS", []corev1.Secret{tlsSecretFixture}},
32+
{"basic auth and TLS", []corev1.Secret{basicAuthSecretFixture, tlsSecretFixture}},
33+
{"empty", []corev1.Secret{}},
34+
}
35+
for _, tt := range tests {
36+
t.Run(tt.name, func(t *testing.T) {
37+
secret := corev1.Secret{Data: map[string][]byte{}}
38+
for _, s := range tt.secrets {
39+
for k, v := range s.Data {
40+
secret.Data[k] = v
41+
}
42+
}
43+
got, cleanup, err := ClientOptionsFromSecret(secret)
44+
if cleanup != nil {
45+
defer cleanup()
46+
}
47+
if err != nil {
48+
t.Errorf("ClientOptionsFromSecret() error = %v", err)
49+
return
50+
}
51+
if len(got) != len(tt.secrets) {
52+
t.Errorf("ClientOptionsFromSecret() options = %v, expected = %v", got, len(tt.secrets))
53+
}
54+
})
55+
}
56+
}
57+
58+
func TestBasicAuthFromSecret(t *testing.T) {
59+
tests := []struct {
60+
name string
61+
secret corev1.Secret
62+
modify func(secret *corev1.Secret)
63+
wantErr bool
64+
wantNil bool
65+
}{
66+
{"username and password", basicAuthSecretFixture, nil,false, false},
67+
{"without username", basicAuthSecretFixture, func(s *corev1.Secret) { delete(s.Data, "username") }, true, true},
68+
{"without password", basicAuthSecretFixture, func(s *corev1.Secret) { delete(s.Data, "password") }, true, true},
69+
{"empty", corev1.Secret{}, nil, false, true},
70+
}
71+
for _, tt := range tests {
72+
t.Run(tt.name, func(t *testing.T) {
73+
secret := tt.secret.DeepCopy()
74+
if tt.modify != nil {
75+
tt.modify(secret)
76+
}
77+
got, err := BasicAuthFromSecret(*secret)
78+
if (err != nil) != tt.wantErr {
79+
t.Errorf("BasicAuthFromSecret() error = %v, wantErr %v", err, tt.wantErr)
80+
return
81+
}
82+
if tt.wantNil && got != nil {
83+
t.Error("BasicAuthFromSecret() != nil")
84+
return
85+
}
86+
})
87+
}
88+
}
89+
90+
func TestTLSClientConfigFromSecret(t *testing.T) {
91+
tests := []struct {
92+
name string
93+
secret corev1.Secret
94+
modify func(secret *corev1.Secret)
95+
wantErr bool
96+
wantNil bool
97+
}{
98+
{"certFile, keyFile and caFile", tlsSecretFixture, nil,false, false},
99+
{"without certFile", tlsSecretFixture, func(s *corev1.Secret) { delete(s.Data, "certFile") }, true, true},
100+
{"without keyFile", tlsSecretFixture, func(s *corev1.Secret) { delete(s.Data, "keyFile") }, true, true},
101+
{"without caFile", tlsSecretFixture, func(s *corev1.Secret) { delete(s.Data, "caFile") }, true, true},
102+
{"empty", corev1.Secret{}, nil, false, true},
103+
}
104+
for _, tt := range tests {
105+
t.Run(tt.name, func(t *testing.T) {
106+
secret := tt.secret.DeepCopy()
107+
if tt.modify != nil {
108+
tt.modify(secret)
109+
}
110+
got, cleanup, err := TLSClientConfigFromSecret(*secret)
111+
if cleanup != nil {
112+
defer cleanup()
113+
}
114+
if (err != nil) != tt.wantErr {
115+
t.Errorf("TLSClientConfigFromSecret() error = %v, wantErr %v", err, tt.wantErr)
116+
return
117+
}
118+
if tt.wantNil && got != nil {
119+
t.Error("TLSClientConfigFromSecret() != nil")
120+
return
121+
}
122+
})
123+
}
124+
}

0 commit comments

Comments
 (0)