b2f506fd50
Introduces a BaseBranch field to CreateOptions and updates the job creation flow to include the base branch in the payload if specified. The CapiClient and related methods are updated to accept and handle the baseBranch parameter, and tests are added to verify correct behavior when a base branch is provided.
67 lines
2 KiB
Go
67 lines
2 KiB
Go
package capi
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
|
|
"github.com/cli/cli/v2/internal/gh"
|
|
)
|
|
|
|
const baseCAPIURL = "https://api.githubcopilot.com"
|
|
const capiHost = "api.githubcopilot.com"
|
|
|
|
// CapiClient defines the methods used by the caller. Implementations
|
|
// may be replaced with test doubles in unit tests.
|
|
type CapiClient interface {
|
|
ListSessionsForViewer(ctx context.Context, limit int) ([]*Session, error)
|
|
ListSessionsForRepo(ctx context.Context, owner string, repo string, limit int) ([]*Session, error)
|
|
CreateJob(ctx context.Context, owner, repo, problemStatement, baseBranch string) (*Job, error)
|
|
GetJob(ctx context.Context, owner, repo, jobID string) (*Job, error)
|
|
}
|
|
|
|
// CAPIClient is a client for interacting with the Copilot API
|
|
type CAPIClient struct {
|
|
httpClient *http.Client
|
|
authCfg gh.AuthConfig
|
|
}
|
|
|
|
// NewCAPIClient creates a new CAPI client. Provide a token and an HTTP client which
|
|
// will be used as the base transport for CAPI requests.
|
|
//
|
|
// The provided HTTP client will be mutated for use with CAPI, so it should not
|
|
// be reused elsewhere.
|
|
func NewCAPIClient(httpClient *http.Client, authCfg gh.AuthConfig) *CAPIClient {
|
|
host, _ := authCfg.DefaultHost()
|
|
token, _ := authCfg.ActiveToken(host)
|
|
|
|
httpClient.Transport = newCAPITransport(token, httpClient.Transport)
|
|
return &CAPIClient{
|
|
httpClient: httpClient,
|
|
authCfg: authCfg,
|
|
}
|
|
}
|
|
|
|
// capiTransport adds the Copilot auth headers
|
|
type capiTransport struct {
|
|
rp http.RoundTripper
|
|
token string
|
|
}
|
|
|
|
func newCAPITransport(token string, rp http.RoundTripper) *capiTransport {
|
|
return &capiTransport{
|
|
rp: rp,
|
|
token: token,
|
|
}
|
|
}
|
|
|
|
func (ct *capiTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
req.Header.Set("Authorization", "Bearer "+ct.token)
|
|
|
|
// Since this RoundTrip is reused for both Copilot API and
|
|
// GitHub API requests, we conditionally add the integration
|
|
// ID only when performing requests to the Copilot API.
|
|
if req.URL.Host == capiHost {
|
|
req.Header.Add("Copilot-Integration-Id", "copilot-4-cli")
|
|
}
|
|
return ct.rp.RoundTrip(req)
|
|
}
|