diff options
Diffstat (limited to 'internal/gitlabnet/accessverifier')
| -rw-r--r-- | internal/gitlabnet/accessverifier/client.go | 3 | ||||
| -rw-r--r-- | internal/gitlabnet/accessverifier/client_test.go | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/internal/gitlabnet/accessverifier/client.go b/internal/gitlabnet/accessverifier/client.go index 302a9e1..a9c7d97 100644 --- a/internal/gitlabnet/accessverifier/client.go +++ b/internal/gitlabnet/accessverifier/client.go @@ -5,6 +5,7 @@ import ( "net/http" pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitlab-shell/client" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" @@ -17,7 +18,7 @@ const ( ) type Client struct { - client *gitlabnet.GitlabClient + client *client.GitlabNetClient } type Request struct { diff --git a/internal/gitlabnet/accessverifier/client_test.go b/internal/gitlabnet/accessverifier/client_test.go index 009dcc0..7ddbb5e 100644 --- a/internal/gitlabnet/accessverifier/client_test.go +++ b/internal/gitlabnet/accessverifier/client_test.go @@ -8,12 +8,11 @@ import ( "testing" "github.com/stretchr/testify/require" - pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitlab-shell/client" + "gitlab.com/gitlab-org/gitlab-shell/client/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet" - "gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/testserver" "gitlab.com/gitlab-org/gitlab-shell/internal/testhelper" ) @@ -214,7 +213,7 @@ func setup(t *testing.T, allowedPayload string) (*Client, func()) { require.NoError(t, err) case "2": w.WriteHeader(http.StatusForbidden) - errBody := &gitlabnet.ErrorResponse{ + errBody := &client.ErrorResponse{ Message: "Not allowed!", } require.NoError(t, json.NewEncoder(w).Encode(errBody)) |