Storage: Extract returned object hydration into function (grafana#88012)

* Extract returned object hydration into function

* Finish writing tests for utils func

* Lint

* Update pkg/apiserver/rest/dualwriter_mode2.go

Co-authored-by: Arati R. <[email protected]>

* Better var naming

* Remove duplicated logic

* Lint

* Fix test

* Lint

* Make type private

* Fix one more test

* Fix test

---------

Co-authored-by: Arati R. <[email protected]>

Author: leonorfmartins

pkg/apiserver/rest/dualwriter_mode1.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"time"
 
-	"k8s.io/apimachinery/pkg/api/meta"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -16,8 +15,8 @@ import (
 type DualWriterMode1 struct {
 	Legacy  LegacyStorage
 	Storage Storage
-	Log     klog.Logger
 	*dualWriterMetrics
+	Log klog.Logger
 }
 
 const (
@@ -38,40 +37,34 @@ func (d *DualWriterMode1) Mode() DualWriterMode {
 }
 
 // Create overrides the behavior of the generic DualWriter and writes only to LegacyStorage.
-func (d *DualWriterMode1) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
+func (d *DualWriterMode1) Create(ctx context.Context, original runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
 	log := d.Log.WithValues("kind", options.Kind)
 	ctx = klog.NewContext(ctx, log)
 	var method = "create"
 
 	startLegacy := time.Now()
-	res, err := d.Legacy.Create(ctx, obj, createValidation, options)
+	created, err := d.Legacy.Create(ctx, original, createValidation, options)
 	if err != nil {
 		log.Error(err, "unable to create object in legacy storage")
 		d.recordLegacyDuration(true, mode1Str, options.Kind, method, startLegacy)
-		return res, err
+		return created, err
 	}
 	d.recordLegacyDuration(false, mode1Str, options.Kind, method, startLegacy)
 
 	go func() {
-		accessorCreated, err := meta.Accessor(res)
-		if err != nil {
-			log.Error(err, "unable to get accessor for created object")
-		}
-
-		accessorOld, err := meta.Accessor(obj)
+		ctx, cancel := context.WithTimeoutCause(ctx, time.Second*10, errors.New("storage create timeout"))
+		createdLegacy, err := enrichLegacyObject(original, created, true)
 		if err != nil {
-			log.Error(err, "unable to get accessor for old object")
+			cancel()
 		}
 
-		enrichObject(accessorOld, accessorCreated)
 		startStorage := time.Now()
-		ctx, cancel := context.WithTimeoutCause(ctx, time.Second*10, errors.New("storage create timeout"))
 		defer cancel()
-		_, errObjectSt := d.Storage.Create(ctx, obj, createValidation, options)
+		_, errObjectSt := d.Storage.Create(ctx, createdLegacy, createValidation, options)
 		d.recordStorageDuration(errObjectSt != nil, mode1Str, options.Kind, method, startStorage)
 	}()
 
-	return res, nil
+	return created, nil
 }
 
 // Get overrides the behavior of the generic DualWriter and reads only from LegacyStorage.
@@ -188,6 +181,7 @@ func (d *DualWriterMode1) Update(ctx context.Context, name string, objInfo rest.
 	d.recordLegacyDuration(false, mode1Str, options.Kind, method, startLegacy)
 
 	go func() {
+		ctx, cancel := context.WithTimeoutCause(ctx, time.Second*10, errors.New("storage update timeout"))
 		updated, err := objInfo.UpdatedObject(ctx, res)
 		if err != nil {
 			log.WithValues("object", updated).Error(err, "could not update or create object")
@@ -201,27 +195,17 @@ func (d *DualWriterMode1) Update(ctx context.Context, name string, objInfo rest.
 
 		// if the object is found, create a new updateWrapper with the object found
 		if foundObj != nil {
-			accessorOld, err := meta.Accessor(foundObj)
-			if err != nil {
-				log.Error(err, "unable to get accessor for original updated object")
-			}
-
-			accessor, err := meta.Accessor(res)
+			res, err := enrichLegacyObject(foundObj, res, false)
 			if err != nil {
-				log.Error(err, "unable to get accessor for updated object")
+				log.Error(err, "could not enrich object")
+				cancel()
 			}
-
-			accessor.SetResourceVersion(accessorOld.GetResourceVersion())
-			accessor.SetUID(accessorOld.GetUID())
-
-			enrichObject(accessorOld, accessor)
 			objInfo = &updateWrapper{
 				upstream: objInfo,
 				updated:  res,
 			}
 		}
 		startStorage := time.Now()
-		ctx, cancel := context.WithTimeoutCause(ctx, time.Second*10, errors.New("storage update timeout"))
 		defer cancel()
 		_, _, errObjectSt := d.Storage.Update(ctx, name, objInfo, createValidation, updateValidation, forceAllowCreate, options)
 		d.recordStorageDuration(errObjectSt != nil, mode1Str, options.Kind, method, startStorage)