Store: use "at" suffix for time base fields more consistently (#58486)

This commit is contained in:
Ryan McKinley
2022-11-08 17:42:32 -05:00
committed by GitHub
parent ad9ac85ee0
commit 238a3f820c
6 changed files with 275 additions and 256 deletions
+10 -10
View File
@@ -32,7 +32,7 @@ type RawObjectWithHistory struct {
var (
// increment when RawObject changes
rawObjectVersion = 8
rawObjectVersion = 9
)
func ProvideDummyObjectServer(cfg *setting.Cfg, grpcServerProvider grpcserver.Provider, kinds kind.KindRegistry) object.ObjectStoreServer {
@@ -82,9 +82,9 @@ func (i *dummyObjectServer) findObject(ctx context.Context, grn *object.GRN, ver
if objVersion.Version == version {
copy := &object.RawObject{
GRN: obj.Object.GRN,
Created: obj.Object.Created,
CreatedAt: obj.Object.CreatedAt,
CreatedBy: obj.Object.CreatedBy,
Updated: objVersion.Updated,
UpdatedAt: objVersion.UpdatedAt,
UpdatedBy: objVersion.UpdatedBy,
ETag: objVersion.ETag,
Version: objVersion.Version,
@@ -174,9 +174,9 @@ func (i *dummyObjectServer) update(ctx context.Context, r *object.WriteObjectReq
updated := &object.RawObject{
GRN: r.GRN,
Created: i.Object.Created,
CreatedAt: i.Object.CreatedAt,
CreatedBy: i.Object.CreatedBy,
Updated: time.Now().UnixMilli(),
UpdatedAt: time.Now().UnixMilli(),
UpdatedBy: store.GetUserIDString(modifier),
Size: int64(len(r.Body)),
ETag: createContentsHash(r.Body),
@@ -188,7 +188,7 @@ func (i *dummyObjectServer) update(ctx context.Context, r *object.WriteObjectReq
Body: r.Body,
ObjectVersionInfo: &object.ObjectVersionInfo{
Version: updated.Version,
Updated: updated.Updated,
UpdatedAt: updated.UpdatedAt,
UpdatedBy: updated.UpdatedBy,
Size: updated.Size,
ETag: updated.ETag,
@@ -226,8 +226,8 @@ func (i *dummyObjectServer) insert(ctx context.Context, r *object.WriteObjectReq
modifier := store.GetUserIDString(store.UserFromContext(ctx))
rawObj := &object.RawObject{
GRN: r.GRN,
Updated: time.Now().UnixMilli(),
Created: time.Now().UnixMilli(),
UpdatedAt: time.Now().UnixMilli(),
CreatedAt: time.Now().UnixMilli(),
CreatedBy: modifier,
UpdatedBy: modifier,
Size: int64(len(r.Body)),
@@ -238,7 +238,7 @@ func (i *dummyObjectServer) insert(ctx context.Context, r *object.WriteObjectReq
info := &object.ObjectVersionInfo{
Version: rawObj.Version,
Updated: rawObj.Updated,
UpdatedAt: rawObj.UpdatedAt,
UpdatedBy: rawObj.UpdatedBy,
Size: rawObj.Size,
ETag: rawObj.ETag,
@@ -362,7 +362,7 @@ func (i *dummyObjectServer) Search(ctx context.Context, r *object.ObjectSearchRe
searchResults = append(searchResults, &object.ObjectSearchResult{
GRN: o.Object.GRN,
Version: o.Object.Version,
Updated: o.Object.Updated,
UpdatedAt: o.Object.UpdatedAt,
UpdatedBy: o.Object.UpdatedBy,
Name: summary.Name,
Description: summary.Description,