diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-12-19 17:43:17 +0100 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-12-20 17:58:44 +0100 |
commit | 9d5b20753967c88bd76f55ecbc37e854bd3a63ce (patch) | |
tree | ca18b287c1527d60adaea38d83d4b441cfa6d1fc /go/internal | |
parent | f8d74597781f9ac9bfe2dbe6b1feacb512a52ae8 (diff) | |
download | gitlab-shell-bvl-port-gitlabnet-to-go.tar.gz |
WIP: Parse commands & enable featuresbvl-port-gitlabnet-to-go
Diffstat (limited to 'go/internal')
-rw-r--r-- | go/internal/config/config.go | 4 | ||||
-rw-r--r-- | go/internal/gitlabclient/client.go | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/go/internal/config/config.go b/go/internal/config/config.go index d325fd4..76ba07d 100644 --- a/go/internal/config/config.go +++ b/go/internal/config/config.go @@ -74,7 +74,9 @@ func parseConfig(configBytes []byte, cfg *Config) error { cfg.LogFormat = "text" } - baseUrl, err := url.Parse(cfg.GitlabUrl) + unescapedUrl, err := url.PathUnescape(cfg.GitlabUrl) + + baseUrl, err := url.Parse(unescapedUrl) if err != nil { return err } diff --git a/go/internal/gitlabclient/client.go b/go/internal/gitlabclient/client.go index c186b6c..5a8dd9d 100644 --- a/go/internal/gitlabclient/client.go +++ b/go/internal/gitlabclient/client.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "gitlab.com/gitlab-org/go/internal/config" + "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" ) type Client struct { @@ -21,20 +21,12 @@ func New() (*Client, error) { return nil, err } - tr = &http.Transport{ + tr := &http.Transport{ MaxIdleConns: 10, IdleConnTimeout: 30 * time.Second, DisableCompression: true, } - httpClient = &http.Client{Transport: tr} + httpClient := &http.Client{Transport: tr} return &Client{config: config, httpClient: httpClient}, nil } - -func (c *Client) Discover(gitlabId string) { - -} - -func (c *Client) get(path string) (*Response, error) { - -} |