Skip to content

gitaly: Move Gitaly-specific code into `internal/gitaly`

Patrick Steinhardt requested to merge pks-gitaly-module into master

Since the introduction of Praefect, our code layout started to become confusing: while Praefect code lives in internal/praefect, Gitaly-specific code is all over the place and not neatly singled out. This makes it hard at times to tell apart Praefect- and Gitaly-specific from generic code.

To improve the situation, this commit thus moves most of the server specific code into a new internal/gitaly package. Currently, this is the internal/config, internal/server, internal/service and internal/rubyserver packages, which are all main components of Gitaly. The move was realized with the following script:

#!/bin/sh
mkdir -p internal/gitaly
git mv internal/{config,server,service,rubyserver} internal/gitaly/
find . -name '*.go' -exec sed -i \
    -e 's|gitlab-org/gitaly/internal/rubyserver|gitlab-org/gitaly/internal/gitaly/rubyserver|' \
    -e 's|gitlab-org/gitaly/internal/server|gitlab-org/gitaly/internal/gitaly/server|' \
    -e 's|gitlab-org/gitaly/internal/service|gitlab-org/gitaly/internal/gitaly/service|' \
    -e 's|gitlab-org/gitaly/internal/config|gitlab-org/gitaly/internal/gitaly/config|' {} \;

In addition to that, two minor adjustments were needed for the internal/gitaly/service/smarthttp tests, which used relative paths to identify the Ruby directory for hooks.

Merge request reports