diff options
| author | Toon Claes <toon@gitlab.com> | 2023-09-08 16:36:29 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2023-09-08 16:36:29 +0300 |
| commit | e7e38b42d14bd849c49e24034f750fc210c226ae (patch) | |
| tree | 63aeaceefcb49c1269ed2c463ac0c84ad382dbc6 /tools | |
| parent | 5c6c63b811c45b73b6b18e74203493c5696ee549 (diff) | |
| parent | 2b86a6e586f3ae1a223bf21193366272e72623c7 (diff) | |
Merge branch 'pks-client-split-external-and-internal' into 'master'
client: Strictly distinguish internal and public code
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6336
Merged-by: Toon Claes <toon@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/test-boot/main.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/test-boot/main.go b/tools/test-boot/main.go index d27e53856..a9739b00b 100644 --- a/tools/test-boot/main.go +++ b/tools/test-boot/main.go @@ -14,7 +14,7 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/client" + "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" "google.golang.org/grpc" ) @@ -112,9 +112,9 @@ func spawnAndWait(ctx context.Context, gitalyBin, configPath, socketPath string) for i := 0; i < 300; i++ { ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond) - conn, err := client.DialContext(ctx, "unix://"+socketPath, []grpc.DialOption{ + conn, err := client.Dial(ctx, "unix://"+socketPath, client.WithGrpcOptions([]grpc.DialOption{ grpc.WithBlock(), - }) + })) cancel() |