natto1784/gitea-release-resource
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Revert "use proxy from environment"

Browse Source 
This reverts commit 64e36f5d40.

Signed-off-by: Evan Short <eshort@pivotal.io>
This commit is contained in:
Jacob Frank
2016-04-12 17:09:49 -07:00
committed by Evan Short
parent ce29819744
commit 0bdde35c32
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
github.go
View File

@@ -42,9 +42,7 @@ func NewGitHubClient(source Source) (*GitHubClient, error) {
var client *github.Client var client *github.Client
if source.AccessToken == "" { if source.AccessToken == "" {
proxyTransport := &http.Transport{Proxy: http.ProxyFromEnvironment} client = github.NewClient(nil)
httpClient := &http.Client{Transport: proxyTransport}
client = github.NewClient(httpClient)
} else { } else {
var err error var err error
client, err = oauthClient(source) client, err = oauthClient(source)
@@ -196,12 +194,12 @@ func (g *GitHubClient) DeleteReleaseAsset(asset github.ReleaseAsset) error {
} }
func (g *GitHubClient) DownloadReleaseAsset(asset github.ReleaseAsset) (io.ReadCloser, error) { func (g *GitHubClient) DownloadReleaseAsset(asset github.ReleaseAsset) (io.ReadCloser, error) {
reader, _, err := g.client.Repositories.DownloadReleaseAsset(g.user, g.repository, *asset.ID) res, err := g.client.Repositories.DownloadReleaseAsset(g.user, g.repository, *asset.ID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return reader, err return res, err
} }
func (g *GitHubClient) GetTarballLink(tag string) (*url.URL, error) { func (g *GitHubClient) GetTarballLink(tag string) (*url.URL, error) {
@@ -254,7 +252,7 @@ func oauthClient(source Source) (*github.Client, error) {
// requests to both github.com and the S3 download API (for downloading // requests to both github.com and the S3 download API (for downloading
// release assets). We don't want it to user the same OAuth transport for // release assets). We don't want it to user the same OAuth transport for
// both. // both.
transport := statham.NewTransport(&http.Transport{Proxy: http.ProxyFromEnvironment}, statham.Mapping{ transport := statham.NewTransport(http.DefaultTransport, statham.Mapping{
apiHost: oauthClient.Transport, apiHost: oauthClient.Transport,
uploadHost: oauthClient.Transport, uploadHost: oauthClient.Transport,
}) })