Merge pull request #620 from zaneb/resource-version

✨ fakeClient: bump ResourceVersion on write

Author: k8s-ci-robot

pkg/client/fake/client.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -34,8 +35,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/internal/objectutil"
 )
 
+type versionedTracker struct {
+	testing.ObjectTracker
+}
+
 type fakeClient struct {
-	tracker testing.ObjectTracker
+	tracker versionedTracker
 	scheme  *runtime.Scheme
 }
 
@@ -61,11 +66,37 @@ func NewFakeClientWithScheme(clientScheme *runtime.Scheme, initObjs ...runtime.O
 		}
 	}
 	return &fakeClient{
-		tracker: tracker,
+		tracker: versionedTracker{tracker},
 		scheme:  clientScheme,
 	}
 }
 
+func (t versionedTracker) Create(gvr schema.GroupVersionResource, obj runtime.Object, ns string) error {
+	if accessor, err := meta.Accessor(obj); err == nil {
+		if accessor.GetResourceVersion() == "" {
+			accessor.SetResourceVersion("1")
+		}
+	} else {
+		return err
+	}
+	return t.ObjectTracker.Create(gvr, obj, ns)
+}
+
+func (t versionedTracker) Update(gvr schema.GroupVersionResource, obj runtime.Object, ns string) error {
+	if accessor, err := meta.Accessor(obj); err == nil {
+		version := 0
+		if rv := accessor.GetResourceVersion(); rv != "" {
+			version, err = strconv.Atoi(rv)
+		}
+		if err == nil {
+			accessor.SetResourceVersion(strconv.Itoa(version + 1))
+		}
+	} else {
+		return err
+	}
+	return t.ObjectTracker.Update(gvr, obj, ns)
+}
+
 func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj runtime.Object) error {
 	gvr, err := getGVRFromObject(obj, c.scheme)
 	if err != nil {

pkg/client/fake/client_test.go

@@ -118,14 +118,16 @@ var _ = Describe("Fake client", func() {
 			err = cl.Get(nil, namespacedName, obj)
 			Expect(err).To(BeNil())
 			Expect(obj).To(Equal(newcm))
+			Expect(obj.ObjectMeta.ResourceVersion).To(Equal("1"))
 		})
 
 		It("should be able to Update", func() {
 			By("Updating a new configmap")
 			newcm := &corev1.ConfigMap{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-cm",
-					Namespace: "ns2",
+					Name:            "test-cm",
+					Namespace:       "ns2",
+					ResourceVersion: "1",
 				},
 				Data: map[string]string{
 					"test-key": "new-value",
@@ -143,6 +145,7 @@ var _ = Describe("Fake client", func() {
 			err = cl.Get(nil, namespacedName, obj)
 			Expect(err).To(BeNil())
 			Expect(obj).To(Equal(newcm))
+			Expect(obj.ObjectMeta.ResourceVersion).To(Equal("2"))
 		})
 
 		It("should be able to Delete", func() {
@@ -198,8 +201,9 @@ var _ = Describe("Fake client", func() {
 				By("Updating a new configmap with DryRun")
 				newcm := &corev1.ConfigMap{
 					ObjectMeta: metav1.ObjectMeta{
-						Name:      "test-cm",
-						Namespace: "ns2",
+						Name:            "test-cm",
+						Namespace:       "ns2",
+						ResourceVersion: "1",
 					},
 					Data: map[string]string{
 						"test-key": "new-value",
@@ -217,6 +221,7 @@ var _ = Describe("Fake client", func() {
 				err = cl.Get(nil, namespacedName, obj)
 				Expect(err).To(BeNil())
 				Expect(obj).To(Equal(cm))
+				Expect(obj.ObjectMeta.ResourceVersion).To(Equal(""))
 			})
 		})
 
@@ -242,6 +247,7 @@ var _ = Describe("Fake client", func() {
 			err = cl.Get(nil, namespacedName, obj)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(obj.Annotations["foo"]).To(Equal("bar"))
+			Expect(obj.ObjectMeta.ResourceVersion).To(Equal("1"))
 		})
 	}