Skip to content

Commit acb7b11

Browse files
authoredNov 26, 2018
Merge pull request #220 from grantr/typed-lists-in-tests
Use typed lists in cert writer tests
2 parents 85a065f + 1e7d3ac commit acb7b11

File tree

1 file changed

+9
-59
lines changed

1 file changed

+9
-59
lines changed
 

‎pkg/webhook/internal/cert/writer/secret_test.go

+9-59
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ limitations under the License.
1717
package writer
1818

1919
import (
20-
"encoding/json"
21-
2220
. "github.com/onsi/ginkgo"
2321
. "github.com/onsi/gomega"
2422

2523
corev1 "k8s.io/api/core/v1"
2624
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27-
"k8s.io/apimachinery/pkg/runtime"
2825
"k8s.io/apimachinery/pkg/types"
2926
"sigs.k8s.io/controller-runtime/pkg/client"
3027
"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -38,7 +35,6 @@ var _ = Describe("secretCertWriter", func() {
3835
var certWriter CertWriter
3936
var sCertWriter *secretCertWriter
4037
var secret *corev1.Secret
41-
var expectedSecret runtime.RawExtension
4238

4339
BeforeEach(func(done Done) {
4440
var err error
@@ -111,43 +107,25 @@ var _ = Describe("secretCertWriter", func() {
111107
It("should default it and return no error", func() {
112108
_, _, err := certWriter.EnsureCert(dnsName)
113109
Expect(err).NotTo(HaveOccurred())
114-
list := &corev1.List{}
110+
list := &corev1.SecretList{}
115111
err = sCertWriter.Client.List(nil, &client.ListOptions{
116112
Namespace: "namespace-bar",
117-
Raw: &metav1.ListOptions{
118-
TypeMeta: metav1.TypeMeta{
119-
APIVersion: "v1",
120-
Kind: "Secret",
121-
},
122-
},
123113
}, list)
124114
Expect(err).NotTo(HaveOccurred())
125115
Expect(list.Items).To(HaveLen(1))
126116
})
127117
})
128118

129119
Context("no existing secret", func() {
130-
BeforeEach(func(done Done) {
131-
j, _ := json.Marshal(secret)
132-
expectedSecret = runtime.RawExtension{Raw: j}
133-
close(done)
134-
})
135-
136120
It("should create new secrets with certs", func() {
137121
_, changed, err := certWriter.EnsureCert(dnsName)
138122
Expect(err).NotTo(HaveOccurred())
139-
list := &corev1.List{}
123+
list := &corev1.SecretList{}
140124
err = sCertWriter.Client.List(nil, &client.ListOptions{
141125
Namespace: "namespace-bar",
142-
Raw: &metav1.ListOptions{
143-
TypeMeta: metav1.TypeMeta{
144-
APIVersion: "v1",
145-
Kind: "Secret",
146-
},
147-
},
148126
}, list)
149127
Expect(err).NotTo(HaveOccurred())
150-
Expect(list.Items).To(ConsistOf(expectedSecret))
128+
Expect(list.Items).To(ConsistOf(*secret))
151129
Expect(list.Items).To(HaveLen(1))
152130
Expect(changed).To(BeTrue())
153131
})
@@ -157,12 +135,6 @@ var _ = Describe("secretCertWriter", func() {
157135
var oldSecret *corev1.Secret
158136

159137
Context("cert is invalid", func() {
160-
BeforeEach(func(done Done) {
161-
j, _ := json.Marshal(secret)
162-
expectedSecret = runtime.RawExtension{Raw: j}
163-
close(done)
164-
})
165-
166138
Describe("cert in secret is incomplete", func() {
167139
BeforeEach(func(done Done) {
168140
oldSecret = secret.DeepCopy()
@@ -174,18 +146,12 @@ var _ = Describe("secretCertWriter", func() {
174146
It("should replace with new certs", func() {
175147
_, changed, err := certWriter.EnsureCert(dnsName)
176148
Expect(err).NotTo(HaveOccurred())
177-
list := &corev1.List{}
149+
list := &corev1.SecretList{}
178150
err = sCertWriter.Client.List(nil, &client.ListOptions{
179151
Namespace: "namespace-bar",
180-
Raw: &metav1.ListOptions{
181-
TypeMeta: metav1.TypeMeta{
182-
APIVersion: "v1",
183-
Kind: "Secret",
184-
},
185-
},
186152
}, list)
187153
Expect(err).NotTo(HaveOccurred())
188-
Expect(list.Items).To(ConsistOf(expectedSecret))
154+
Expect(list.Items).To(ConsistOf(*secret))
189155
Expect(list.Items).To(HaveLen(1))
190156
Expect(changed).To(BeTrue())
191157
})
@@ -207,18 +173,12 @@ var _ = Describe("secretCertWriter", func() {
207173
It("should replace with new certs", func() {
208174
_, changed, err := certWriter.EnsureCert(dnsName)
209175
Expect(err).NotTo(HaveOccurred())
210-
list := &corev1.List{}
176+
list := &corev1.SecretList{}
211177
err = sCertWriter.Client.List(nil, &client.ListOptions{
212178
Namespace: "namespace-bar",
213-
Raw: &metav1.ListOptions{
214-
TypeMeta: metav1.TypeMeta{
215-
APIVersion: "v1",
216-
Kind: "Secret",
217-
},
218-
},
219179
}, list)
220180
Expect(err).NotTo(HaveOccurred())
221-
Expect(list.Items).To(ConsistOf(expectedSecret))
181+
Expect(list.Items).To(ConsistOf(*secret))
222182
Expect(list.Items).To(HaveLen(1))
223183
Expect(changed).To(BeTrue())
224184
})
@@ -233,8 +193,6 @@ var _ = Describe("secretCertWriter", func() {
233193
ServerKeyName: []byte(certs2.Key),
234194
ServerCertName: []byte(certs2.Cert),
235195
}
236-
j, _ := json.Marshal(oldSecret)
237-
expectedSecret = runtime.RawExtension{Raw: j}
238196
sCertWriter.Client = fake.NewFakeClient(oldSecret)
239197
close(done)
240198
})
@@ -248,28 +206,20 @@ var _ = Describe("secretCertWriter", func() {
248206
ServerKeyName: []byte(certs2.Key),
249207
ServerCertName: []byte(certs2.Cert),
250208
}
251-
j, _ := json.Marshal(oldSecret)
252-
expectedSecret = runtime.RawExtension{Raw: j}
253209

254210
sCertWriter.Client = fake.NewFakeClient(oldSecret)
255211
close(done)
256212
})
257213
It("should keep the secret", func() {
258214
_, changed, err := certWriter.EnsureCert(dnsName)
259215
Expect(err).NotTo(HaveOccurred())
260-
list := &corev1.List{}
216+
list := &corev1.SecretList{}
261217
err = sCertWriter.Client.List(nil, &client.ListOptions{
262218
Namespace: "namespace-bar",
263-
Raw: &metav1.ListOptions{
264-
TypeMeta: metav1.TypeMeta{
265-
APIVersion: "v1",
266-
Kind: "Secret",
267-
},
268-
},
269219
}, list)
270220
Expect(err).NotTo(HaveOccurred())
271221
Expect(list.Items).To(HaveLen(1))
272-
Expect(list.Items[0]).To(Equal(expectedSecret))
222+
Expect(list.Items[0]).To(Equal(*oldSecret))
273223
Expect(changed).To(BeFalse())
274224
})
275225
})

0 commit comments

Comments
 (0)