refactored NewRest function to not to break api and modified tests

antrea-io · Aug 3, 2024 · 05c102d · 05c102d
1 parent 91b7af0
commit 05c102d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
@@ -16,7 +16,6 @@ package apiserver
 
 import (
 	"context"
-	"k8s.io/utils/clock"
 	"time"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -242,7 +241,7 @@ func installAPIGroup(s *APIServer, c completedConfig) error {
 	statsStorage["antreaclusternetworkpolicystats"] = antreaclusternetworkpolicystats.NewREST(c.extraConfig.statsAggregator)
 	statsStorage["antreanetworkpolicystats"] = antreanetworkpolicystats.NewREST(c.extraConfig.statsAggregator)
 	statsStorage["multicastgroups"] = multicastgroup.NewREST(c.extraConfig.statsAggregator)
-	statsStorage["nodelatencystats"] = nodelatencystats.NewREST(clock.RealClock{})
+	statsStorage["nodelatencystats"] = nodelatencystats.NewREST()
 	statsGroup.VersionedResourcesStorageMap["v1alpha1"] = statsStorage
 
 	groups := []*genericapiserver.APIGroupInfo{&cpGroup, &systemGroup, &statsGroup}

diff --git a/pkg/apiserver/registry/stats/nodelatencystats/rest.go b/pkg/apiserver/registry/stats/nodelatencystats/rest.go
@@ -46,7 +46,11 @@ var (
 )
 
 // NewREST returns a REST object that will work against API services.
-func NewREST(clock clock.Clock) *REST {
+func NewREST() *REST {
+	return newRESTWithClock(clock.RealClock{})
+}
+
+func newRESTWithClock(clock clock.Clock) *REST {
 	return &REST{
 		indexer: cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{}),
 		clock:   clock,

diff --git a/pkg/apiserver/registry/stats/nodelatencystats/rest_test.go b/pkg/apiserver/registry/stats/nodelatencystats/rest_test.go
@@ -31,7 +31,7 @@ import (
 
 func TestREST(t *testing.T) {
 	fakeClock := clocktesting.NewFakeClock(time.Now())
-	r := NewREST(fakeClock)
+	r := newRESTWithClock(fakeClock)
 	assert.Equal(t, &statsv1alpha1.NodeLatencyStats{}, r.New())
 	assert.Equal(t, &statsv1alpha1.NodeLatencyStats{}, r.NewList())
 	assert.False(t, r.NamespaceScoped())
@@ -70,14 +70,14 @@ func TestRESTCreate(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			r := NewREST(fakeClock)
+			r := newRESTWithClock(fakeClock)
 			// Advance the fakeClock to simulate time advancement.
 			fakeClock.SetTime(fakeClock.Now().Add(1 * time.Minute))
 			ctx := context.Background()
 			obj, err := r.Create(ctx, tt.summary, nil, nil)
 			require.NoError(t, err)
 
-			if tt.name == "create with time not added" {
+			if tt.summary.CreationTimestamp.IsZero() {
 				assert.Equal(t, metav1.Time{Time: fakeClock.Now()}, obj.(*statsv1alpha1.NodeLatencyStats).CreationTimestamp)
 
 			} else {
@@ -122,7 +122,7 @@ func TestRESTGet(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			r := NewREST(fakeClock)
+			r := newRESTWithClock(fakeClock)
 			ctx := context.Background()
 
 			_, err := r.Create(ctx, tt.summary, nil, nil)
@@ -174,7 +174,7 @@ func TestRESTDelete(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			r := NewREST(fakeClock)
+			r := newRESTWithClock(fakeClock)
 			ctx := context.Background()
 
 			_, err := r.Create(ctx, tt.summary, nil, nil)
@@ -206,7 +206,7 @@ func TestRESTList(t *testing.T) {
 		},
 	}
 
-	r := NewREST(fakeClock)
+	r := newRESTWithClock(fakeClock)
 	ctx := context.Background()
 
 	_, err := r.Create(ctx, summary, nil, nil)
@@ -248,12 +248,13 @@ func TestRESTConvertToTable(t *testing.T) {
 	}
 	expectedCells := []interface{}{"node1", 2, "1.5ms", "2ms"}
 
-	r := NewREST(fakeClock)
+	r := newRESTWithClock(fakeClock)
 	ctx := context.Background()
 
 	_, err := r.Create(ctx, summary, nil, nil)
 	require.NoError(t, err)
 	obj, err := r.ConvertToTable(ctx, summary, nil)
 	require.NoError(t, err)
 	assert.Equal(t, expectedCells, obj.Rows[0].Cells)
-}
+}
+