Skip to content

Commit 4e49845

Browse files
committed
fix(github-graphql): reuse http.Client proxy, auth configurations
Reused `http.Client` inside the apiClient returned by `CreateApiClient` method, so keeping the proxy and auth configurations the same.That also keep the centralized management of logic.
1 parent 6b1268d commit 4e49845

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

backend/plugins/github_graphql/impl/impl.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ func (p GithubGraphql) PrepareTaskData(taskCtx plugin.TaskContext, options map[s
179179
graphqlClient, err := tasks.CreateGraphqlClient(
180180
taskCtx,
181181
connection,
182+
apiClient.ApiClient.GetClient(),
182183
func(ctx context.Context, client *graphql.Client, logger log.Logger) (rateRemaining int, resetAt *time.Time, err errors.Error) {
183184
var query GraphQueryRateLimit
184185
dataErrors, err := errors.Convert01(client.Query(taskCtx.GetContext(), &query, nil))

backend/plugins/github_graphql/tasks/graphql_client.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,22 @@ import (
2222
"fmt"
2323
"github.com/apache/incubator-devlake/core/log"
2424
"net/url"
25+
"net/http"
2526
"time"
2627

2728
"github.com/apache/incubator-devlake/core/errors"
2829
"github.com/apache/incubator-devlake/core/plugin"
2930
helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
3031
"github.com/apache/incubator-devlake/plugins/github/models"
31-
githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"
3232
"github.com/merico-ai/graphql"
3333
)
3434

3535
func CreateGraphqlClient(
3636
taskCtx plugin.TaskContext,
3737
connection *models.GithubConnection,
38+
httpClient *http.Client,
3839
getRateRemaining func(context.Context, *graphql.Client, log.Logger) (rateRemaining int, resetAt *time.Time, err errors.Error),
3940
) (*helper.GraphqlAsyncClient, errors.Error) {
40-
41-
// inject the shared auth layer
42-
httpClient, err := githubTasks.CreateAuthenticatedHttpClient(taskCtx, connection, nil)
43-
if err != nil {
44-
return nil, err
45-
}
46-
4741
// Build endpoint
4842
endpoint, err := errors.Convert01(url.Parse(connection.Endpoint))
4943
if err != nil {

0 commit comments

Comments
 (0)