Fix up locking

Author: alvaroaleman

pkg/client/fake/client.go

@@ -592,11 +592,12 @@ func (t versionedTracker) updateObject(gvr schema.GroupVersionResource, obj runt
 }
 
 func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
-	c.schemeLock.RLock()
-	defer c.schemeLock.RUnlock()
 	if err := c.addToSchemeIfUnknownAndUnstructured(obj); err != nil {
 		return err
 	}
+
+	c.schemeLock.RLock()
+	defer c.schemeLock.RUnlock()
 	gvr, err := getGVRFromObject(obj, c.scheme)
 	if err != nil {
 		return err
@@ -634,6 +635,10 @@ func (c *fakeClient) Watch(ctx context.Context, list client.ObjectList, opts ...
 	if err := c.addToSchemeIfUnknownAndUnstructured(list); err != nil {
 		return nil, err
 	}
+
+	c.schemeLock.RLock()
+	defer c.schemeLock.RUnlock()
+
 	gvk, err := apiutil.GVKForObject(list, c.scheme)
 	if err != nil {
 		return nil, err
@@ -649,11 +654,12 @@ func (c *fakeClient) Watch(ctx context.Context, list client.ObjectList, opts ...
 }
 
 func (c *fakeClient) List(ctx context.Context, obj client.ObjectList, opts ...client.ListOption) error {
-	c.schemeLock.RLock()
-	defer c.schemeLock.RUnlock()
 	if err := c.addToSchemeIfUnknownAndUnstructured(obj); err != nil {
 		return err
 	}
+
+	c.schemeLock.RLock()
+	defer c.schemeLock.RUnlock()
 	gvk, err := apiutil.GVKForObject(obj, c.scheme)
 	if err != nil {
 		return err
@@ -821,13 +827,13 @@ func (c *fakeClient) IsObjectNamespaced(obj runtime.Object) (bool, error) {
 }
 
 func (c *fakeClient) Create(ctx context.Context, obj client.Object, opts ...client.CreateOption) error {
-	c.schemeLock.RLock()
-	defer c.schemeLock.RUnlock()
-
 	if err := c.addToSchemeIfUnknownAndUnstructured(obj); err != nil {
 		return err
 	}
 
+	c.schemeLock.RLock()
+	defer c.schemeLock.RUnlock()
+
 	createOptions := &client.CreateOptions{}
 	createOptions.ApplyOptions(opts)
 
@@ -864,12 +870,13 @@ func (c *fakeClient) Create(ctx context.Context, obj client.Object, opts ...clie
 }
 
 func (c *fakeClient) Delete(ctx context.Context, obj client.Object, opts ...client.DeleteOption) error {
-	c.schemeLock.RLock()
-	defer c.schemeLock.RUnlock()
-
 	if err := c.addToSchemeIfUnknownAndUnstructured(obj); err != nil {
 		return err
 	}
+
+	c.schemeLock.RLock()
+	defer c.schemeLock.RUnlock()
+
 	gvr, err := getGVRFromObject(obj, c.scheme)
 	if err != nil {
 		return err
@@ -915,12 +922,13 @@ func (c *fakeClient) Delete(ctx context.Context, obj client.Object, opts ...clie
 }
 
 func (c *fakeClient) DeleteAllOf(ctx context.Context, obj client.Object, opts ...client.DeleteAllOfOption) error {
-	c.schemeLock.RLock()
-	defer c.schemeLock.RUnlock()
-
 	if err := c.addToSchemeIfUnknownAndUnstructured(obj); err != nil {
 		return err
 	}
+
+	c.schemeLock.RLock()
+	defer c.schemeLock.RUnlock()
+
 	gvk, err := apiutil.GVKForObject(obj, c.scheme)
 	if err != nil {
 		return err
@@ -970,12 +978,13 @@ func (c *fakeClient) Update(ctx context.Context, obj client.Object, opts ...clie
 }
 
 func (c *fakeClient) update(obj client.Object, isStatus bool, opts ...client.UpdateOption) error {
-	c.schemeLock.RLock()
-	defer c.schemeLock.RUnlock()
-
 	if err := c.addToSchemeIfUnknownAndUnstructured(obj); err != nil {
 		return err
 	}
+
+	c.schemeLock.RLock()
+	defer c.schemeLock.RUnlock()
+
 	updateOptions := &client.UpdateOptions{}
 	updateOptions.ApplyOptions(opts)
 
@@ -1004,13 +1013,13 @@ func (c *fakeClient) Patch(ctx context.Context, obj client.Object, patch client.
 }
 
 func (c *fakeClient) patch(obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
-	c.schemeLock.RLock()
-	defer c.schemeLock.RUnlock()
-
 	if err := c.addToSchemeIfUnknownAndUnstructured(obj); err != nil {
 		return err
 	}
 
+	c.schemeLock.RLock()
+	defer c.schemeLock.RUnlock()
+
 	patchOptions := &client.PatchOptions{}
 	patchOptions.ApplyOptions(opts)