Merge branch 'ps-remove-drift_threshold_millis' into 'master'

proto: Remove deprecated drift_threshold_millis

Closes #4417

See merge request gitlab-org/gitaly!4843

2 files changed, 8 insertions, 11 deletions

diff --git a/internal/gitaly/service/server/clocksynced.go b/internal/gitaly/service/server/clocksynced.go
index 48d4d0b71..d3c64fa02 100644
--- a/internal/gitaly/service/server/clocksynced.go
+++ b/internal/gitaly/service/server/clocksynced.go
@@ -2,18 +2,17 @@ package server
 
 import (
 	"context"
-	"time"
 
 	"gitlab.com/gitlab-org/gitaly/v15/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
 )
 
+// ClockSynced returns whether the system clock has an acceptable time drift when compared to NTP service.
 func (s *server) ClockSynced(_ context.Context, req *gitalypb.ClockSyncedRequest) (*gitalypb.ClockSyncedResponse, error) {
-	driftThreshold := req.DriftThreshold.AsDuration()
-	if !req.DriftThreshold.IsValid() || driftThreshold == time.Duration(0) {
-		driftThreshold = time.Duration(req.DriftThresholdMillis * int64(time.Millisecond)) //nolint:staticcheck
+	if err := req.DriftThreshold.CheckValid(); err != nil {
+		return nil, helper.ErrInvalidArgument(err)
 	}
-	synced, err := helper.CheckClockSync(req.NtpHost, driftThreshold)
+	synced, err := helper.CheckClockSync(req.NtpHost, req.DriftThreshold.AsDuration())
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/praefect/service/server/clocksynced.go b/internal/praefect/service/server/clocksynced.go
index 9cb984a84..966028ab1 100644
--- a/internal/praefect/service/server/clocksynced.go
+++ b/internal/praefect/service/server/clocksynced.go
@@ -2,19 +2,17 @@ package server
 
 import (
 	"context"
-	"time"
 
 	"gitlab.com/gitlab-org/gitaly/v15/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
 )
 
-// ClockSynced checks if system clock is synced.
+// ClockSynced returns whether the system clock has an acceptable time drift when compared to NTP service.
 func (s *Server) ClockSynced(_ context.Context, req *gitalypb.ClockSyncedRequest) (*gitalypb.ClockSyncedResponse, error) {
-	driftThreshold := req.DriftThreshold.AsDuration()
-	if !req.DriftThreshold.IsValid() || driftThreshold == time.Duration(0) {
-		driftThreshold = time.Duration(req.DriftThresholdMillis * int64(time.Millisecond)) //nolint:staticcheck
+	if err := req.DriftThreshold.CheckValid(); err != nil {
+		return nil, helper.ErrInvalidArgument(err)
 	}
-	synced, err := helper.CheckClockSync(req.NtpHost, driftThreshold)
+	synced, err := helper.CheckClockSync(req.NtpHost, req.DriftThreshold.AsDuration())
 	if err != nil {
 		return nil, err
 	}