diff options
| author | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2023-02-14 16:16:13 +0700 |
|---|---|---|
| committer | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2023-02-14 16:16:13 +0700 |
| commit | 11227dd8a136f8735fc2d3d434345f2c24112f87 (patch) | |
| tree | 2d8c73bf50affc370512299a99ad123811aff601 /internal/command | |
| parent | a2ad411994042e0f5a94f68fe4325c5d52da9c58 (diff) | |
| download | gitlab-shell-11227dd8a136f8735fc2d3d434345f2c24112f87.tar.gz | |
Add DNS discovery support for Gitaly/Praefect
All the implementations of DNS discovery were done in this epic:
https://gitlab.com/groups/gitlab-org/-/epics/8971. Gitaly allows clients
to configure DNS discovery via dial option. This MR adds the exposed
dial options to client connection creation in Gitlab-shell.
Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/4722
Changelog: added
Diffstat (limited to 'internal/command')
| -rw-r--r-- | internal/command/receivepack/gitalycall_test.go | 134 | ||||
| -rw-r--r-- | internal/command/uploadarchive/gitalycall_test.go | 94 | ||||
| -rw-r--r-- | internal/command/uploadpack/gitalycall_test.go | 94 |
3 files changed, 170 insertions, 152 deletions
diff --git a/internal/command/receivepack/gitalycall_test.go b/internal/command/receivepack/gitalycall_test.go index eadc43b..9f70189 100644 --- a/internal/command/receivepack/gitalycall_test.go +++ b/internal/command/receivepack/gitalycall_test.go @@ -3,6 +3,7 @@ package receivepack import ( "bytes" "context" + "fmt" "testing" "github.com/stretchr/testify/require" @@ -17,80 +18,85 @@ import ( ) func TestReceivePack(t *testing.T) { - gitalyAddress, testServer := testserver.StartGitalyServer(t) + for _, network := range []string{"unix", "tcp", "dns"} { + t.Run(fmt.Sprintf("via %s network", network), func(t *testing.T) { + gitalyAddress, testServer := testserver.StartGitalyServer(t, network) + t.Log(fmt.Sprintf("Server address: %s", gitalyAddress)) - requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) - url := testserver.StartHttpServer(t, requests) + requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) + url := testserver.StartHttpServer(t, requests) - testCases := []struct { - username string - keyId string - }{ - { - username: "john.doe", - }, - { - keyId: "123", - }, - } + testCases := []struct { + username string + keyId string + }{ + { + username: "john.doe", + }, + { + keyId: "123", + }, + } - for _, tc := range testCases { - output := &bytes.Buffer{} - input := &bytes.Buffer{} - repo := "group/repo" + for _, tc := range testCases { + output := &bytes.Buffer{} + input := &bytes.Buffer{} + repo := "group/repo" - env := sshenv.Env{ - IsSSHConnection: true, - OriginalCommand: "git-receive-pack " + repo, - RemoteAddr: "127.0.0.1", - } + env := sshenv.Env{ + IsSSHConnection: true, + OriginalCommand: "git-receive-pack " + repo, + RemoteAddr: "127.0.0.1", + } - args := &commandargs.Shell{ - CommandType: commandargs.ReceivePack, - SshArgs: []string{"git-receive-pack", repo}, - Env: env, - } + args := &commandargs.Shell{ + CommandType: commandargs.ReceivePack, + SshArgs: []string{"git-receive-pack", repo}, + Env: env, + } - if tc.username != "" { - args.GitlabUsername = tc.username - } else { - args.GitlabKeyId = tc.keyId - } + if tc.username != "" { + args.GitlabUsername = tc.username + } else { + args.GitlabKeyId = tc.keyId + } - cfg := &config.Config{GitlabUrl: url} - cfg.GitalyClient.InitSidechannelRegistry(context.Background()) - cmd := &Command{ - Config: cfg, - Args: args, - ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input}, - } + cfg := &config.Config{GitlabUrl: url} + cfg.GitalyClient.InitSidechannelRegistry(context.Background()) + cmd := &Command{ + Config: cfg, + Args: args, + ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input}, + } - ctx := correlation.ContextWithCorrelation(context.Background(), "a-correlation-id") - ctx = correlation.ContextWithClientName(ctx, "gitlab-shell-tests") + ctx := correlation.ContextWithCorrelation(context.Background(), "a-correlation-id") + ctx = correlation.ContextWithClientName(ctx, "gitlab-shell-tests") - err := cmd.Execute(ctx) - require.NoError(t, err) + err := cmd.Execute(ctx) + require.NoError(t, err) - if tc.username != "" { - require.Equal(t, "ReceivePack: 1 "+repo, output.String()) - } else { - require.Equal(t, "ReceivePack: key-123 "+repo, output.String()) - } + if tc.username != "" { + require.Equal(t, "ReceivePack: 1 "+repo, output.String()) + } else { + require.Equal(t, "ReceivePack: key-123 "+repo, output.String()) + } - for k, v := range map[string]string{ - "gitaly-feature-cache_invalidator": "true", - "gitaly-feature-inforef_uploadpack_cache": "false", - "x-gitlab-client-name": "gitlab-shell-tests-git-receive-pack", - "key_id": "123", - "user_id": "1", - "remote_ip": "127.0.0.1", - "key_type": "key", - } { - actual := testServer.ReceivedMD[k] - require.Len(t, actual, 1) - require.Equal(t, v, actual[0]) - } - require.Empty(t, testServer.ReceivedMD["some-other-ff"]) - require.Equal(t, testServer.ReceivedMD["x-gitlab-correlation-id"][0], "a-correlation-id") + for k, v := range map[string]string{ + "gitaly-feature-cache_invalidator": "true", + "gitaly-feature-inforef_uploadpack_cache": "false", + "x-gitlab-client-name": "gitlab-shell-tests-git-receive-pack", + "key_id": "123", + "user_id": "1", + "remote_ip": "127.0.0.1", + "key_type": "key", + } { + actual := testServer.ReceivedMD[k] + require.Len(t, actual, 1) + require.Equal(t, v, actual[0]) + } + require.Empty(t, testServer.ReceivedMD["some-other-ff"]) + require.Equal(t, testServer.ReceivedMD["x-gitlab-correlation-id"][0], "a-correlation-id") + } + }) } } diff --git a/internal/command/uploadarchive/gitalycall_test.go b/internal/command/uploadarchive/gitalycall_test.go index be6032d..0479e30 100644 --- a/internal/command/uploadarchive/gitalycall_test.go +++ b/internal/command/uploadarchive/gitalycall_test.go @@ -3,6 +3,7 @@ package uploadarchive import ( "bytes" "context" + "fmt" "testing" "github.com/stretchr/testify/require" @@ -17,59 +18,64 @@ import ( ) func TestUploadArchive(t *testing.T) { - gitalyAddress, testServer := testserver.StartGitalyServer(t) + for _, network := range []string{"unix", "tcp", "dns"} { + t.Run(fmt.Sprintf("via %s network", network), func(t *testing.T) { + gitalyAddress, testServer := testserver.StartGitalyServer(t, network) + t.Log(fmt.Sprintf("Server address: %s", gitalyAddress)) - requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) - url := testserver.StartHttpServer(t, requests) + requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) + url := testserver.StartHttpServer(t, requests) - output := &bytes.Buffer{} - input := &bytes.Buffer{} + output := &bytes.Buffer{} + input := &bytes.Buffer{} - userId := "1" - repo := "group/repo" + userId := "1" + repo := "group/repo" - env := sshenv.Env{ - IsSSHConnection: true, - OriginalCommand: "git-upload-archive " + repo, - RemoteAddr: "127.0.0.1", - } + env := sshenv.Env{ + IsSSHConnection: true, + OriginalCommand: "git-upload-archive " + repo, + RemoteAddr: "127.0.0.1", + } - args := &commandargs.Shell{ - GitlabKeyId: userId, - CommandType: commandargs.UploadArchive, - SshArgs: []string{"git-upload-archive", repo}, - Env: env, - } + args := &commandargs.Shell{ + GitlabKeyId: userId, + CommandType: commandargs.UploadArchive, + SshArgs: []string{"git-upload-archive", repo}, + Env: env, + } - cfg := &config.Config{GitlabUrl: url} - cfg.GitalyClient.InitSidechannelRegistry(context.Background()) - cmd := &Command{ - Config: cfg, - Args: args, - ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input}, - } + cfg := &config.Config{GitlabUrl: url} + cfg.GitalyClient.InitSidechannelRegistry(context.Background()) + cmd := &Command{ + Config: cfg, + Args: args, + ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input}, + } - ctx := correlation.ContextWithCorrelation(context.Background(), "a-correlation-id") - ctx = correlation.ContextWithClientName(ctx, "gitlab-shell-tests") + ctx := correlation.ContextWithCorrelation(context.Background(), "a-correlation-id") + ctx = correlation.ContextWithClientName(ctx, "gitlab-shell-tests") - err := cmd.Execute(ctx) - require.NoError(t, err) + err := cmd.Execute(ctx) + require.NoError(t, err) - require.Equal(t, "UploadArchive: "+repo, output.String()) + require.Equal(t, "UploadArchive: "+repo, output.String()) - for k, v := range map[string]string{ - "gitaly-feature-cache_invalidator": "true", - "gitaly-feature-inforef_uploadpack_cache": "false", - "x-gitlab-client-name": "gitlab-shell-tests-git-upload-archive", - "key_id": "123", - "user_id": "1", - "remote_ip": "127.0.0.1", - "key_type": "key", - } { - actual := testServer.ReceivedMD[k] - require.Len(t, actual, 1) - require.Equal(t, v, actual[0]) + for k, v := range map[string]string{ + "gitaly-feature-cache_invalidator": "true", + "gitaly-feature-inforef_uploadpack_cache": "false", + "x-gitlab-client-name": "gitlab-shell-tests-git-upload-archive", + "key_id": "123", + "user_id": "1", + "remote_ip": "127.0.0.1", + "key_type": "key", + } { + actual := testServer.ReceivedMD[k] + require.Len(t, actual, 1) + require.Equal(t, v, actual[0]) + } + require.Empty(t, testServer.ReceivedMD["some-other-ff"]) + require.Equal(t, testServer.ReceivedMD["x-gitlab-correlation-id"][0], "a-correlation-id") + }) } - require.Empty(t, testServer.ReceivedMD["some-other-ff"]) - require.Equal(t, testServer.ReceivedMD["x-gitlab-correlation-id"][0], "a-correlation-id") } diff --git a/internal/command/uploadpack/gitalycall_test.go b/internal/command/uploadpack/gitalycall_test.go index 6b6f009..874d12e 100644 --- a/internal/command/uploadpack/gitalycall_test.go +++ b/internal/command/uploadpack/gitalycall_test.go @@ -3,6 +3,7 @@ package uploadpack import ( "bytes" "context" + "fmt" "testing" "github.com/stretchr/testify/require" @@ -17,60 +18,65 @@ import ( ) func TestUploadPack(t *testing.T) { - gitalyAddress, testServer := testserver.StartGitalyServer(t) + for _, network := range []string{"unix", "tcp", "dns"} { + t.Run(fmt.Sprintf("via %s network", network), func(t *testing.T) { + gitalyAddress, testServer := testserver.StartGitalyServer(t, network) + t.Log(fmt.Sprintf("Server address: %s", gitalyAddress)) - requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) - url := testserver.StartHttpServer(t, requests) + requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress) + url := testserver.StartHttpServer(t, requests) - output := &bytes.Buffer{} - input := &bytes.Buffer{} + output := &bytes.Buffer{} + input := &bytes.Buffer{} - userId := "1" - repo := "group/repo" + userId := "1" + repo := "group/repo" - env := sshenv.Env{ - IsSSHConnection: true, - OriginalCommand: "git-upload-pack " + repo, - RemoteAddr: "127.0.0.1", - } + env := sshenv.Env{ + IsSSHConnection: true, + OriginalCommand: "git-upload-pack " + repo, + RemoteAddr: "127.0.0.1", + } - args := &commandargs.Shell{ - GitlabKeyId: userId, - CommandType: commandargs.UploadPack, - SshArgs: []string{"git-upload-pack", repo}, - Env: env, - } + args := &commandargs.Shell{ + GitlabKeyId: userId, + CommandType: commandargs.UploadPack, + SshArgs: []string{"git-upload-pack", repo}, + Env: env, + } - ctx := correlation.ContextWithCorrelation(context.Background(), "a-correlation-id") - ctx = correlation.ContextWithClientName(ctx, "gitlab-shell-tests") + ctx := correlation.ContextWithCorrelation(context.Background(), "a-correlation-id") + ctx = correlation.ContextWithClientName(ctx, "gitlab-shell-tests") - cfg := &config.Config{GitlabUrl: url} - cfg.GitalyClient.InitSidechannelRegistry(ctx) + cfg := &config.Config{GitlabUrl: url} + cfg.GitalyClient.InitSidechannelRegistry(ctx) - cmd := &Command{ - Config: cfg, - Args: args, - ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input}, - } + cmd := &Command{ + Config: cfg, + Args: args, + ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input}, + } - err := cmd.Execute(ctx) - require.NoError(t, err) + err := cmd.Execute(ctx) + require.NoError(t, err) - require.Equal(t, "SSHUploadPackWithSidechannel: "+repo, output.String()) + require.Equal(t, "SSHUploadPackWithSidechannel: "+repo, output.String()) - for k, v := range map[string]string{ - "gitaly-feature-cache_invalidator": "true", - "gitaly-feature-inforef_uploadpack_cache": "false", - "x-gitlab-client-name": "gitlab-shell-tests-git-upload-pack", - "key_id": "123", - "user_id": "1", - "remote_ip": "127.0.0.1", - "key_type": "key", - } { - actual := testServer.ReceivedMD[k] - require.Len(t, actual, 1) - require.Equal(t, v, actual[0]) + for k, v := range map[string]string{ + "gitaly-feature-cache_invalidator": "true", + "gitaly-feature-inforef_uploadpack_cache": "false", + "x-gitlab-client-name": "gitlab-shell-tests-git-upload-pack", + "key_id": "123", + "user_id": "1", + "remote_ip": "127.0.0.1", + "key_type": "key", + } { + actual := testServer.ReceivedMD[k] + require.Len(t, actual, 1) + require.Equal(t, v, actual[0]) + } + require.Empty(t, testServer.ReceivedMD["some-other-ff"]) + require.Equal(t, testServer.ReceivedMD["x-gitlab-correlation-id"][0], "a-correlation-id") + }) } - require.Empty(t, testServer.ReceivedMD["some-other-ff"]) - require.Equal(t, testServer.ReceivedMD["x-gitlab-correlation-id"][0], "a-correlation-id") } |
