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.

Author: grantr

pkg/admission/cert/writer/secret_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package writer
 
 import (
-	"encoding/json"
 	"fmt"
 
 	. "github.com/onsi/ginkgo"
@@ -26,7 +25,6 @@ import (
 	admissionregistration "k8s.io/api/admissionregistration/v1beta1"
 	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/admission/cert/generator"
 	fakegenerator "sigs.k8s.io/controller-runtime/pkg/admission/cert/generator/fake"
@@ -108,7 +106,6 @@ var _ = Describe("SecretCertWriter", func() {
 		var certWriter CertWriter
 		var secretCertWriter *SecretCertWriter
 		var secret *corev1.Secret
-		var expectedSecret runtime.RawExtension
 
 		Context("Failed to EnsureCerts", func() {
 			BeforeEach(func(done Done) {
@@ -201,43 +198,21 @@ var _ = Describe("SecretCertWriter", func() {
 				It("should default it and return no error", func() {
 					err := certWriter.EnsureCerts(mwc)
 					Expect(err).NotTo(HaveOccurred())
-					list := &corev1.List{}
-					err = cl.List(nil, &client.ListOptions{
-						Namespace: "namespace-bar",
-						Raw: &metav1.ListOptions{
-							TypeMeta: metav1.TypeMeta{
-								APIVersion: "v1",
-								Kind:       "Secret",
-							},
-						},
-					}, list)
+					list := &corev1.SecretList{}
+					err = cl.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() {
 					err := certWriter.EnsureCerts(mwc)
 					Expect(err).NotTo(HaveOccurred())
-					list := &corev1.List{}
-					err = cl.List(nil, &client.ListOptions{
-						Namespace: "namespace-bar",
-						Raw: &metav1.ListOptions{
-							TypeMeta: metav1.TypeMeta{
-								APIVersion: "v1",
-								Kind:       "Secret",
-							},
-						},
-					}, list)
+					list := &corev1.SecretList{}
+					err = cl.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))
 				})
 			})
@@ -246,12 +221,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()
@@ -264,18 +233,10 @@ var _ = Describe("SecretCertWriter", func() {
 						It("should replace with new certs", func() {
 							err := certWriter.EnsureCerts(mwc)
 							Expect(err).NotTo(HaveOccurred())
-							list := &corev1.List{}
-							err = cl.List(nil, &client.ListOptions{
-								Namespace: "namespace-bar",
-								Raw: &metav1.ListOptions{
-									TypeMeta: metav1.TypeMeta{
-										APIVersion: "v1",
-										Kind:       "Secret",
-									},
-								},
-							}, list)
+							list := &corev1.SecretList{}
+							err = cl.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))
 						})
 					})
@@ -296,18 +257,10 @@ var _ = Describe("SecretCertWriter", func() {
 						It("should replace with new certs", func() {
 							err := certWriter.EnsureCerts(mwc)
 							Expect(err).NotTo(HaveOccurred())
-							list := &corev1.List{}
-							err = cl.List(nil, &client.ListOptions{
-								Namespace: "namespace-bar",
-								Raw: &metav1.ListOptions{
-									TypeMeta: metav1.TypeMeta{
-										APIVersion: "v1",
-										Kind:       "Secret",
-									},
-								},
-							}, list)
+							list := &corev1.SecretList{}
+							err = cl.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))
 						})
 					})
@@ -320,8 +273,6 @@ var _ = Describe("SecretCertWriter", func() {
 							ServerKeyName:  []byte(certs2.Key),
 							ServerCertName: []byte(certs2.Cert),
 						}
-						j, _ := json.Marshal(oldSecret)
-						expectedSecret = runtime.RawExtension{Raw: j}
 						cl = fake.NewFakeClient(oldSecret)
 						secretCertWriter.Client = cl
 						close(done)
@@ -335,8 +286,6 @@ var _ = Describe("SecretCertWriter", func() {
 								ServerKeyName:  []byte(certs2.Key),
 								ServerCertName: []byte(certs2.Cert),
 							}
-							j, _ := json.Marshal(oldSecret)
-							expectedSecret = runtime.RawExtension{Raw: j}
 
 							cl = fake.NewFakeClient(oldSecret)
 							secretCertWriter.Client = cl
@@ -345,19 +294,11 @@ var _ = Describe("SecretCertWriter", func() {
 						It("should keep the secret", func() {
 							err := certWriter.EnsureCerts(mwc)
 							Expect(err).NotTo(HaveOccurred())
-							list := &corev1.List{}
-							err = cl.List(nil, &client.ListOptions{
-								Namespace: "namespace-bar",
-								Raw: &metav1.ListOptions{
-									TypeMeta: metav1.TypeMeta{
-										APIVersion: "v1",
-										Kind:       "Secret",
-									},
-								},
-							}, list)
+							list := &corev1.SecretList{}
+							err = cl.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))
 						})
 					})
 
@@ -370,8 +311,6 @@ var _ = Describe("SecretCertWriter", func() {
 								//ServerKeyName:  []byte(expiringKeyPEM),
 								//ServerCertName: []byte(expiringCertPEM),
 							}
-							//j, _ := json.Marshal(someNewValidSecret)
-							//expectedSecret = runtime.RawExtension{Raw: j}
 
 							cl = fake.NewFakeClient(oldSecret)
 							secretCertWriter.Client = cl

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
 	}