diff --git a/pkg/assembler/clients/helpers/graphql.go b/pkg/assembler/clients/helpers/graphql.go index a2748af2c9..239e519b50 100644 --- a/pkg/assembler/clients/helpers/graphql.go +++ b/pkg/assembler/clients/helpers/graphql.go @@ -11,8 +11,7 @@ import ( "github.com/spf13/viper" ) -func GetGqlClient(graphqlEndpoint string) (graphql.Client, error) { - httpClient := http.Client{} +func GetGqlClient(graphqlEndpoint string, httpClient http.Client) (graphql.Client, error) { certFile := viper.GetString("gql-tls-root-ca") insecure := viper.GetBool("gql-tls-insecure") if certFile != "" { diff --git a/pkg/ingestor/ingestor.go b/pkg/ingestor/ingestor.go index 4c99d7acaf..d286f9e049 100644 --- a/pkg/ingestor/ingestor.go +++ b/pkg/ingestor/ingestor.go @@ -23,7 +23,6 @@ import ( "go.uber.org/zap" - "github.com/Khan/genqlient/graphql" "github.com/guacsec/guac/pkg/assembler" "github.com/guacsec/guac/pkg/assembler/clients/helpers" csub_client "github.com/guacsec/guac/pkg/collectsub/client" @@ -172,8 +171,11 @@ func GetAssembler( transport http.RoundTripper, ) func([]assembler.IngestPredicates) error { httpClient := http.Client{Transport: transport} - gqlclient := graphql.NewClient(graphqlEndpoint, &httpClient) - f := helpers.GetBulkAssembler(ctx, childLogger, gqlclient) + gqlClient, err := helpers.GetGqlClient(graphqlEndpoint, httpClient) + if err != nil { + fmt.Printf("unable to create GraphQL client: %v", err) + } + f := helpers.GetBulkAssembler(ctx, childLogger, gqlClient) return f } diff --git a/pkg/ingestor/parser/csaf/parser_csaf_red_hat.go b/pkg/ingestor/parser/csaf/parser_csaf_red_hat.go index ed36fbeb56..56dab270eb 100644 --- a/pkg/ingestor/parser/csaf/parser_csaf_red_hat.go +++ b/pkg/ingestor/parser/csaf/parser_csaf_red_hat.go @@ -18,6 +18,7 @@ package csaf import ( "context" "fmt" + "net/http" "sort" "strings" @@ -62,7 +63,7 @@ func (c *csafParserRedHat) findPkgSpec(ctx context.Context, product_id string) ( if !ok { return nil, fmt.Errorf("unable to locate product url for reference %s due to missing graphqlEndpoint value", *pref) } - gqlclient, err := assembler_helpers.GetGqlClient(endpoint) + gqlclient, err := assembler_helpers.GetGqlClient(endpoint, http.Client{}) if err != nil { return nil, err }