config: Move Duration code to config.go

The code for Duration is in ruby.go. Since this type is not specific to
anything ruby, the main config.go file is a more natural place for it to
live. Move it there.

2 files changed, 25 insertions, 25 deletions

diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go
index 3f6757db3..49440fd0c 100644
--- a/internal/gitaly/config/config.go
+++ b/internal/gitaly/config/config.go
@@ -29,6 +29,31 @@ const (
 	GitalyDataPrefix = "+gitaly"
 )
 
+// Duration is a trick to let our TOML library parse durations from strings.
+type Duration time.Duration
+
+//nolint: revive,stylecheck // This is unintentionally missing documentation.
+func (d *Duration) Duration() time.Duration {
+	if d != nil {
+		return time.Duration(*d)
+	}
+	return 0
+}
+
+//nolint: revive,stylecheck // This is unintentionally missing documentation.
+func (d *Duration) UnmarshalText(text []byte) error {
+	td, err := time.ParseDuration(string(text))
+	if err == nil {
+		*d = Duration(td)
+	}
+	return err
+}
+
+//nolint: revive,stylecheck // This is unintentionally missing documentation.
+func (d Duration) MarshalText() ([]byte, error) {
+	return []byte(time.Duration(d).String()), nil
+}
+
 // DailyJob enables a daily task to be scheduled for specific storages
 type DailyJob struct {
 	Hour     uint     `toml:"start_hour"`
diff --git a/internal/gitaly/config/ruby.go b/internal/gitaly/config/ruby.go
index 5bcc03ab8..45d338703 100644
--- a/internal/gitaly/config/ruby.go
+++ b/internal/gitaly/config/ruby.go
@@ -17,31 +17,6 @@ type Ruby struct {
 	RuggedGitConfigSearchPath string   `toml:"rugged_git_config_search_path"`
 }
 
-// Duration is a trick to let our TOML library parse durations from strings.
-type Duration time.Duration
-
-//nolint: revive,stylecheck // This is unintentionally missing documentation.
-func (d *Duration) Duration() time.Duration {
-	if d != nil {
-		return time.Duration(*d)
-	}
-	return 0
-}
-
-//nolint: revive,stylecheck // This is unintentionally missing documentation.
-func (d *Duration) UnmarshalText(text []byte) error {
-	td, err := time.ParseDuration(string(text))
-	if err == nil {
-		*d = Duration(td)
-	}
-	return err
-}
-
-//nolint: revive,stylecheck // This is unintentionally missing documentation.
-func (d Duration) MarshalText() ([]byte, error) {
-	return []byte(time.Duration(d).String()), nil
-}
-
 // ConfigureRuby validates the gitaly-ruby configuration and sets default values.
 func (cfg *Cfg) ConfigureRuby() error {
 	if cfg.Ruby.GracefulRestartTimeout.Duration() == 0 {