Make enumeration diagnostig messages more generic

snyk · Aug 18, 2022 · 1ad43c0 · 1ad43c0
1 parent a1a4d70
commit 1ad43c0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/enumeration/remote/alerts/alerts.go b/enumeration/remote/alerts/alerts.go
@@ -31,21 +31,21 @@ func NewRemoteAccessDeniedAlert(provider string, scanErr *remoteerror.ResourceSc
 	switch scanningPhase {
 	case EnumerationPhase:
 		message = fmt.Sprintf(
-			"Ignoring %s from drift calculation: Listing %s is forbidden: %s",
+			"An error occured listing %s: listing %s is forbidden: %s",
 			scanErr.Resource(),
 			scanErr.ListedTypeError(),
 			scanErr.RootCause().Error(),
 		)
 	case DetailsFetchingPhase:
 		message = fmt.Sprintf(
-			"Ignoring %s from drift calculation: Reading details of %s is forbidden: %s",
+			"An error occured listing %s: reading details of %s is forbidden: %s",
 			scanErr.Resource(),
 			scanErr.ListedTypeError(),
 			scanErr.RootCause().Error(),
 		)
 	default:
 		message = fmt.Sprintf(
-			"Ignoring %s from drift calculation: %s",
+			"An error occured listing %s: %s",
 			scanErr.Resource(),
 			scanErr.RootCause().Error(),
 		)

diff --git a/pkg/cmd/scan/output/testdata/output.html b/pkg/cmd/scan/output/testdata/output.html
@@ -681,17 +681,17 @@ <h2>Jun 10, 2021</h2>
 
                         <li data-kind="resource-alerts" class="resource-item">
 
-                            <span>Ignoring aws_vpc from drift calculation: Listing aws_vpc is forbidden: dummy error</span>
+                            <span>An error occured listing aws_vpc: listing aws_vpc is forbidden: dummy error</span>
                         </li>
 
                         <li data-kind="resource-alerts" class="resource-item">
 
-                            <span>Ignoring aws_sqs from drift calculation: Listing aws_sqs is forbidden: dummy error</span>
+                            <span>An error occured listing aws_sqs: listing aws_sqs is forbidden: dummy error</span>
                         </li>
 
                         <li data-kind="resource-alerts" class="resource-item">
 
-                            <span>Ignoring aws_sns from drift calculation: Listing aws_sns is forbidden: dummy error</span>
+                            <span>An error occured listing aws_sns: listing aws_sns is forbidden: dummy error</span>
                         </li>
 
 

diff --git a/pkg/cmd/scan/output/testdata/output_access_denied_alert_aws.json b/pkg/cmd/scan/output/testdata/output_access_denied_alert_aws.json
@@ -20,13 +20,13 @@
 	"alerts": {
 		"": [
 			{
-				"message": "Ignoring aws_vpc from drift calculation: Listing aws_vpc is forbidden: dummy error"
+				"message": "An error occured listing aws_vpc: listing aws_vpc is forbidden: dummy error"
 			},
 			{
-				"message": "Ignoring aws_sqs from drift calculation: Listing aws_sqs is forbidden: dummy error"
+				"message": "An error occured listing aws_sqs: listing aws_sqs is forbidden: dummy error"
 			},
 			{
-				"message": "Ignoring aws_sns from drift calculation: Listing aws_sns is forbidden: dummy error"
+				"message": "An error occured listing aws_sns: listing aws_sns is forbidden: dummy error"
 			}
 		]
 	},

diff --git a/pkg/cmd/scan/output/testdata/output_access_denied_alert_aws.txt b/pkg/cmd/scan/output/testdata/output_access_denied_alert_aws.txt
@@ -1,9 +1,9 @@
 Found 0 resource(s)
  - 0% coverage
 Congrats! Your infrastructure is fully in sync.
-Ignoring aws_vpc from drift calculation: Listing aws_vpc is forbidden: dummy error
-Ignoring aws_sqs from drift calculation: Listing aws_sqs is forbidden: dummy error
-Ignoring aws_sns from drift calculation: Listing aws_sns is forbidden: dummy error
+An error occured listing aws_vpc: listing aws_vpc is forbidden: dummy error
+An error occured listing aws_sqs: listing aws_sqs is forbidden: dummy error
+An error occured listing aws_sns: listing aws_sns is forbidden: dummy error
 
 It seems that we got access denied exceptions while listing resources.
 The latest minimal read-only IAM policy for driftctl is always available here, please update yours: https://docs.driftctl.com/aws/policy
diff --git a/pkg/cmd/scan/output/testdata/output_access_denied_alert_github.json b/pkg/cmd/scan/output/testdata/output_access_denied_alert_github.json
@@ -20,10 +20,10 @@
 	"alerts": {
 		"": [
 			{
-				"message": "Ignoring github_team from drift calculation: Listing github_team is forbidden: dummy error"
+				"message": "An error occured listing github_team: listing github_team is forbidden: dummy error"
 			},
 			{
-				"message": "Ignoring github_team_membership from drift calculation: Listing github_team is forbidden: dummy error"
+				"message": "An error occured listing github_team_membership: listing github_team is forbidden: dummy error"
 			}
 		]
 	},

diff --git a/pkg/cmd/scan/output/testdata/output_access_denied_alert_github.txt b/pkg/cmd/scan/output/testdata/output_access_denied_alert_github.txt
@@ -1,8 +1,8 @@
 Found 0 resource(s)
  - 0% coverage
 Congrats! Your infrastructure is fully in sync.
-Ignoring github_team from drift calculation: Listing github_team is forbidden: dummy error
-Ignoring github_team_membership from drift calculation: Listing github_team is forbidden: dummy error
+An error occured listing github_team: listing github_team is forbidden: dummy error
+An error occured listing github_team_membership: listing github_team is forbidden: dummy error
 
 It seems that we got access denied exceptions while listing resources.
 Please be sure that your Github token has the right permissions, check the last up-to-date documentation there: https://docs.driftctl.com/github/policy