From a512d049c0e10c36ccc85e6278c28b933346e464 Mon Sep 17 00:00:00 2001
From: vjeffrey <vj@mondoo.com>
Date: Sat, 26 Aug 2023 14:46:55 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20log=20gcp=20asset=20discovery=20?=
 =?UTF-8?q?err=20instead=20of=20returning=20(#1585)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes https://github.com/mondoohq/cnquery/issues/1584
---
 motor/discovery/gcp/resolver_org.go     | 33 +++++++++++++------------
 motor/discovery/gcp/resolver_project.go | 16 ++++++------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/motor/discovery/gcp/resolver_org.go b/motor/discovery/gcp/resolver_org.go
index b3866dfe3d..463f8eb6c8 100644
--- a/motor/discovery/gcp/resolver_org.go
+++ b/motor/discovery/gcp/resolver_org.go
@@ -2,9 +2,9 @@ package gcp
 
 import (
 	"context"
-
 	"errors"
 
+	"github.com/rs/zerolog/log"
 	"go.mondoo.com/cnquery/motor/asset"
 	"go.mondoo.com/cnquery/motor/discovery/common"
 	"go.mondoo.com/cnquery/motor/platform/detector"
@@ -99,16 +99,16 @@ func (r *GcpOrgResolver) Resolve(ctx context.Context, tc *providers.Config, cred
 
 			assets, err := (&GcpFolderResolver{}).Resolve(ctx, folderConfig, credsResolver, sfn, userIdDetectors...)
 			if err != nil {
-				return nil, err
-			}
-			for i := range assets {
-				a := assets[i]
-				if rootAsset != nil {
-					a.RelatedAssets = append(a.RelatedAssets, rootAsset)
+				log.Error().Err(err).Msg("unable to resolve assets")
+			} else {
+				for i := range assets {
+					a := assets[i]
+					if rootAsset != nil {
+						a.RelatedAssets = append(a.RelatedAssets, rootAsset)
+					}
+					resolved = append(resolved, a)
 				}
-				resolved = append(resolved, a)
 			}
-			resolved = append(resolved, assets...)
 		}
 	}
 
@@ -135,14 +135,15 @@ func (r *GcpOrgResolver) Resolve(ctx context.Context, tc *providers.Config, cred
 
 			assets, err := (&GcpProjectResolver{}).Resolve(ctx, projectConfig, credsResolver, sfn, userIdDetectors...)
 			if err != nil {
-				return nil, err
-			}
-			for i := range assets {
-				a := assets[i]
-				if rootAsset != nil && a.Platform.Name == "gcp-project" {
-					a.RelatedAssets = append(a.RelatedAssets, rootAsset)
+				log.Error().Err(err).Msg("unable to resolve assets")
+			} else {
+				for i := range assets {
+					a := assets[i]
+					if rootAsset != nil && a.Platform.Name == "gcp-project" {
+						a.RelatedAssets = append(a.RelatedAssets, rootAsset)
+					}
+					resolved = append(resolved, a)
 				}
-				resolved = append(resolved, a)
 			}
 		}
 	}
diff --git a/motor/discovery/gcp/resolver_project.go b/motor/discovery/gcp/resolver_project.go
index 09c4d8c337..faa572ffa7 100644
--- a/motor/discovery/gcp/resolver_project.go
+++ b/motor/discovery/gcp/resolver_project.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/cockroachdb/errors"
+	"github.com/rs/zerolog/log"
 	"go.mondoo.com/cnquery/motor/asset"
 	"go.mondoo.com/cnquery/motor/discovery/common"
 	"go.mondoo.com/cnquery/motor/platform/detector"
@@ -82,14 +83,15 @@ func (r *GcpProjectResolver) Resolve(ctx context.Context, tc *providers.Config,
 	if tc.IncludesOneOfDiscoveryTarget(append(ProjectDiscoveryTargets, common.DiscoveryAuto, common.DiscoveryAll)...) {
 		assetList, err := GatherAssets(ctx, tc, project, credsResolver, sfn)
 		if err != nil {
-			return nil, err
-		}
-		for i := range assetList {
-			a := assetList[i]
-			if resolvedRoot != nil {
-				a.RelatedAssets = append(a.RelatedAssets, resolvedRoot)
+			log.Error().Err(err).Msg("unable to resolve assets")
+		} else {
+			for i := range assetList {
+				a := assetList[i]
+				if resolvedRoot != nil {
+					a.RelatedAssets = append(a.RelatedAssets, resolvedRoot)
+				}
+				resolved = append(resolved, a)
 			}
-			resolved = append(resolved, a)
 		}
 	}
 	return resolved, nil