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

Jump to bottom

fix: use correct Git Server URL and auth details for lighthouse as for scm provider #459

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use correct Git Server URL and auth details for lighthouse as for scm provider #459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 27 additions & 1 deletion pkg/cmd/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package start
import (
"context"
"fmt"
"net/url"
"sort"
"strings"
"time"
Expand Down Expand Up @@ -438,7 +439,32 @@ func (o *Options) createLighthouseJob(jobName string, cfg *config.Config) error
},
}

configureOpts := func(opts *gitv2.ClientFactoryOpts) {}
// use the same git server information for lighthouse as the scmClient uses
var gitServerURLParsed *url.URL
gitServerURLParsed, err = url.Parse(gitServerURL)
if err != nil {
return errors.Wrapf(err, "failed to parse git URL %s", gitServerURLParsed)
}

// o.FindGitToken uses o.GitServerURL so set it
o.GitServerURL = sr.Spec.Provider
o.FindGitToken()

configureOpts := func(opts *gitv2.ClientFactoryOpts) {
opts.Token = func() []byte {
return []byte(o.ResolverOptions.Factory.GitToken)
}
opts.GitUser = func() (name, email string, err error) {
name = o.ResolverOptions.Factory.GitUsername
return
}
opts.Username = func() (login string, err error) {
login = o.ResolverOptions.Factory.GitUsername
return
}
opts.Host = gitServerURLParsed.Host
opts.Scheme = gitServerURLParsed.Scheme
}
gitFactory, err := gitv2.NewClientFactory(configureOpts)
if err != nil {
return errors.Wrapf(err, "failed to create git factory")
Expand Down