Update tests to use new List signature

Now that the fake client no longer needs Raw, these tests can use typed instead of untyped List objects.
kubernetes-sigs · Sep 14, 2018 · bf0795d · bf0795d
1 parent 8ca92a0
commit bf0795d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 76 deletions.
diff --git a/pkg/builder/example_test.go b/pkg/builder/example_test.go
@@ -77,7 +77,7 @@ func (a *ReplicaSetReconciler) Reconcile(req reconcile.Request) (reconcile.Resul
 
 	// List the Pods matching the PodTemplate Labels
 	pods := &corev1.PodList{}
-	err = a.List(context.TODO(), client.InNamespace(req.Namespace).MatchingLabels(rs.Spec.Template.Labels), pods)
+	err = a.List(context.TODO(), pods, client.InNamespace(req.Namespace), client.MatchingLabels(rs.Spec.Template.Labels))
 	if err != nil {
 		return reconcile.Result{}, err
 	}

diff --git a/pkg/webhook/internal/cert/writer/secret_test.go b/pkg/webhook/internal/cert/writer/secret_test.go
@@ -17,14 +17,11 @@ limitations under the License.
 package writer
 
 import (
-	"encoding/json"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -38,7 +35,6 @@ var _ = Describe("secretCertWriter", func() {
 	var certWriter CertWriter
 	var sCertWriter *secretCertWriter
 	var secret *corev1.Secret
-	var expectedSecret runtime.RawExtension
 
 	BeforeEach(func(done Done) {
 		var err error
@@ -105,43 +101,21 @@ var _ = Describe("secretCertWriter", func() {
 			It("should default it and return no error", func() {
 				_, _, err := certWriter.EnsureCert(dnsName, false)
 				Expect(err).NotTo(HaveOccurred())
-				list := &corev1.List{}
-				err = sCertWriter.Client.List(nil, &client.ListOptions{
-					Namespace: "namespace-bar",
-					Raw: &metav1.ListOptions{
-						TypeMeta: metav1.TypeMeta{
-							APIVersion: "v1",
-							Kind:       "Secret",
-						},
-					},
-				}, list)
+				list := &corev1.SecretList{}
+				err = sCertWriter.Client.List(nil, list, client.InNamespace("namespace-bar"))
 				Expect(err).NotTo(HaveOccurred())
 				Expect(list.Items).To(HaveLen(1))
 			})
 		})
 
 		Context("no existing secret", func() {
-			BeforeEach(func(done Done) {
-				j, _ := json.Marshal(secret)
-				expectedSecret = runtime.RawExtension{Raw: j}
-				close(done)
-			})
-
 			It("should create new secrets with certs", func() {
 				_, changed, err := certWriter.EnsureCert(dnsName, false)
 				Expect(err).NotTo(HaveOccurred())
-				list := &corev1.List{}
-				err = sCertWriter.Client.List(nil, &client.ListOptions{
-					Namespace: "namespace-bar",
-					Raw: &metav1.ListOptions{
-						TypeMeta: metav1.TypeMeta{
-							APIVersion: "v1",
-							Kind:       "Secret",
-						},
-					},
-				}, list)
+				list := &corev1.SecretList{}
+				err = sCertWriter.Client.List(nil, list, client.InNamespace("namespace-bar"))
 				Expect(err).NotTo(HaveOccurred())
-				Expect(list.Items).To(ConsistOf(expectedSecret))
+				Expect(list.Items).To(ConsistOf(*secret))
 				Expect(list.Items).To(HaveLen(1))
 				Expect(changed).To(BeTrue())
 			})
@@ -151,12 +125,6 @@ var _ = Describe("secretCertWriter", func() {
 			var oldSecret *corev1.Secret
 
 			Context("cert is invalid", func() {
-				BeforeEach(func(done Done) {
-					j, _ := json.Marshal(secret)
-					expectedSecret = runtime.RawExtension{Raw: j}
-					close(done)
-				})
-
 				Describe("cert in secret is incomplete", func() {
 					BeforeEach(func(done Done) {
 						oldSecret = secret.DeepCopy()
@@ -168,18 +136,10 @@ var _ = Describe("secretCertWriter", func() {
 					It("should replace with new certs", func() {
 						_, changed, err := certWriter.EnsureCert(dnsName, false)
 						Expect(err).NotTo(HaveOccurred())
-						list := &corev1.List{}
-						err = sCertWriter.Client.List(nil, &client.ListOptions{
-							Namespace: "namespace-bar",
-							Raw: &metav1.ListOptions{
-								TypeMeta: metav1.TypeMeta{
-									APIVersion: "v1",
-									Kind:       "Secret",
-								},
-							},
-						}, list)
+						list := &corev1.SecretList{}
+						err = sCertWriter.Client.List(nil, list, client.InNamespace("namespace-bar"))
 						Expect(err).NotTo(HaveOccurred())
-						Expect(list.Items).To(ConsistOf(expectedSecret))
+						Expect(list.Items).To(ConsistOf(*secret))
 						Expect(list.Items).To(HaveLen(1))
 						Expect(changed).To(BeTrue())
 					})
@@ -200,18 +160,10 @@ var _ = Describe("secretCertWriter", func() {
 					It("should replace with new certs", func() {
 						_, changed, err := certWriter.EnsureCert(dnsName, false)
 						Expect(err).NotTo(HaveOccurred())
-						list := &corev1.List{}
-						err = sCertWriter.Client.List(nil, &client.ListOptions{
-							Namespace: "namespace-bar",
-							Raw: &metav1.ListOptions{
-								TypeMeta: metav1.TypeMeta{
-									APIVersion: "v1",
-									Kind:       "Secret",
-								},
-							},
-						}, list)
+						list := &corev1.SecretList{}
+						err = sCertWriter.Client.List(nil, list, client.InNamespace("namespace-bar"))
 						Expect(err).NotTo(HaveOccurred())
-						Expect(list.Items).To(ConsistOf(expectedSecret))
+						Expect(list.Items).To(ConsistOf(*secret))
 						Expect(list.Items).To(HaveLen(1))
 						Expect(changed).To(BeTrue())
 					})
@@ -225,8 +177,6 @@ var _ = Describe("secretCertWriter", func() {
 						ServerKeyName:  []byte(certs2.Key),
 						ServerCertName: []byte(certs2.Cert),
 					}
-					j, _ := json.Marshal(oldSecret)
-					expectedSecret = runtime.RawExtension{Raw: j}
 					sCertWriter.Client = fake.NewFakeClient(oldSecret)
 					close(done)
 				})
@@ -239,28 +189,17 @@ var _ = Describe("secretCertWriter", func() {
 							ServerKeyName:  []byte(certs2.Key),
 							ServerCertName: []byte(certs2.Cert),
 						}
-						j, _ := json.Marshal(oldSecret)
-						expectedSecret = runtime.RawExtension{Raw: j}
-
 						sCertWriter.Client = fake.NewFakeClient(oldSecret)
 						close(done)
 					})
 					It("should keep the secret", func() {
 						_, changed, err := certWriter.EnsureCert(dnsName, false)
 						Expect(err).NotTo(HaveOccurred())
-						list := &corev1.List{}
-						err = sCertWriter.Client.List(nil, &client.ListOptions{
-							Namespace: "namespace-bar",
-							Raw: &metav1.ListOptions{
-								TypeMeta: metav1.TypeMeta{
-									APIVersion: "v1",
-									Kind:       "Secret",
-								},
-							},
-						}, list)
+						list := &corev1.SecretList{}
+						err = sCertWriter.Client.List(nil, list, client.InNamespace("namespace-bar"))
 						Expect(err).NotTo(HaveOccurred())
 						Expect(list.Items).To(HaveLen(1))
-						Expect(list.Items[0]).To(Equal(expectedSecret))
+						Expect(list.Items).To(ConsistOf(*oldSecret))
 						Expect(changed).To(BeFalse())
 					})
 				})