diff options
| author | Mikhail Mazurskiy <mmazurskiy@gitlab.com> | 2021-09-09 21:05:25 +1000 |
|---|---|---|
| committer | Mikhail Mazurskiy <mmazurskiy@gitlab.com> | 2021-09-09 21:05:25 +1000 |
| commit | 44737afce375d68a3c122991f6d94e3a84233dbb (patch) | |
| tree | 7d5b299ce6bcddcb0bdf33fa24a1c42c5e65e882 /internal/gitlabnet/client.go | |
| parent | 5edb579c23a06a2795c199478c88782b25f34d0d (diff) | |
| download | gitlab-shell-ash2k/use-moved-gitlab-client.tar.gz | |
Use moved GitLab client from Gitalyash2k/use-moved-gitlab-client
See https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3850
Diffstat (limited to 'internal/gitlabnet/client.go')
| -rw-r--r-- | internal/gitlabnet/client.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/internal/gitlabnet/client.go b/internal/gitlabnet/client.go index 39c3320..d63cfdf 100644 --- a/internal/gitlabnet/client.go +++ b/internal/gitlabnet/client.go @@ -5,8 +5,7 @@ import ( "fmt" "net/http" - "gitlab.com/gitlab-org/gitlab-shell/client" - + gitnet "gitlab.com/gitlab-org/gitaly/v14/gitlabnet" "gitlab.com/gitlab-org/gitlab-shell/internal/config" ) @@ -14,7 +13,7 @@ var ( ParsingError = fmt.Errorf("Parsing failed") ) -func GetClient(config *config.Config) (*client.GitlabNetClient, error) { +func GetClient(config *config.Config) (*gitnet.GitlabNetClient, error) { httpClient, err := config.HttpClient() if err != nil { return nil, err @@ -24,7 +23,7 @@ func GetClient(config *config.Config) (*client.GitlabNetClient, error) { return nil, fmt.Errorf("Unsupported protocol") } - return client.NewGitlabNetClient(config.HttpSettings.User, config.HttpSettings.Password, config.Secret, httpClient) + return gitnet.NewGitlabNetClient(config.HttpSettings.User, config.HttpSettings.Password, config.Secret, httpClient) } func ParseJSON(hr *http.Response, response interface{}) error { |