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.

Sign up for GitHub

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 'SetBaseURL' to correctly set GitLab URL #231

Merged
merged 4 commits into from
Jan 16, 2018
Merged

Use 'SetBaseURL' to correctly set GitLab URL #231

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8d59ed
Use 'SetBaseURL' to correctly set GitLab URL based on user params.
jrasell Jan 12, 2018
ec00033
Update GitLab SetBaseURL to evaluate response.
jrasell Jan 12, 2018
f6a97c3
Feedback based updates to ensure the correct parsing of GitLab URL
jrasell Jan 15, 2018
6d67178
Set GitLab url for on-prem installations
lkysow Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,21 @@ func NewServer(config Config) (*Server, error) {
gitlabClient = &vcs.GitlabClient{
Client: gitlab.NewClient(nil, config.GitlabToken),
}
// If not using gitlab.com we need to set the URL to the API.
if config.GitlabHostname != "gitlab.com" {
// Check if they've also provided a scheme so we don't prepend it
// again.
scheme := "https"
schemeSplit := strings.Split(config.GitlabHostname, "://")
if len(schemeSplit) > 1 {
scheme = schemeSplit[0]
config.GitlabHostname = schemeSplit[1]
}
apiURL := fmt.Sprintf("%s://%s/api/v4/", scheme, config.GitlabHostname)
if err := gitlabClient.Client.SetBaseURL(apiURL); err != nil {
return nil, errors.Wrapf(err, "setting GitLab API URL: %s", apiURL)
}
}
}
var webhooksConfig []webhooks.Config
for _, c := range config.Webhooks {
Expand Down