🐛 Fix IDs for vulnmgmt rsources (#2875)

Signed-off-by: Christian Zunker <[email protected]>
mondoohq · Dec 19, 2023 · d7d6d10 · d7d6d10
1 parent 7ef64ff
commit d7d6d10
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -74,7 +74,7 @@ prep/tools: prep/tools/protolint
 
 cnquery/generate: clean/proto llx/generate shared/generate providers explorer/generate sbom/generate
 
-cnquery/generate/core: clean/proto llx/generate shared/generate providers/proto providers/build/mock providers/build/core explorer/generate
+cnquery/generate/core: clean/proto llx/generate shared/generate providers/proto providers/build/mock providers/build/core explorer/generate sbom/generate
 
 define buildProvider
 	$(eval $@_HOME = $(1))

diff --git a/providers-sdk/v1/upstream/mvd/mvd.pb.go b/providers-sdk/v1/upstream/mvd/mvd.pb.go
diff --git a/providers/os/resources/os.lr.go b/providers/os/resources/os.lr.go
diff --git a/providers/os/resources/vulnmgmt.go b/providers/os/resources/vulnmgmt.go
@@ -27,11 +27,12 @@ func (v *mqlVulnmgmt) lastAssessment() (*time.Time, error) {
 	}
 
 	var mondooClient *gql.MondooClient
+	var err error
 	if v.gqlClient != nil {
 		mondooClient = v.gqlClient
 	} else {
 		// get new gql client
-		mondooClient, err := gql.NewClient(mcc.UpstreamConfig, mcc.HttpClient)
+		mondooClient, err = gql.NewClient(mcc.UpstreamConfig, mcc.HttpClient)
 		if err != nil {
 			return nil, err
 		}
@@ -197,11 +198,12 @@ func (v *mqlVulnmgmt) getReport() (*gql.VulnReport, error) {
 	}
 
 	var mondooClient *gql.MondooClient
+	var err error
 	if v.gqlClient != nil {
 		mondooClient = v.gqlClient
 	} else {
 		// get new gql client
-		mondooClient, err := gql.NewClient(mcc.UpstreamConfig, mcc.HttpClient)
+		mondooClient, err = gql.NewClient(mcc.UpstreamConfig, mcc.HttpClient)
 		if err != nil {
 			return nil, err
 		}
@@ -261,3 +263,16 @@ func (v *mqlVulnmgmt) getIncognitoReport(mondooClient *gql.MondooClient) (*gql.V
 
 	return gqlVulnReport, nil
 }
+
+func (a *mqlVulnAdvisory) id() (string, error) {
+	return a.Id.Data, a.Id.Error
+}
+
+func (c *mqlVulnCve) id() (string, error) {
+	return c.Id.Data, c.Id.Error
+}
+
+func (p *mqlVulnPackage) id() (string, error) {
+	id := p.Name.Data + "-" + p.Version.Data
+	return id, p.Name.Error
+}
diff --git a/providers/vsphere/resources/vsphere.lr.go b/providers/vsphere/resources/vsphere.lr.go
diff --git a/providers/vsphere/resources/vulnmgmt.go b/providers/vsphere/resources/vulnmgmt.go
@@ -27,11 +27,12 @@ func (v *mqlVulnmgmt) lastAssessment() (*time.Time, error) {
 	}
 
 	var mondooClient *gql.MondooClient
+	var err error
 	if v.gqlClient != nil {
 		mondooClient = v.gqlClient
 	} else {
 		// get new gql client
-		mondooClient, err := gql.NewClient(mcc.UpstreamConfig, mcc.HttpClient)
+		mondooClient, err = gql.NewClient(mcc.UpstreamConfig, mcc.HttpClient)
 		if err != nil {
 			return nil, err
 		}
@@ -170,11 +171,12 @@ func (v *mqlVulnmgmt) getReport() (*gql.VulnReport, error) {
 	}
 
 	var mondooClient *gql.MondooClient
+	var err error
 	if v.gqlClient != nil {
 		mondooClient = v.gqlClient
 	} else {
 		// get new gql client
-		mondooClient, err := gql.NewClient(mcc.UpstreamConfig, mcc.HttpClient)
+		mondooClient, err = gql.NewClient(mcc.UpstreamConfig, mcc.HttpClient)
 		if err != nil {
 			return nil, err
 		}
@@ -217,3 +219,11 @@ func (v *mqlVulnmgmt) getIncognitoReport(mondooClient *gql.MondooClient) (*gql.V
 
 	return gqlVulnReport, nil
 }
+
+func (a *mqlVulnAdvisory) id() (string, error) {
+	return a.Id.Data, a.Id.Error
+}
+
+func (c *mqlVulnCve) id() (string, error) {
+	return c.Id.Data, c.Id.Error
+}