Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions internal/scalibr/client_factories.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,19 @@ func (c *ClientFactories) GoogleHTTPClient(_ context.Context, _ ...string) (*htt
return nil, errors.New("unimplemented, this should not be used from osv-scanner")
}

const defaultGRPCServiceConfig = `{
"methodConfig": [{
"name": [{}],
"retryPolicy": {
"maxAttempts": 4,
"initialBackoff": "0.1s",
"maxBackoff": "1s",
"backoffMultiplier": 2.0,
"retryableStatusCodes": ["UNAVAILABLE", "RESOURCE_EXHAUSTED"]
}
}]
}`

// GRPCClientConn returns a cached gRPC client connection from a package-level connection cache.
func (c *ClientFactories) GRPCClientConn(url string, dialOpts ...grpc.DialOption) (grpc.ClientConnInterface, error) {
c.mu.Lock()
Expand All @@ -97,6 +110,7 @@ func (c *ClientFactories) GRPCClientConn(url string, dialOpts ...grpc.DialOption

ourDialOpts := []grpc.DialOption{
grpc.WithTransportCredentials(creds),
grpc.WithDefaultServiceConfig(defaultGRPCServiceConfig),
// We might want keep alive params in the future, but it works for now.
// grpc.WithKeepaliveParams(keepalive.ClientParameters{
// Time: 20 * time.Second,
Expand Down
74 changes: 74 additions & 0 deletions internal/scalibr/client_factories_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package scalibr

import (
"context"
"net/http"
"net/http/httptest"
"testing"
)

func TestClientFactories_GRPCClientConn(t *testing.T) {
t.Parallel()

cf := NewClientFactories(nil, "test-agent/1.0")
defer func() {
if err := cf.Close(); err != nil {
t.Errorf("failed to close client factories: %v", err)
}
}()

conn, err := cf.GRPCClientConn("api.deps.dev:443")
if err != nil {
t.Fatalf("GRPCClientConn failed: %v", err)
}
if conn == nil {
t.Fatal("expected non-nil connection")
}

// Calling again should return the cached connection.
conn2, err := cf.GRPCClientConn("api.deps.dev:443")
if err != nil {
t.Fatalf("GRPCClientConn second call failed: %v", err)
}
if conn != conn2 {
t.Errorf("expected cached connection to be returned")
}
}

func TestClientFactories_HTTPClient_UserAgent(t *testing.T) {
t.Parallel()

var receivedUserAgent string
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
receivedUserAgent = r.Header.Get("User-Agent")
w.WriteHeader(http.StatusOK)
}))
defer ts.Close()

cf := NewClientFactories(ts.Client(), "test-agent/1.0")
client := cf.HTTPClient()

req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, ts.URL, nil)
if err != nil {
t.Fatalf("failed to create request: %v", err)
}
resp, err := client.Do(req)
if err != nil {
t.Fatalf("HTTP GET failed: %v", err)
}
defer resp.Body.Close()

if receivedUserAgent != "test-agent/1.0" {
t.Errorf("expected User-Agent %q, got %q", "test-agent/1.0", receivedUserAgent)
}
}

func TestClientFactories_GoogleHTTPClient(t *testing.T) {
t.Parallel()

cf := NewClientFactories(nil, "")
_, err := cf.GoogleHTTPClient(context.Background())
if err == nil {
t.Fatal("expected error from GoogleHTTPClient, got nil")
}
}
Loading