Merge pull request #1478 from Azanul/develop

Alter log level for disabled services
tailwarden · Aug 1, 2024 · 5655ca0 · 5655ca0
2 parents 7df17b6 + 24b39da
commit 5655ca0
Show file tree

Hide file tree

Showing 22 changed files with 170 additions and 48 deletions.
diff --git a/providers/gcp/alloydb/clusters.go b/providers/gcp/alloydb/clusters.go
@@ -3,6 +3,7 @@ package alloydb
 import (
 	"context"
 	"errors"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -29,8 +30,13 @@ func Clusters(ctx context.Context, client providers.ProviderClient) ([]models.Re
 			break
 		}
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to get clusters")
-			return resources, err
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to get clusters")
+				return resources, err
+			}
 		}
 		resources = append(resources, models.Resource{
 			Provider:   "GCP",

diff --git a/providers/gcp/alloydb/instances.go b/providers/gcp/alloydb/instances.go
@@ -3,6 +3,7 @@ package alloydb
 import (
 	"context"
 	"errors"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -29,8 +30,13 @@ func Instances(ctx context.Context, client providers.ProviderClient) ([]models.R
 			break
 		}
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to get instances")
-			return resources, err
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to get instances")
+				return resources, err
+			}
 		}
 		resources = append(resources, models.Resource{
 			Provider:   "GCP",

diff --git a/providers/gcp/appengine/service.go b/providers/gcp/appengine/service.go
@@ -3,6 +3,7 @@ package appengine
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -29,8 +30,13 @@ func Services(ctx context.Context, client providers.ProviderClient) ([]models.Re
 	for {
 		svc, err := svcs.Next()
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to get app engine")
-			break
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to get app engine")
+				break
+			}
 		}
 		if svc == nil {
 			break

diff --git a/providers/gcp/artifactregistry/docker_images.go b/providers/gcp/artifactregistry/docker_images.go
@@ -3,6 +3,7 @@ package artifactregistry
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -29,8 +30,13 @@ func ArtifactregistryDockerImages(ctx context.Context, client providers.Provider
 	for {
 		image, err := imageItr.Next()
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to get nex image")
-			break
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to get nex image")
+				break
+			}
 		}
 		if image == nil {
 			break

diff --git a/providers/gcp/artifactregistry/packages.go b/providers/gcp/artifactregistry/packages.go
@@ -3,6 +3,7 @@ package artifactregistry
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -29,8 +30,13 @@ func ArtifactregistryPackages(ctx context.Context, client providers.ProviderClie
 	for {
 		pkg, err := pkgItr.Next()
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to get next package")
-			break
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to get next package")
+				break
+			}
 		}
 		if pkg == nil {
 			break

diff --git a/providers/gcp/artifactregistry/repositories.go b/providers/gcp/artifactregistry/repositories.go
@@ -3,6 +3,7 @@ package artifactregistry
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -29,8 +30,13 @@ func ArtifactregistryRepositories(ctx context.Context, client providers.Provider
 	for {
 		repo, err := repoItr.Next()
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to get next repo")
-			break
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to get next repo")
+				break
+			}
 		}
 		if repo == nil {
 			break

diff --git a/providers/gcp/bigquery/tables.go b/providers/gcp/bigquery/tables.go
@@ -3,6 +3,7 @@ package bigquery
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"cloud.google.com/go/bigquery"
@@ -50,8 +51,13 @@ func Tables(ctx context.Context, client providers.ProviderClient) ([]models.Reso
 			break
 		}
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to list dataset")
-			return resources, err
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to list dataset")
+				return resources, err
+			}
 		}
 
 		tablesIterator := dataset.Tables(ctx)

diff --git a/providers/gcp/certificate/certificates.go b/providers/gcp/certificate/certificates.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"regexp"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -36,8 +37,13 @@ func Certificates(ctx context.Context, client providers.ProviderClient) ([]model
 			break
 		}
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to list certificates")
-			return resources, err
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to list certificates")
+				return resources, err
+			}
 		}
 
 		certificateNameWithoutProjectAndLocation := extractCertificateName(certificate.Name)

diff --git a/providers/gcp/compute/disks.go b/providers/gcp/compute/disks.go
@@ -3,6 +3,7 @@ package compute
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -43,8 +44,13 @@ func Disks(ctx context.Context, client providers.ProviderClient) ([]models.Resou
 			break
 		}
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to list disks")
-			return resources, err
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to list disks")
+				return resources, err
+			}
 		}
 		if len(disksListPair.Value.Disks) == 0 {
 			continue

diff --git a/providers/gcp/compute/instances.go b/providers/gcp/compute/instances.go
@@ -3,6 +3,7 @@ package compute
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -43,8 +44,13 @@ func Instances(ctx context.Context, client providers.ProviderClient) ([]models.R
 			break
 		}
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to list instances")
-			return resources, err
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to list instances")
+				return resources, err
+			}
 		}
 		if len(instanceListPair.Value.Instances) == 0 {
 			continue

diff --git a/providers/gcp/compute/snapshots.go b/providers/gcp/compute/snapshots.go
@@ -3,6 +3,7 @@ package compute
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	compute "cloud.google.com/go/compute/apiv1"
@@ -42,8 +43,13 @@ func Snapshots(ctx context.Context, client providers.ProviderClient) ([]models.R
 			break
 		}
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to list snapshots")
-			return resources, err
+			if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
+				return resources, nil
+			} else {
+				logrus.WithError(err).Errorf("failed to list snapshots")
+				return resources, err
+			}
 		}
 
 		tags := make([]models.Tag, 0)

diff --git a/providers/gcp/container/clusters.go b/providers/gcp/container/clusters.go
@@ -3,6 +3,7 @@ package container
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -36,8 +37,13 @@ func Clusters(ctx context.Context, client providers.ProviderClient) ([]models.Re
 		ProjectId: client.GCPClient.Credentials.ProjectID,
 	})
 	if err != nil {
-		logrus.WithError(err).Errorf("failed to collect clusters")
-		return resources, err
+		if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+			logrus.Warn(err.Error())
+			return resources, nil
+		} else {
+			logrus.WithError(err).Errorf("failed to collect clusters")
+			return resources, err
+		}
 	}
 
 	for _, cluster := range clusters.Clusters {

diff --git a/providers/gcp/firestore/documents.go b/providers/gcp/firestore/documents.go
@@ -3,6 +3,7 @@ package firestore
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -26,8 +27,13 @@ func Documents(ctx context.Context, client providers.ProviderClient) ([]models.R
 
 	list, err := itr.GetAll()
 	if err != nil {
-		logrus.WithError(err).Errorf("failed to list all firestore collections")
-		return resources, err
+		if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+			logrus.Warn(err.Error())
+			return resources, nil
+		} else {
+			logrus.WithError(err).Errorf("failed to list all firestore collections")
+			return resources, err
+		}
 	}
 
 	for _, collection := range list {

diff --git a/providers/gcp/function/functions.go b/providers/gcp/function/functions.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"regexp"
+	"strings"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -26,8 +27,13 @@ func Functions(ctx context.Context, client providers.ProviderClient) ([]models.R
 		"projects/" + client.GCPClient.Credentials.ProjectID + "/locations/-",
 	).Do()
 	if err != nil {
-		log.WithError(err).Errorf("failed to list Cloud Functions")
-		return resources, err
+		if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+			log.Warn(err.Error())
+			return resources, nil
+		} else {
+			log.WithError(err).Errorf("failed to list Cloud Functions")
+			return resources, err
+		}
 	}
 
 	for _, function := range functions.Functions {

diff --git a/providers/gcp/gateway/gateways.go b/providers/gcp/gateway/gateways.go
@@ -3,6 +3,7 @@ package gateway
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -34,12 +35,12 @@ RegionsLoop:
 			"projects/" + client.GCPClient.Credentials.ProjectID + "/locations/" + regionName,
 		).Do()
 		if err != nil {
-			if err.Error() == "googleapi: Error 403: Location "+regionName+" is not found or access is unauthorized., forbidden" {
+			if err.Error() == "googleapi: Error 403: Location "+regionName+" is not found or access is unauthorized., forbidden" || strings.Contains(err.Error(), "SERVICE_DISABLED") {
+				logrus.Warn(err.Error())
 				continue RegionsLoop
 			} else {
 				logrus.WithError(err).Errorf("failed to list API Gateways")
 				return resources, err
-
 			}
 		}
 

diff --git a/providers/gcp/iam/roles.go b/providers/gcp/iam/roles.go
@@ -26,8 +26,13 @@ func Roles(ctx context.Context, client providers.ProviderClient) ([]models.Resou
 		"projects/" + client.GCPClient.Credentials.ProjectID,
 	).Do()
 	if err != nil {
-		logrus.WithError(err).Errorf("failed to list IAM roles")
-		return resources, err
+		if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+			logrus.Warn(err.Error())
+			return resources, nil
+		} else {
+			logrus.WithError(err).Errorf("failed to list IAM roles")
+			return resources, err
+		}
 	}
 
 	for _, role := range roles.Roles {

diff --git a/providers/gcp/iam/service_accounts.go b/providers/gcp/iam/service_accounts.go
@@ -3,6 +3,7 @@ package iam
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -25,8 +26,13 @@ func ServiceAccounts(ctx context.Context, client providers.ProviderClient) ([]mo
 		"projects/" + client.GCPClient.Credentials.ProjectID,
 	).Do()
 	if err != nil {
-		logrus.WithError(err).Errorf("failed to list IAM Service Accounts")
-		return resources, err
+		if strings.Contains(err.Error(), "SERVICE_DISABLED") {
+			logrus.Warn(err.Error())
+			return resources, nil
+		} else {
+			logrus.WithError(err).Errorf("failed to list IAM Service Accounts")
+			return resources, err
+		}
 	}
 
 	for _, account := range serviceAccounts.Accounts {