From 32db7e176d755315cecc9e1fba67a859ef91802e Mon Sep 17 00:00:00 2001 From: Ezequiel Victorero Date: Mon, 10 Nov 2025 09:14:51 -0300 Subject: [PATCH] ShortURL: Fix wrong creation timestamp conversion (#113646) --- pkg/registry/apps/shorturl/conversions.go | 4 ++-- pkg/tests/apis/shorturl/shorturl_test.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/registry/apps/shorturl/conversions.go b/pkg/registry/apps/shorturl/conversions.go index 4392dd8a44b..aa4a5c09d4f 100644 --- a/pkg/registry/apps/shorturl/conversions.go +++ b/pkg/registry/apps/shorturl/conversions.go @@ -25,14 +25,14 @@ func convertToK8sResource(v *shorturls.ShortUrl, namespacer request.NamespaceMap // resourceVersion can't be 0, since we are using the lastSeenAt value, when it's zero we default to current time resourceVersion := fmt.Sprintf("%d", v.LastSeenAt) if v.LastSeenAt == 0 { - resourceVersion = fmt.Sprintf("%d", time.Now().UnixMilli()) + resourceVersion = fmt.Sprintf("%d", time.Now().Unix()) } p := &shorturl.ShortURL{ ObjectMeta: metav1.ObjectMeta{ Name: v.Uid, ResourceVersion: resourceVersion, - CreationTimestamp: metav1.NewTime(time.UnixMilli(v.CreatedAt)), + CreationTimestamp: metav1.NewTime(time.Unix(v.CreatedAt, 0)), Namespace: namespacer(v.OrgId), }, Spec: spec, diff --git a/pkg/tests/apis/shorturl/shorturl_test.go b/pkg/tests/apis/shorturl/shorturl_test.go index 4eae45ecf57..be7023c0c6a 100644 --- a/pkg/tests/apis/shorturl/shorturl_test.go +++ b/pkg/tests/apis/shorturl/shorturl_test.go @@ -211,6 +211,7 @@ func doDualWriteTests(t *testing.T, helper *apis.K8sTestHelper, mode grafanarest found, err := client.Resource.Get(context.Background(), uid, metav1.GetOptions{}) require.NoError(t, err) assert.Equal(t, uid, found.GetName()) + assert.LessOrEqual(t, time.Since(found.GetCreationTimestamp().Time).Seconds(), 30.0, "creation timestamp should be within last 30 seconds") // Verify cross-API consistency getFromBothAPIs(t, helper, client, uid)