Skip to content

Commit

Permalink
fix: Fix timestamp mapping fn rename merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonvigil committed Sep 10, 2024
1 parent 1274d4b commit db31aaf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/controller/direct/firestore/firestoredatabase_mappings.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ func FirestoreDatabaseObservedState_FromProto(mapCtx *direct.MapContext, in *pb.
}
out := &krm.FirestoreDatabaseObservedState{}
out.Uid = direct.LazyPtr(in.GetUid())
out.CreateTime = direct.ToOpenAPIDateTime(in.GetCreateTime())
out.UpdateTime = direct.ToOpenAPIDateTime(in.GetUpdateTime())
out.CreateTime = direct.StringTimestamp_FromProto(mapCtx, in.GetCreateTime())
out.UpdateTime = direct.StringTimestamp_FromProto(mapCtx, in.GetUpdateTime())
out.VersionRetentionPeriod = direct.Duration_FromProto(mapCtx, in.GetVersionRetentionPeriod())
out.EarliestVersionTime = direct.ToOpenAPIDateTime(in.GetEarliestVersionTime())
out.EarliestVersionTime = direct.StringTimestamp_FromProto(mapCtx, in.GetEarliestVersionTime())
out.KeyPrefix = direct.LazyPtr(in.GetKeyPrefix())
out.Etag = direct.LazyPtr(in.GetEtag())
return out
Expand Down

0 comments on commit db31aaf

Please sign in to comment.