Merge pull request #2822 from jongwooo/inject-a-fake-clock-during-testing-gwctl-get-gateways

Inject a fake clock during testing `gwctl get gateways`

Author: k8s-ci-robot

gwctl/pkg/cmd/get/get.go

@@ -22,6 +22,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"k8s.io/utils/clock"
+
 	"sigs.k8s.io/gateway-api/gwctl/pkg/cmd/utils"
 	"sigs.k8s.io/gateway-api/gwctl/pkg/printer"
 	"sigs.k8s.io/gateway-api/gwctl/pkg/resourcediscovery"
@@ -60,7 +62,8 @@ func runGet(args []string, params *utils.CmdParams, flags *getFlags) {
 		K8sClients:    params.K8sClients,
 		PolicyManager: params.PolicyManager,
 	}
-	gwPrinter := &printer.GatewaysPrinter{Out: params.Out}
+	realClock := clock.RealClock{}
+	gwPrinter := &printer.GatewaysPrinter{Out: params.Out, Clock: realClock}
 	policiesPrinter := &printer.PoliciesPrinter{Out: params.Out}
 	httpRoutesPrinter := &printer.HTTPRoutesPrinter{Out: params.Out}
 

gwctl/pkg/printer/gateways.go

@@ -21,18 +21,18 @@ import (
 	"io"
 	"strings"
 	"text/tabwriter"
-	"time"
-
-	"sigs.k8s.io/yaml"
 
 	"sigs.k8s.io/gateway-api/gwctl/pkg/policymanager"
 	"sigs.k8s.io/gateway-api/gwctl/pkg/resourcediscovery"
-
+	"sigs.k8s.io/yaml"
+	
 	"k8s.io/apimachinery/pkg/util/duration"
+	"k8s.io/utils/clock"
 )
 
 type GatewaysPrinter struct {
-	Out io.Writer
+	Out   io.Writer
+	Clock clock.Clock
 }
 
 type gatewayDescribeView struct {
@@ -74,7 +74,7 @@ func (gp *GatewaysPrinter) Print(resourceModel *resourcediscovery.ResourceModel)
 			}
 		}
 
-		age := duration.HumanDuration(time.Since(gatewayNode.Gateway.GetCreationTimestamp().Time))
+		age := duration.HumanDuration(gp.Clock.Since(gatewayNode.Gateway.GetCreationTimestamp().Time))
 
 		row := []string{
 			gatewayNode.Gateway.GetName(),

gwctl/pkg/printer/gateways_test.go

@@ -26,6 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	testingclock "k8s.io/utils/clock/testing"
 
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
@@ -35,6 +36,7 @@ import (
 )
 
 func TestGatewaysPrinter_Print(t *testing.T) {
+	fakeClock := testingclock.NewFakeClock(time.Now())
 	objects := []runtime.Object{
 		&gatewayv1.GatewayClass{
 			ObjectMeta: metav1.ObjectMeta{
@@ -50,7 +52,7 @@ func TestGatewaysPrinter_Print(t *testing.T) {
 			ObjectMeta: metav1.ObjectMeta{
 				Name: "foo-gateway",
 				CreationTimestamp: metav1.Time{
-					Time: time.Now().Add(-time.Second),
+					Time: fakeClock.Now().Add(-time.Second),
 				},
 			},
 			Spec: gatewayv1.GatewaySpec{
@@ -90,7 +92,8 @@ func TestGatewaysPrinter_Print(t *testing.T) {
 	}
 
 	gp := &GatewaysPrinter{
-		Out: params.Out,
+		Out:   params.Out,
+		Clock: fakeClock,
 	}
 	gp.Print(resourceModel)
 
@@ -106,6 +109,7 @@ foo-gateway  foo-gatewayclass  10.0.0.1   80     True        1s
 }
 
 func TestGatewaysPrinter_PrintDescribeView(t *testing.T) {
+	fakeClock := testingclock.NewFakeClock(time.Now())
 	objects := []runtime.Object{
 		&gatewayv1.GatewayClass{
 			ObjectMeta: metav1.ObjectMeta{
@@ -240,7 +244,8 @@ func TestGatewaysPrinter_PrintDescribeView(t *testing.T) {
 	}
 
 	gp := &GatewaysPrinter{
-		Out: params.Out,
+		Out:   params.Out,
+		Clock: fakeClock,
 	}
 	gp.PrintDescribeView(resourceModel)