Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use custom transport for gitlab communication #11693

Merged
merged 1 commit into from
Nov 2, 2016
Merged

Use custom transport for gitlab communication #11693

merged 1 commit into from
Nov 2, 2016

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Nov 1, 2016

Fixes #11689

@liggitt
Copy link
Contributor Author

liggitt commented Nov 1, 2016

@enj PTAL

@@ -94,7 +94,11 @@ func (p *provider) GetUserIdentity(data *osincli.AccessData) (authapi.UserIdenti
req, _ := http.NewRequest("GET", p.userAPIURL, nil)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it safe to ignore this err?

Changes to client / transport LGTM.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, userAPIURL is formed in NewProvider from a known good url and path

@liggitt
Copy link
Contributor Author

liggitt commented Nov 1, 2016

[merge]

res, err := http.DefaultClient.Do(req)
client := http.DefaultClient
if p.transport != nil {
client := &http.Client{Transport: p.transport}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

d'oh missed it - should be = not :=

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 92eed7a

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10922/) (Base Commit: 751085f)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 92eed7a

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 2, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10978/) (Base Commit: 537c0a5) (Image: devenv-rhel7_5299)

@openshift-bot openshift-bot merged commit 21040e2 into openshift:master Nov 2, 2016
@liggitt liggitt deleted the gitlab branch November 4, 2016 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants