artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 15:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

gqltest: allow writing of request and response bodies to a sink (#38841)

Browse Source
This commit is contained in:
Noah S-C 2022-07-14 14:33:04 -07:00 committed by GitHub
parent 79d0c6359c
commit 424ef05b1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev/codeintel-qa/internal/graphql.go
View File

@ -1,11 +1,15 @@
package internal
import "github.com/sourcegraph/sourcegraph/internal/gqltestutil"
import (
"os"
"github.com/sourcegraph/sourcegraph/internal/gqltestutil"
)
var client *gqltestutil.Client
func InitializeGraphQLClient() (err error) {
client, err = gqltestutil.NewClient(SourcegraphEndpoint)
client, err = gqltestutil.NewClient(SourcegraphEndpoint, os.Stderr, os.Stderr)
return err
}

35
internal/gqltestutil/client.go
View File

@ -59,7 +59,7 @@ func SignIn(baseURL, email, password string) (*Client, error) {
// authenticate initializes an authenticated client with given request body.
func authenticate(baseURL, path string, body any) (*Client, error) {
client, err := NewClient(baseURL)
client, err := NewClient(baseURL, nil, nil)
if err != nil {
return nil, errors.Wrap(err, "new client")
}
@ -97,12 +97,23 @@ type Client struct {
csrfCookie *http.Cookie
sessionCookie *http.Cookie
userID string
userID string
requestLogger io.StringWriter
responseLogger io.StringWriter
}
// NewClient instantiates a new client by performing a GET request then obtains the
// CSRF token and cookie from its response, if there is one (old versions of Sourcegraph only.)
func NewClient(baseURL string) (*Client, error) {
// CSRF token and cookie from its response, if there is one (old versions of Sourcegraph only).
// If request- or responseLogger are provided, the request and response bodies, respectively,
// will be written to them for any GraphQL requests only.
func NewClient(baseURL string, requestLogger, responseLogger io.StringWriter) (*Client, error) {
if requestLogger == nil {
requestLogger = io.Discard.(io.StringWriter)
}
if responseLogger == nil {
responseLogger = io.Discard.(io.StringWriter)
}
resp, err := http.Get(baseURL)
if err != nil {
return nil, errors.Wrap(err, "get URL")
@ -114,6 +125,8 @@ func NewClient(baseURL string) (*Client, error) {
return nil, errors.Wrap(err, "read GET body")
}
responseLogger.WriteString(string(p))
csrfToken := extractCSRFToken(string(p))
var csrfCookie *http.Cookie
for _, cookie := range resp.Cookies() {
@ -124,9 +137,11 @@ func NewClient(baseURL string) (*Client, error) {
}
return &Client{
baseURL: baseURL,
csrfToken: csrfToken,
csrfCookie: csrfCookie,
baseURL: baseURL,
csrfToken: csrfToken,
csrfCookie: csrfCookie,
requestLogger: requestLogger,
responseLogger: responseLogger,
}, nil
}
@ -139,6 +154,8 @@ func (c *Client) authenticate(path string, body any) error {
return errors.Wrap(err, "marshal body")
}
c.requestLogger.WriteString(string(p))
req, err := http.NewRequest("POST", c.baseURL+path, bytes.NewReader(p))
if err != nil {
return errors.Wrap(err, "new request")
@ -257,6 +274,8 @@ func (c *Client) GraphQL(token, query string, variables map[string]any, target a
name = matches[2]
}
c.requestLogger.WriteString(string(body))
req, err := http.NewRequest("POST", fmt.Sprintf("%s/.api/graphql?%s", c.baseURL, name), bytes.NewReader(body))
if err != nil {
return err
@ -286,6 +305,8 @@ func (c *Client) GraphQL(token, query string, variables map[string]any, target a
return errors.Wrap(err, "read response body")
}
c.responseLogger.WriteString(string(body))
// Check if the response format should be JSON
if strings.Contains(resp.Header.Get("Content-Type"), "application/json") {
// Try and see unmarshalling to errors