storage: Extract InjectGitalyServersEnv into storage package

Colocates this function with other functions that manipulate this value
on context.

1 files changed, 1 insertions, 21 deletions

diff --git a/cmd/gitaly-backup/main.go b/cmd/gitaly-backup/main.go
index 97334021f..eed6a6d63 100644
--- a/cmd/gitaly-backup/main.go
+++ b/cmd/gitaly-backup/main.go
@@ -3,14 +3,11 @@ package main
 import (
 	"context"
 	"flag"
-	"fmt"
 	"io"
 	"os"
 
 	"gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/storage"
-	"gitlab.com/gitlab-org/gitaly/v15/internal/helper/env"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/log"
-	"google.golang.org/grpc/metadata"
 )
 
 type subcmd interface {
@@ -45,7 +42,7 @@ func main() {
 	subcmd.Flags(subcmdFlags)
 	_ = subcmdFlags.Parse(flags.Args()[2:])
 
-	ctx, err := injectGitalyServersEnv(context.Background())
+	ctx, err := storage.InjectGitalyServersEnv(context.Background())
 	if err != nil {
 		logger.Fatalf("%s", err)
 	}
@@ -54,20 +51,3 @@ func main() {
 		logger.Fatalf("%s", err)
 	}
 }
-
-func injectGitalyServersEnv(ctx context.Context) (context.Context, error) {
-	rawServers := env.GetString("GITALY_SERVERS", "")
-	if rawServers == "" {
-		return ctx, nil
-	}
-
-	md := metadata.Pairs("gitaly-servers", rawServers)
-	ctx = metadata.NewIncomingContext(ctx, md)
-
-	// Make sure we fail early if the value in the env var cannot be interpreted.
-	if _, err := storage.ExtractGitalyServers(ctx); err != nil {
-		return nil, fmt.Errorf("injecting GITALY_SERVERS: %w", err)
-	}
-
-	return ctx, nil
-}