Update factory to use new functional constructor for buildkite client

cmd/bk/main.go

@@ -17,7 +17,11 @@ func main() {
 
 func mainRun() int {
 	ctx := context.Background()
-	f := factory.New(version.Version)
+	f, err := factory.New(version.Version)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to create factory: %s\n", err)
+		return 1
+	}
 
 	rootCmd, err := root.NewCmdRoot(f)
 	if err != nil {

pkg/cmd/factory/factory.go

@@ -1,6 +1,7 @@
 package factory
 
 import (
+	"fmt"
 	"net/http"
 
 	"github.com/Khan/genqlient/graphql"
@@ -20,26 +21,33 @@ type Factory struct {
 	Version       string
 }
 
-func New(version string) *Factory {
+type gqlHTTPClient struct {
+	client *http.Client
+	token  string
+}
+
+func (a *gqlHTTPClient) Do(req *http.Request) (*http.Response, error) {
+	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", a.token))
+	return a.client.Do(req)
+}
+
+func New(version string) (*Factory, error) {
 	repo, _ := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true, EnableDotGitCommonDir: true})
 	conf := config.New(nil, repo)
-	// we use separate clients for now until we upgrade the go-buildkite package to the 3.11+
-	tk, err := buildkite.NewTokenConfig(conf.APIToken(), false)
-	gtk, _ := buildkite.NewTokenConfig(conf.APIToken(), false)
-	var httpClient, graphqlClient *http.Client
-	if err == nil {
-		// separate clients until we upgrade go-buildkite library
-		httpClient = tk.Client()
+	buildkiteClient, err := buildkite.NewOpts(buildkite.WithTokenAuth(conf.APIToken()))
+	if err != nil {
+		return nil, fmt.Errorf("creating buildkite client: %w", err)
 	}
-	graphqlClient = &http.Client{Transport: gtk}
+
+	graphqlHTTPClient := &gqlHTTPClient{client: http.DefaultClient, token: conf.APIToken()}
 
 	return &Factory{
 		Config:        conf,
 		GitRepository: repo,
-		GraphQLClient: graphql.NewClient(config.DefaultGraphQLEndpoint, graphqlClient),
 		HttpClient:    httpClient,
+		GraphQLClient: graphql.NewClient(config.DefaultGraphQLEndpoint, graphqlHTTPClient),
 		OpenAIClient:  openai.NewClient(conf.GetOpenAIToken()),
-		RestAPIClient: buildkite.NewClient(httpClient),
+		RestAPIClient: buildkiteClient,
 		Version:       version,
-	}
+	}, nil
 }