From 76f9793c9babdc873256d7d44f4173d098f7a65c Mon Sep 17 00:00:00 2001 From: Matthias Bertschy Date: Thu, 21 Sep 2023 07:37:39 +0200 Subject: [PATCH] add debug print of full HttpPost Signed-off-by: Matthias Bertschy --- adapters/mockcve.go | 11 ++++++++++- adapters/v1/backend.go | 8 ++++++++ adapters/v1/grype.go | 3 ++- adapters/v1/syft.go | 3 ++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/adapters/mockcve.go b/adapters/mockcve.go index 232d9e9..f549dbf 100644 --- a/adapters/mockcve.go +++ b/adapters/mockcve.go @@ -43,7 +43,16 @@ func (m MockCVEAdapter) ScanSBOM(ctx context.Context, sbom domain.SBOM) (domain. CVEDBVersion: m.DBVersion(ctx), Annotations: sbom.Annotations, Labels: sbom.Labels, - Content: &v1beta1.GrypeDocument{}, + Content: &v1beta1.GrypeDocument{ + Matches: []v1beta1.Match{ + { + Vulnerability: v1beta1.Vulnerability{}, + RelatedVulnerabilities: nil, + MatchDetails: nil, + Artifact: v1beta1.GrypePackage{}, + }, + }, + }, }, nil } diff --git a/adapters/v1/backend.go b/adapters/v1/backend.go index acb4601..fafc794 100644 --- a/adapters/v1/backend.go +++ b/adapters/v1/backend.go @@ -18,6 +18,8 @@ import ( "github.com/hashicorp/go-multierror" backendClientV1 "github.com/kubescape/backend/pkg/client/v1" sysreport "github.com/kubescape/backend/pkg/server/v1/systemreports" + "github.com/kubescape/go-logger" + "github.com/kubescape/go-logger/helpers" "github.com/kubescape/kubevuln/core/domain" "github.com/kubescape/kubevuln/core/ports" "go.opentelemetry.io/otel" @@ -249,3 +251,9 @@ func (a *BackendAdapter) SubmitCVE(ctx context.Context, cve domain.CVEManifest, } return err } + +//lint:ignore U1000 Ignore unused function temporarily for debugging +func httpPostDebug(httpClient httputils.IHttpClient, fullURL string, headers map[string]string, body []byte) (*http.Response, error) { + logger.L().Debug("httpPostDebug", helpers.String("fullURL", fullURL), helpers.Interface("headers", headers), helpers.String("body", string(body))) + return httputils.HttpPostWithContext(context.Background(), httpClient, fullURL, headers, body) +} diff --git a/adapters/v1/grype.go b/adapters/v1/grype.go index 0653182..a0c047b 100644 --- a/adapters/v1/grype.go +++ b/adapters/v1/grype.go @@ -163,7 +163,8 @@ func (g *GrypeAdapter) ScanSBOM(ctx context.Context, sbom domain.SBOM) (domain.C } logger.L().Debug("returning CVE manifest", - helpers.String("name", sbom.Name)) + helpers.String("name", sbom.Name), + helpers.Int("vulnerabilities", len(vulnerabilityResults.Matches))) return domain.CVEManifest{ Name: sbom.Name, SBOMCreatorVersion: sbom.SBOMCreatorVersion, diff --git a/adapters/v1/syft.go b/adapters/v1/syft.go index ae1c28a..638fbfa 100644 --- a/adapters/v1/syft.go +++ b/adapters/v1/syft.go @@ -167,7 +167,8 @@ func (s *SyftAdapter) CreateSBOM(ctx context.Context, name, imageID string, opti domainSBOM.Content, err = s.syftToDomain(syftSBOM) // return SBOM logger.L().Debug("returning SBOM", - helpers.String("imageID", imageID)) + helpers.String("imageID", imageID), + helpers.Int("packages", len(domainSBOM.Content.Packages))) return domainSBOM, err }