Skip to content

Fix GitHub client not respecting --scm-base-url #189

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

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Fix GitHub client not respecting --scm-base-url #189

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions analyze/analyze.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (a *Analyzer) AnalyzeOrg(ctx context.Context, org string, numberOfGoroutine
log.Debug().Err(err).Msgf("Failed to get provider version for %s", provider)
}

log.Debug().Msgf("Provider: %s, Version: %s", provider, providerVersion)
log.Debug().Msgf("Provider: %s, Version: %s, BaseURL: %s", provider, providerVersion, a.ScmClient.GetProviderBaseURL())

log.Debug().Msgf("Fetching list of repositories for organization: %s on %s", org, provider)
orgReposBatches := a.ScmClient.GetOrgRepos(ctx, org)
Expand Down Expand Up @@ -177,7 +177,7 @@ func (a *Analyzer) AnalyzeRepo(ctx context.Context, repoString string, ref strin
log.Debug().Err(err).Msgf("Failed to get provider version for %s", provider)
}

log.Debug().Msgf("Provider: %s, Version: %s", provider, providerVersion)
log.Debug().Msgf("Provider: %s, Version: %s, BaseURL: %s", provider, providerVersion, a.ScmClient.GetProviderBaseURL())

pkgsupplyClient := pkgsupply.NewStaticClient()
inventory := scanner.NewInventory(a.Opa, pkgsupplyClient, provider, providerVersion)
Expand Down Expand Up @@ -225,7 +225,7 @@ func (a *Analyzer) AnalyzeLocalRepo(ctx context.Context, repoPath string) error
log.Debug().Err(err).Msgf("Failed to get provider version for %s", provider)
}

log.Debug().Msgf("Provider: %s, Version: %s", provider, providerVersion)
log.Debug().Msgf("Provider: %s, Version: %s, BaseURL: %s", provider, providerVersion, a.ScmClient.GetProviderBaseURL())

pkgsupplyClient := pkgsupply.NewStaticClient()
inventory := scanner.NewInventory(a.Opa, pkgsupplyClient, provider, providerVersion)
Expand Down
40 changes: 29 additions & 11 deletions providers/github/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,19 @@ import (
)

const GitHub string = "github"
const defaultDomain string = "github.com"

func NewGithubSCMClient(ctx context.Context, baseURL string, token string) (*ScmClient, error) {
client, err := NewClient(ctx, token)
domain := defaultDomain
if baseURL != "" {
domain = baseURL
}

client, err := NewClient(ctx, token, domain)
if err != nil {
return nil, err
}

domain := "github.com"
if baseURL != "" {
domain = baseURL
}
return &ScmClient{
client: client,
baseURL: domain,
Expand Down Expand Up @@ -131,19 +133,35 @@ type Client struct {
Token string
}

func NewClient(ctx context.Context, token string) (*Client, error) {
func NewClient(ctx context.Context, token string, domain string) (*Client, error) {
rateLimiter, err := github_ratelimit.NewRateLimitWaiterClient(nil)
if err != nil {
return nil, err
}
restClient := github.NewClient(rateLimiter).WithAuthToken(token)

src := oauth2.StaticTokenSource(
&oauth2.Token{AccessToken: token},
var (
// REST client
restClient = github.NewClient(rateLimiter).WithAuthToken(token)
// GraphQL client
src = oauth2.StaticTokenSource(
&oauth2.Token{AccessToken: token},
)
httpClient = oauth2.NewClient(ctx, src)
graphQLClient *githubv4.Client
)
httpClient := oauth2.NewClient(ctx, src)

graphQLClient := githubv4.NewClient(httpClient)
if domain == defaultDomain {
graphQLClient = githubv4.NewClient(httpClient)
} else {
baseURL := fmt.Sprintf("https://%s/", domain)
restClient, err = restClient.WithEnterpriseURLs(baseURL, baseURL)
if err != nil {
return nil, err
}

graphQLClient = githubv4.NewEnterpriseClient(baseURL+"api/graphql", httpClient)
}

return &Client{
restClient: restClient,
graphQLClient: graphQLClient,
Expand Down