Remove zero time checking

gravitational · Feb 23, 2024 · 66c2592 · 66c2592
1 parent 4bdd3e4
commit 66c2592
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/api/types/access_request.go b/api/types/access_request.go
@@ -25,7 +25,6 @@ import (
 
 	"github.com/gravitational/trace"
 
-	"github.com/gravitational/teleport/api/constants"
 	"github.com/gravitational/teleport/api/utils"
 )
 
@@ -827,13 +826,3 @@ func NewAccessRequestAllowedPromotions(promotions []*AccessRequestAllowedPromoti
 		Promotions: promotions,
 	}
 }
-
-// ValidateAssumeStartTime returns error if start time too far in the future.
-func ValidateAssumeStartTime(assumeStartTime time.Time) error {
-	if time.Until(assumeStartTime) > constants.MaxAssumeStartDuration {
-		return trace.BadParameter("assume start time is too far in the future: latest date %q",
-			assumeStartTime.Add(constants.MaxAssumeStartDuration).Format(time.RFC3339))
-	}
-
-	return nil
-}
diff --git a/lib/services/access_request.go b/lib/services/access_request.go
@@ -33,6 +33,7 @@ import (
 
 	"github.com/gravitational/teleport/api/accessrequest"
 	"github.com/gravitational/teleport/api/client"
+	"github.com/gravitational/teleport/api/constants"
 	apidefaults "github.com/gravitational/teleport/api/defaults"
 	"github.com/gravitational/teleport/api/types"
 	apiutils "github.com/gravitational/teleport/api/utils"
@@ -1097,8 +1098,10 @@ func (m *RequestValidator) Validate(ctx context.Context, req types.AccessRequest
 	}
 
 	if req.GetAssumeStartTime() != nil {
-		if err := types.ValidateAssumeStartTime(*req.GetAssumeStartTime()); err != nil {
-			return trace.Wrap(err)
+		assumeStartTime := *req.GetAssumeStartTime()
+		if time.Until(assumeStartTime) > constants.MaxAssumeStartDuration {
+			return trace.BadParameter("assume start time is too far in the future: latest date %q",
+				assumeStartTime.Add(constants.MaxAssumeStartDuration).Format(time.RFC3339))
 		}
 	}
 

diff --git a/lib/teleterm/apiserver/handler/time_converter.go b/lib/teleterm/apiserver/handler/time_converter.go
@@ -25,7 +25,7 @@ import (
 func getProtoTimestamp(time *time.Time) *timestamppb.Timestamp {
 	var protoTime *timestamppb.Timestamp
 
-	if time != nil && !time.IsZero() {
+	if time != nil {
 		protoTime = timestamppb.New(*time)
 	}
 

diff --git a/lib/teleterm/apiserver/handler/time_converter_test.go b/lib/teleterm/apiserver/handler/time_converter_test.go
@@ -18,7 +18,6 @@ package handler
 
 import (
 	"testing"
-	"time"
 
 	"github.com/jonboulle/clockwork"
 	"github.com/stretchr/testify/require"
@@ -28,10 +27,7 @@ import (
 func TestGetProtoTimestamp(t *testing.T) {
 	clock := clockwork.NewFakeClock()
 
-	ts := getProtoTimestamp(&time.Time{})
-	require.Empty(t, ts)
-
-	ts = getProtoTimestamp(nil)
+	ts := getProtoTimestamp(nil)
 	require.Empty(t, ts)
 
 	time := clock.Now().UTC()

diff --git a/lib/teleterm/clusters/cluster_access_requests.go b/lib/teleterm/clusters/cluster_access_requests.go
@@ -151,7 +151,7 @@ func (c *Cluster) CreateAccessRequest(ctx context.Context, req *api.CreateAccess
 	request.SetRequestReason(req.Reason)
 	request.SetSuggestedReviewers(req.SuggestedReviewers)
 
-	if req.GetAssumeStartTime() != nil && !req.AssumeStartTime.AsTime().IsZero() {
+	if req.GetAssumeStartTime() != nil {
 		request.SetAssumeStartTime(req.AssumeStartTime.AsTime())
 	}
 
@@ -198,7 +198,7 @@ func (c *Cluster) ReviewAccessRequest(ctx context.Context, req *api.ReviewAccess
 		defer authClient.Close()
 
 		var assumeStartTimePtr *time.Time
-		if req.AssumeStartTime != nil && !req.AssumeStartTime.AsTime().IsZero() {
+		if req.AssumeStartTime != nil {
 			assumeStartTime := req.AssumeStartTime.AsTime()
 			assumeStartTimePtr = &assumeStartTime
 		}