From f7cf477dc8902977e4c7872f1f6c8693e9778c8a Mon Sep 17 00:00:00 2001 From: pxp928 Date: Sun, 4 Aug 2024 15:03:01 -0400 Subject: [PATCH] update to return ingested IDs but not needed for ingestion cmd Signed-off-by: pxp928 --- cmd/guacingest/cmd/ingest.go | 2 +- cmd/guacone/cmd/annotate_metadata.go | 2 +- cmd/guacone/cmd/certify.go | 2 +- cmd/guacone/cmd/deps_dev.go | 2 +- cmd/guacone/cmd/files.go | 2 +- cmd/guacone/cmd/gcs.go | 2 +- cmd/guacone/cmd/github.go | 2 +- cmd/guacone/cmd/oci.go | 2 +- cmd/guacone/cmd/s3.go | 2 +- cmd/guacone/cmd/scorecard.go | 2 +- pkg/ingestor/ingestor.go | 7 ++++--- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cmd/guacingest/cmd/ingest.go b/cmd/guacingest/cmd/ingest.go index d918030932..c095214b1a 100644 --- a/cmd/guacingest/cmd/ingest.go +++ b/cmd/guacingest/cmd/ingest.go @@ -99,7 +99,7 @@ func ingest(cmd *cobra.Command, args []string) { defer csubClient.Close() emit := func(d *processor.Document) error { - if err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion); err != nil { + if _, err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion); err != nil { var urlErr *url.Error if errors.As(err, &urlErr) { return fmt.Errorf("unable to ingest document due to connection error with graphQL %q : %w", d.SourceInformation.Source, urlErr) diff --git a/cmd/guacone/cmd/annotate_metadata.go b/cmd/guacone/cmd/annotate_metadata.go index edf68aac55..b685790d39 100644 --- a/cmd/guacone/cmd/annotate_metadata.go +++ b/cmd/guacone/cmd/annotate_metadata.go @@ -125,7 +125,7 @@ var annotateMetadata = &cobra.Command{ preds.HasMetadata = append(preds.HasMetadata, metadata) assemblerInputs := []assembler.IngestPredicates{*preds} - err = assemblerFunc(assemblerInputs) + _, err = assemblerFunc(assemblerInputs) if err != nil { logger.Fatalf("unable to assemble graphs: %v", err) } diff --git a/cmd/guacone/cmd/certify.go b/cmd/guacone/cmd/certify.go index 6be2073280..f061811db8 100644 --- a/cmd/guacone/cmd/certify.go +++ b/cmd/guacone/cmd/certify.go @@ -152,7 +152,7 @@ var certifyCmd = &cobra.Command{ assemblerInputs := []assembler.IngestPredicates{*preds} - err = assemblerFunc(assemblerInputs) + _, err = assemblerFunc(assemblerInputs) if err != nil { logger.Fatalf("unable to assemble graphs: %v", err) } diff --git a/cmd/guacone/cmd/deps_dev.go b/cmd/guacone/cmd/deps_dev.go index 3ea83d51a7..1d6bed4986 100644 --- a/cmd/guacone/cmd/deps_dev.go +++ b/cmd/guacone/cmd/deps_dev.go @@ -87,7 +87,7 @@ var depsDevCmd = &cobra.Command{ emit := func(d *processor.Document) error { totalNum += 1 - if err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csc, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion); err != nil { + if _, err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csc, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion); err != nil { gotErr = true return fmt.Errorf("unable to ingest document: %w", err) } diff --git a/cmd/guacone/cmd/files.go b/cmd/guacone/cmd/files.go index 9902366ada..caecfb1cf0 100644 --- a/cmd/guacone/cmd/files.go +++ b/cmd/guacone/cmd/files.go @@ -129,7 +129,7 @@ var filesCmd = &cobra.Command{ emit := func(d *processor.Document) error { totalNum += 1 - if err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion); err != nil { + if _, err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion); err != nil { gotErr = true filesWithErrors = append(filesWithErrors, d.SourceInformation.Source) return fmt.Errorf("unable to ingest document: %w", err) diff --git a/cmd/guacone/cmd/gcs.go b/cmd/guacone/cmd/gcs.go index 187c56f0ce..96f35a6891 100644 --- a/cmd/guacone/cmd/gcs.go +++ b/cmd/guacone/cmd/gcs.go @@ -112,7 +112,7 @@ var gcsCmd = &cobra.Command{ emit := func(d *processor.Document) error { totalNum += 1 - err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion) + _, err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion) if err != nil { gotErr = true diff --git a/cmd/guacone/cmd/github.go b/cmd/guacone/cmd/github.go index 6bbe9640ad..6f78bdeb37 100644 --- a/cmd/guacone/cmd/github.go +++ b/cmd/guacone/cmd/github.go @@ -155,7 +155,7 @@ var githubCmd = &cobra.Command{ var errFound bool emit := func(d *processor.Document) error { - err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion) + _, err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion) if err != nil { errFound = true diff --git a/cmd/guacone/cmd/oci.go b/cmd/guacone/cmd/oci.go index dbef8f6ea0..0da2276d27 100644 --- a/cmd/guacone/cmd/oci.go +++ b/cmd/guacone/cmd/oci.go @@ -90,7 +90,7 @@ var ociCmd = &cobra.Command{ // Set emit function to go through the entire pipeline emit := func(d *processor.Document) error { totalNum += 1 - err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion) + _, err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion) if err != nil { gotErr = true diff --git a/cmd/guacone/cmd/s3.go b/cmd/guacone/cmd/s3.go index 2e7d509727..e992deb7d8 100644 --- a/cmd/guacone/cmd/s3.go +++ b/cmd/guacone/cmd/s3.go @@ -137,7 +137,7 @@ $ guacone collect s3 --s3-url http://localhost:9000 --s3-bucket guac-test --poll errFound := false emit := func(d *processor.Document) error { - err := ingestor.Ingest(ctx, d, s3Opts.graphqlEndpoint, transport, csubClient, s3Opts.queryVulnOnIngestion, s3Opts.queryLicenseOnIngestion) + _, err := ingestor.Ingest(ctx, d, s3Opts.graphqlEndpoint, transport, csubClient, s3Opts.queryVulnOnIngestion, s3Opts.queryLicenseOnIngestion) if err != nil { errFound = true diff --git a/cmd/guacone/cmd/scorecard.go b/cmd/guacone/cmd/scorecard.go index 4c27c12a73..5ccdd9ff5a 100644 --- a/cmd/guacone/cmd/scorecard.go +++ b/cmd/guacone/cmd/scorecard.go @@ -133,7 +133,7 @@ var scorecardCmd = &cobra.Command{ // Set emit function to go through the entire pipeline emit := func(d *processor.Document) error { totalNum += 1 - err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion) + _, err := ingestor.Ingest(ctx, d, opts.graphqlEndpoint, transport, csubClient, opts.queryVulnOnIngestion, opts.queryLicenseOnIngestion) if err != nil { return fmt.Errorf("unable to ingest document: %v", err) diff --git a/pkg/ingestor/ingestor.go b/pkg/ingestor/ingestor.go index 1f4ce8a13f..a678049f10 100644 --- a/pkg/ingestor/ingestor.go +++ b/pkg/ingestor/ingestor.go @@ -68,7 +68,8 @@ func Ingest( logger.Infof("unable to create entries in collectsub server, but continuing: %v", err) } - if ingestedIDs, err := assemblerFunc(predicates); err != nil { + ingestedIDs, err := assemblerFunc(predicates) + if err != nil { return nil, fmt.Errorf("error assembling graphs for %q : %w", d.SourceInformation.Source, err) } @@ -130,7 +131,7 @@ func MergedIngest( totalPredicates += 1 // enough predicates have been collected, worth sending them to GraphQL server if totalPredicates == 5000 { - err = assemblerFunc(predicates) + _, err = assemblerFunc(predicates) if err != nil { return fmt.Errorf("unable to assemble graphs: %v", err) } @@ -147,7 +148,7 @@ func MergedIngest( logger.Infof("unable to create entries in collectsub server, but continuing: %v", err) } - err = assemblerFunc(predicates) + _, err = assemblerFunc(predicates) if err != nil { return fmt.Errorf("unable to assemble graphs: %v", err) }