🧹 log gcp asset discovery err instead of returning (#1585)

fixes #1584
mondoohq · Aug 26, 2023 · a512d04 · a512d04
1 parent 04252f0
commit a512d04
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git 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
@@ -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