rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deduplicate connector driver request helpers

Browse Source 
The Crisp and Railway connectors each repeated their HTTP plumbing
across the driver, the name resolver, and (for Crisp) the subscription
settings fetcher: the same JoinPath/headers/Do for Crisp GETs and the
same marshal/POST/headers for Railway GraphQL. The Crisp and Scaleway
drivers also carried byte-identical owner/member role mapping and admin
checks.

Extract crispGet and railwayPost as package-private request helpers so
each call site owns only status handling, and lift the owner/member role
mapping into shared ownerMemberRoles/isOwnerRole helpers beside
activeFromStatus in driver.go. Name the Crisp base URL and tier header
as consts in probe.go's const block rather than inlining the literals,
matching the file's existing convention. Behavior is unchanged.

Signed-off-by: Aurélien Sibiril <81782+aureliensibiril@users.noreply.github.com>
This commit is contained in:
Aurélien Sibiril
2026-07-11 18:41:20 +02:00
parent 53eb5de7be
commit 59e2d9a5df
6 changed files with 106 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/accessreview/drivers/railway.go
View File

@@ -189,28 +189,9 @@ func railwayRecords(me *railwayMe) []AccountRecord {
}
func (d *RailwayDriver) queryMe(ctx context.Context) (*railwayMe, error) {
body := struct {
Query string `json:"query"`
}{
Query: railwayMembersQuery,
}
payload, err := json.Marshal(body)
httpResp, err := railwayPost(ctx, d.httpClient, "members", railwayMembersQuery)
if err != nil {
return nil, fmt.Errorf("cannot marshal railway members query: %w", err)
}
req, err := http.NewRequestWithContext(ctx, http.MethodPost, railwayGraphQLEndpoint, bytes.NewReader(payload))
if err != nil {
return nil, fmt.Errorf("cannot create railway members request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/json")
httpResp, err := d.httpClient.Do(req)
if err != nil {
return nil, fmt.Errorf("cannot execute railway members request: %w", err)
return nil, err
}
defer func() { _ = httpResp.Body.Close() }()
@@ -238,6 +219,38 @@ func (d *RailwayDriver) queryMe(ctx context.Context) (*railwayMe, error) {
return resp.Data.Me, nil
}
// railwayPost issues a GraphQL POST carrying query to Railway's endpoint,
// setting the Content-Type and Accept headers; the Bearer credential is attached
// by the connection transport. The caller owns status handling and must close
// the returned response body. label names the request in wrapped errors.
func railwayPost(ctx context.Context, httpClient *http.Client, label, query string) (*http.Response, error) {
body := struct {
Query string `json:"query"`
}{
Query: query,
}
payload, err := json.Marshal(body)
if err != nil {
return nil, fmt.Errorf("cannot marshal railway %s query: %w", label, err)
}
req, err := http.NewRequestWithContext(ctx, http.MethodPost, railwayGraphQLEndpoint, bytes.NewReader(payload))
if err != nil {
return nil, fmt.Errorf("cannot create railway %s request: %w", label, err)
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/json")
httpResp, err := httpClient.Do(req)
if err != nil {
return nil, fmt.Errorf("cannot execute railway %s request: %w", label, err)
}
return httpResp, nil
}
func railwayFullName(m railwayMember, fallback string) string {
if name := strings.TrimSpace(m.Name); name != "" {
return name