Wrap errors in remaining analyzers with AnalysisError (Batches B-E)

johnelliott · johnelliott · commit 6ef66512e779 · 2026-02-18T11:38:17.000-08:00
Batch B (OAuth/multi-credential): airtableoauth, airtablepat, datadog,
dropbox, figma, launchdarkly, plaid
Batch C (Complex): bitbucket, databricks, github, gitlab, jira, monday,
planetscale, shopify, slack, square, stripe, twilio
Batch D (Database): mysql, postgres (service: Database)
Batch E (PrivateKey): privatekey (service: crypto)
diff --git a/pkg/analyzer/analyzers/airtable/airtableoauth/airtable.go b/pkg/analyzer/analyzers/airtable/airtableoauth/airtable.go
@@ -22,12 +22,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeAir
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	token, ok := credInfo["token"]
 	if !ok {
-		return nil, errors.New("token not found in credInfo")
+		return nil, analyzers.NewAnalysisError("AirtableOAuth", "validate_credentials", "config", "", errors.New("token not found in credInfo"))
 	}
 
 	userInfo, err := common.FetchAirtableUserInfo(token)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("AirtableOAuth", "analyze_permissions", "API", "", err)
 	}
 
 	var basesInfo *common.AirtableBases
diff --git a/pkg/analyzer/analyzers/airtable/airtablepat/airtable.go b/pkg/analyzer/analyzers/airtable/airtablepat/airtable.go
@@ -36,30 +36,30 @@ func getScopeEndpoint(scope string) (common.Endpoint, bool) {
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	token, ok := credInfo["token"]
 	if !ok {
-		return nil, errors.New("token not found in credInfo")
+		return nil, analyzers.NewAnalysisError("AirtablePat", "validate_credentials", "config", "", errors.New("token not found in credInfo"))
 	}
 
 	userInfo, err := common.FetchAirtableUserInfo(token)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("AirtablePat", "analyze_permissions", "API", "", err)
 	}
 
 	scopeStatusMap[common.PermissionStrings[common.UserEmailRead]] = userInfo.Email != nil
 
 	var basesInfo *common.AirtableBases
 	granted, err := determineScope(token, common.SchemaBasesRead, nil)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("AirtablePat", "analyze_permissions", "API", "", err)
 	}
 	if granted {
 		basesInfo, err = common.FetchAirtableBases(token)
 		if err != nil {
-			return nil, err
+			return nil, analyzers.NewAnalysisError("AirtablePat", "analyze_permissions", "API", "", err)
 		}
 		// If bases are fetched, determine the token scopes
 		err := determineScopes(token, basesInfo)
 		if err != nil {
-			return nil, err
+			return nil, analyzers.NewAnalysisError("AirtablePat", "analyze_permissions", "API", "", err)
 		}
 	}
 
diff --git a/pkg/analyzer/analyzers/bitbucket/bitbucket.go b/pkg/analyzer/analyzers/bitbucket/bitbucket.go
@@ -63,11 +63,11 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeBit
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	key, ok := credInfo["key"]
 	if !ok {
-		return nil, errors.New("key not found in credentialInfo")
+		return nil, analyzers.NewAnalysisError("Bitbucket", "validate_credentials", "config", "", errors.New("key not found in credentialInfo"))
 	}
 	info, err := AnalyzePermissions(a.Cfg, key)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Bitbucket", "analyze_permissions", "API", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/databricks/databricks.go b/pkg/analyzer/analyzers/databricks/databricks.go
@@ -26,17 +26,17 @@ func (a Analyzer) Type() analyzers.AnalyzerType {
 func (a Analyzer) Analyze(ctx context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	token, exist := credInfo["token"]
 	if !exist {
-		return nil, fmt.Errorf("key not found in credential info")
+		return nil, analyzers.NewAnalysisError("DataBricks", "validate_credentials", "config", "", fmt.Errorf("key not found in credential info"))
 	}
 
 	domain, exist := credInfo["domain"]
 	if !exist {
-		return nil, fmt.Errorf("domain not found in credential info")
+		return nil, analyzers.NewAnalysisError("DataBricks", "validate_credentials", "config", "", fmt.Errorf("domain not found in credential info"))
 	}
 
 	info, err := AnalyzePermissions(ctx, a.Cfg, domain, token)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("DataBricks", "analyze_permissions", "API", "", err)
 	}
 
 	return secretInfoToAnalyzerResult(info), nil
diff --git a/pkg/analyzer/analyzers/datadog/datadog.go b/pkg/analyzer/analyzers/datadog/datadog.go
@@ -28,15 +28,15 @@ func (a Analyzer) Type() analyzers.AnalyzerType {
 func (a Analyzer) Analyze(ctx context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	apiKey, exist := credInfo["apiKey"]
 	if !exist {
-		return nil, errors.New("API key not found in credentials info")
+		return nil, analyzers.NewAnalysisError("Datadog", "validate_credentials", "config", "", errors.New("API key not found in credentials info"))
 	}
 
 	// Get appKey if provided
 	appKey := credInfo["appKey"]
 
 	info, err := AnalyzePermissions(a.Cfg, apiKey, appKey)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Datadog", "analyze_permissions", "API", "", err)
 	}
 
 	return secretInfoToAnalyzerResult(info), nil
diff --git a/pkg/analyzer/analyzers/dropbox/dropbox.go b/pkg/analyzer/analyzers/dropbox/dropbox.go
@@ -43,12 +43,12 @@ func (a Analyzer) Type() analyzers.AnalyzerType {
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	token, exist := credInfo["token"]
 	if !exist {
-		return nil, errors.New("token not found in credentials info")
+		return nil, analyzers.NewAnalysisError("Dropbox", "validate_credentials", "config", "", errors.New("token not found in credentials info"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, token)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Dropbox", "analyze_permissions", "API", "", err)
 	}
 
 	return secretInfoToAnalyzerResult(info), nil
diff --git a/pkg/analyzer/analyzers/figma/figma.go b/pkg/analyzer/analyzers/figma/figma.go
@@ -41,11 +41,11 @@ const (
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	token, ok := credInfo["token"]
 	if !ok {
-		return nil, errors.New("token not found in credInfo")
+		return nil, analyzers.NewAnalysisError("Figma", "validate_credentials", "config", "", errors.New("token not found in credInfo"))
 	}
 	info, err := AnalyzePermissions(a.Cfg, token)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Figma", "analyze_permissions", "API", "", err)
 	}
 	return MapToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/github/github.go b/pkg/analyzer/analyzers/github/github.go
@@ -35,7 +35,7 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeGit
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	info, err := AnalyzePermissions(a.Cfg, credInfo["key"])
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("GitHub", "analyze_permissions", "API", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/gitlab/gitlab.go b/pkg/analyzer/analyzers/gitlab/gitlab.go
@@ -34,7 +34,7 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeGit
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	key, ok := credInfo["key"]
 	if !ok {
-		return nil, errors.New("key not found in credentialInfo")
+		return nil, analyzers.NewAnalysisError("GitLab", "validate_credentials", "config", "", errors.New("key not found in credentialInfo"))
 	}
 	host, ok := credInfo["host"]
 	if !ok {
@@ -43,7 +43,7 @@ func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analy
 
 	info, err := AnalyzePermissions(a.Cfg, key, host)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("GitLab", "analyze_permissions", "API", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/jira/jira.go b/pkg/analyzer/analyzers/jira/jira.go
@@ -28,20 +28,20 @@ func (a Analyzer) Type() analyzers.AnalyzerType {
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	token, exist := credInfo["token"]
 	if !exist {
-		return nil, fmt.Errorf("token not found in credential info")
+		return nil, analyzers.NewAnalysisError("Jira", "validate_credentials", "config", "", fmt.Errorf("token not found in credential info"))
 	}
 	domain, exist := credInfo["domain"]
 	if !exist {
-		return nil, fmt.Errorf("domain not found in credential info")
+		return nil, analyzers.NewAnalysisError("Jira", "validate_credentials", "config", "", fmt.Errorf("domain not found in credential info"))
 	}
 	email, exist := credInfo["email"]
 	if !exist {
-		return nil, fmt.Errorf("email not found in credential info")
+		return nil, analyzers.NewAnalysisError("Jira", "validate_credentials", "config", "", fmt.Errorf("email not found in credential info"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, token, domain, email)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Jira", "analyze_permissions", "API", "", err)
 	}
 
 	return secretInfoToAnalyzerResult(info), nil
diff --git a/pkg/analyzer/analyzers/launchdarkly/launchdarkly.go b/pkg/analyzer/analyzers/launchdarkly/launchdarkly.go
@@ -29,16 +29,16 @@ func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analy
 	// check if the `key` exist in the credentials info
 	key, exist := credInfo["key"]
 	if !exist {
-		return nil, errors.New("key not found in credentials info")
+		return nil, analyzers.NewAnalysisError("LaunchDarkly", "validate_credentials", "config", "", errors.New("key not found in credentials info"))
 	}
 
 	if isSDKKey(key) {
-		return nil, errors.New("sdk keys cannot be analyzed")
+		return nil, analyzers.NewAnalysisError("LaunchDarkly", "validate_credentials", "config", "", errors.New("sdk keys cannot be analyzed"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, key)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("LaunchDarkly", "analyze_permissions", "API", "", err)
 	}
 
 	return secretInfoToAnalyzerResult(info), nil
diff --git a/pkg/analyzer/analyzers/monday/monday.go b/pkg/analyzer/analyzers/monday/monday.go
@@ -44,12 +44,12 @@ func (a Analyzer) Type() analyzers.AnalyzerType {
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	key, exist := credInfo["key"]
 	if !exist {
-		return nil, errors.New("key not found in credentials info")
+		return nil, analyzers.NewAnalysisError("Monday", "validate_credentials", "config", "", errors.New("key not found in credentials info"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, key)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Monday", "analyze_permissions", "API", "", err)
 	}
 
 	return secretInfoToAnalyzerResult(info), nil
diff --git a/pkg/analyzer/analyzers/mysql/mysql.go b/pkg/analyzer/analyzers/mysql/mysql.go
@@ -33,11 +33,11 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeMyS
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	uri, ok := credInfo["connection_string"]
 	if !ok {
-		return nil, fmt.Errorf("missing connection string")
+		return nil, analyzers.NewAnalysisError("MySQL", "validate_credentials", "config", "", fmt.Errorf("missing connection string"))
 	}
 	info, err := AnalyzePermissions(a.Cfg, uri)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("MySQL", "analyze_permissions", "Database", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/plaid/plaid.go b/pkg/analyzer/analyzers/plaid/plaid.go
@@ -31,20 +31,20 @@ func (a Analyzer) Type() analyzers.AnalyzerType {
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	secret, exist := credInfo["secret"]
 	if !exist {
-		return nil, errors.New("secret not found in credentials info")
+		return nil, analyzers.NewAnalysisError("Plaid", "validate_credentials", "config", "", errors.New("secret not found in credentials info"))
 	}
 	clientID, exist := credInfo["id"]
 	if !exist {
-		return nil, errors.New("id not found in credentials info")
+		return nil, analyzers.NewAnalysisError("Plaid", "validate_credentials", "config", "", errors.New("id not found in credentials info"))
 	}
 	accessToken, exist := credInfo["token"]
 	if !exist {
-		return nil, errors.New("token not found in credentials info")
+		return nil, analyzers.NewAnalysisError("Plaid", "validate_credentials", "config", "", errors.New("token not found in credentials info"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, secret, clientID, accessToken)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Plaid", "analyze_permissions", "API", "", err)
 	}
 
 	return secretInfoToAnalyzerResult(info), nil
diff --git a/pkg/analyzer/analyzers/planetscale/planetscale.go b/pkg/analyzer/analyzers/planetscale/planetscale.go
@@ -31,15 +31,15 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypePla
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	id, ok := credInfo["id"]
 	if !ok {
-		return nil, errors.New("missing id in credInfo")
+		return nil, analyzers.NewAnalysisError("PlanetScale", "validate_credentials", "config", "", errors.New("missing id in credInfo"))
 	}
 	key, ok := credInfo["token"]
 	if !ok {
-		return nil, errors.New("missing key in credInfo")
+		return nil, analyzers.NewAnalysisError("PlanetScale", "validate_credentials", "config", "", errors.New("missing key in credInfo"))
 	}
 	info, err := AnalyzePermissions(a.Cfg, id, key)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("PlanetScale", "analyze_permissions", "API", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/postgres/postgres.go b/pkg/analyzer/analyzers/postgres/postgres.go
@@ -30,12 +30,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypePos
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	uri, ok := credInfo["connection_string"]
 	if !ok {
-		return nil, errors.New("connection string not found in credInfo")
+		return nil, analyzers.NewAnalysisError("Postgres", "validate_credentials", "config", "", errors.New("connection string not found in credInfo"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, uri)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Postgres", "analyze_permissions", "Database", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
@@ -404,20 +404,20 @@ func getUserPrivs(db *sql.DB) (string, map[string]bool, error) {
 
 func getDBPrivs(db *sql.DB) (string, []DB, error) {
 	query := `
-        SELECT 
+        SELECT
             d.datname AS database_name,
             u.usename AS owner,
             current_user AS current_user,
             has_database_privilege(current_user, d.datname, 'CONNECT') AS can_connect,
             has_database_privilege(current_user, d.datname, 'CREATE') AS can_create,
             has_database_privilege(current_user, d.datname, 'TEMP') AS can_create_temporary_tables
-        FROM 
+        FROM
             pg_database d
-        JOIN 
+        JOIN
             pg_user u ON d.datdba = u.usesysid
-        WHERE 
+        WHERE
             NOT d.datistemplate
-        ORDER BY 
+        ORDER BY
             d.datname;
     `
 	// Originally had WHERE NOT d.datistemplate  AND d.datallowconn
diff --git a/pkg/analyzer/analyzers/privatekey/privatekey.go b/pkg/analyzer/analyzers/privatekey/privatekey.go
@@ -32,12 +32,12 @@ func (a Analyzer) Analyze(ctx context.Context, credInfo map[string]string) (*ana
 	// token will be already normalized by the time it reaches here
 	token, ok := credInfo["token"]
 	if !ok {
-		return nil, errors.New("token not found in credInfo")
+		return nil, analyzers.NewAnalysisError("PrivateKey", "validate_credentials", "config", "", errors.New("token not found in credInfo"))
 	}
 
 	info, err := AnalyzePermissions(ctx, a.Cfg, token)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("PrivateKey", "analyze_permissions", "crypto", "", err)
 	}
 
 	return secretInfoToAnalyzerResult(info), nil
diff --git a/pkg/analyzer/analyzers/shopify/shopify.go b/pkg/analyzer/analyzers/shopify/shopify.go
@@ -34,17 +34,17 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeSho
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	key, ok := credInfo["key"]
 	if !ok {
-		return nil, errors.New("key not found in credentialInfo")
+		return nil, analyzers.NewAnalysisError("Shopify", "validate_credentials", "config", "", errors.New("key not found in credentialInfo"))
 	}
 
 	storeUrl, ok := credInfo["store_url"]
 	if !ok {
-		return nil, errors.New("store_url not found in credentialInfo")
+		return nil, analyzers.NewAnalysisError("Shopify", "validate_credentials", "config", "", errors.New("store_url not found in credentialInfo"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, key, storeUrl)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Shopify", "analyze_permissions", "API", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/slack/slack.go b/pkg/analyzer/analyzers/slack/slack.go
@@ -29,12 +29,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeSla
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	key, ok := credInfo["key"]
 	if !ok {
-		return nil, errors.New("key not found in credentialInfo")
+		return nil, analyzers.NewAnalysisError("Slack", "validate_credentials", "config", "", errors.New("key not found in credentialInfo"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, key)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Slack", "analyze_permissions", "API", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/square/square.go b/pkg/analyzer/analyzers/square/square.go
@@ -28,11 +28,11 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeSqu
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	key, ok := credInfo["key"]
 	if !ok {
-		return nil, errors.New("key not found in credentialInfo")
+		return nil, analyzers.NewAnalysisError("Square", "validate_credentials", "config", "", errors.New("key not found in credentialInfo"))
 	}
 	info, err := AnalyzePermissions(a.Cfg, key)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Square", "analyze_permissions", "API", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/stripe/stripe.go b/pkg/analyzer/analyzers/stripe/stripe.go
@@ -33,12 +33,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeStr
 func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {
 	key, ok := credInfo["key"]
 	if !ok {
-		return nil, errors.New("key not found in credentialInfo")
+		return nil, analyzers.NewAnalysisError("Stripe", "validate_credentials", "config", "", errors.New("key not found in credentialInfo"))
 	}
 
 	info, err := AnalyzePermissions(a.Cfg, key)
 	if err != nil {
-		return nil, err
+		return nil, analyzers.NewAnalysisError("Stripe", "analyze_permissions", "API", "", err)
 	}
 	return secretInfoToAnalyzerResult(info), nil
 }
diff --git a/pkg/analyzer/analyzers/twilio/twilio.go b/pkg/analyzer/analyzers/twilio/twilio.go

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeAir`
`22`	`22`	`func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`23`	`23`	`token, ok := credInfo["token"]`
`24`	`24`	`if !ok {`
`25`		`- return nil, errors.New("token not found in credInfo")`
	`25`	`+ return nil, analyzers.NewAnalysisError("AirtableOAuth", "validate_credentials", "config", "", errors.New("token not found in credInfo"))`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`userInfo, err := common.FetchAirtableUserInfo(token)`
`29`	`29`	`if err != nil {`
`30`		`- return nil, err`
	`30`	`+ return nil, analyzers.NewAnalysisError("AirtableOAuth", "analyze_permissions", "API", "", err)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`var basesInfo *common.AirtableBases`
Original file line number	Diff line number	Diff line change
`@@ -36,30 +36,30 @@ func getScopeEndpoint(scope string) (common.Endpoint, bool) {`
`36`	`36`	`func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`37`	`37`	`token, ok := credInfo["token"]`
`38`	`38`	`if !ok {`
`39`		`- return nil, errors.New("token not found in credInfo")`
	`39`	`+ return nil, analyzers.NewAnalysisError("AirtablePat", "validate_credentials", "config", "", errors.New("token not found in credInfo"))`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`userInfo, err := common.FetchAirtableUserInfo(token)`
`43`	`43`	`if err != nil {`
`44`		`- return nil, err`
	`44`	`+ return nil, analyzers.NewAnalysisError("AirtablePat", "analyze_permissions", "API", "", err)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`scopeStatusMap[common.PermissionStrings[common.UserEmailRead]] = userInfo.Email != nil`
`48`	`48`
`49`	`49`	`var basesInfo *common.AirtableBases`
`50`	`50`	`granted, err := determineScope(token, common.SchemaBasesRead, nil)`
`51`	`51`	`if err != nil {`
`52`		`- return nil, err`
	`52`	`+ return nil, analyzers.NewAnalysisError("AirtablePat", "analyze_permissions", "API", "", err)`
`53`	`53`	`}`
`54`	`54`	`if granted {`
`55`	`55`	`basesInfo, err = common.FetchAirtableBases(token)`
`56`	`56`	`if err != nil {`
`57`		`- return nil, err`
	`57`	`+ return nil, analyzers.NewAnalysisError("AirtablePat", "analyze_permissions", "API", "", err)`
`58`	`58`	`}`
`59`	`59`	`// If bases are fetched, determine the token scopes`
`60`	`60`	`err := determineScopes(token, basesInfo)`
`61`	`61`	`if err != nil {`
`62`		`- return nil, err`
	`62`	`+ return nil, analyzers.NewAnalysisError("AirtablePat", "analyze_permissions", "API", "", err)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,11 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeBit`
`63`	`63`	`func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`64`	`64`	`key, ok := credInfo["key"]`
`65`	`65`	`if !ok {`
`66`		`- return nil, errors.New("key not found in credentialInfo")`
	`66`	`+ return nil, analyzers.NewAnalysisError("Bitbucket", "validate_credentials", "config", "", errors.New("key not found in credentialInfo"))`
`67`	`67`	`}`
`68`	`68`	`info, err := AnalyzePermissions(a.Cfg, key)`
`69`	`69`	`if err != nil {`
`70`		`- return nil, err`
	`70`	`+ return nil, analyzers.NewAnalysisError("Bitbucket", "analyze_permissions", "API", "", err)`
`71`	`71`	`}`
`72`	`72`	`return secretInfoToAnalyzerResult(info), nil`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,17 @@ func (a Analyzer) Type() analyzers.AnalyzerType {`
`26`	`26`	`func (a Analyzer) Analyze(ctx context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`27`	`27`	`token, exist := credInfo["token"]`
`28`	`28`	`if !exist {`
`29`		`- return nil, fmt.Errorf("key not found in credential info")`
	`29`	`+ return nil, analyzers.NewAnalysisError("DataBricks", "validate_credentials", "config", "", fmt.Errorf("key not found in credential info"))`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`domain, exist := credInfo["domain"]`
`33`	`33`	`if !exist {`
`34`		`- return nil, fmt.Errorf("domain not found in credential info")`
	`34`	`+ return nil, analyzers.NewAnalysisError("DataBricks", "validate_credentials", "config", "", fmt.Errorf("domain not found in credential info"))`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`info, err := AnalyzePermissions(ctx, a.Cfg, domain, token)`
`38`	`38`	`if err != nil {`
`39`		`- return nil, err`
	`39`	`+ return nil, analyzers.NewAnalysisError("DataBricks", "analyze_permissions", "API", "", err)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`return secretInfoToAnalyzerResult(info), nil`
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ func (a Analyzer) Type() analyzers.AnalyzerType {`
`43`	`43`	`func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`44`	`44`	`token, exist := credInfo["token"]`
`45`	`45`	`if !exist {`
`46`		`- return nil, errors.New("token not found in credentials info")`
	`46`	`+ return nil, analyzers.NewAnalysisError("Dropbox", "validate_credentials", "config", "", errors.New("token not found in credentials info"))`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`info, err := AnalyzePermissions(a.Cfg, token)`
`50`	`50`	`if err != nil {`
`51`		`- return nil, err`
	`51`	`+ return nil, analyzers.NewAnalysisError("Dropbox", "analyze_permissions", "API", "", err)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`return secretInfoToAnalyzerResult(info), nil`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ const (`
`41`	`41`	`func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`42`	`42`	`token, ok := credInfo["token"]`
`43`	`43`	`if !ok {`
`44`		`- return nil, errors.New("token not found in credInfo")`
	`44`	`+ return nil, analyzers.NewAnalysisError("Figma", "validate_credentials", "config", "", errors.New("token not found in credInfo"))`
`45`	`45`	`}`
`46`	`46`	`info, err := AnalyzePermissions(a.Cfg, token)`
`47`	`47`	`if err != nil {`
`48`		`- return nil, err`
	`48`	`+ return nil, analyzers.NewAnalysisError("Figma", "analyze_permissions", "API", "", err)`
`49`	`49`	`}`
`50`	`50`	`return MapToAnalyzerResult(info), nil`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeGit`
`35`	`35`	`func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`36`	`36`	`info, err := AnalyzePermissions(a.Cfg, credInfo["key"])`
`37`	`37`	`if err != nil {`
`38`		`- return nil, err`
	`38`	`+ return nil, analyzers.NewAnalysisError("GitHub", "analyze_permissions", "API", "", err)`
`39`	`39`	`}`
`40`	`40`	`return secretInfoToAnalyzerResult(info), nil`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeGit`
`34`	`34`	`func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`35`	`35`	`key, ok := credInfo["key"]`
`36`	`36`	`if !ok {`
`37`		`- return nil, errors.New("key not found in credentialInfo")`
	`37`	`+ return nil, analyzers.NewAnalysisError("GitLab", "validate_credentials", "config", "", errors.New("key not found in credentialInfo"))`
`38`	`38`	`}`
`39`	`39`	`host, ok := credInfo["host"]`
`40`	`40`	`if !ok {`
`@@ -43,7 +43,7 @@ func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analy`
`43`	`43`
`44`	`44`	`info, err := AnalyzePermissions(a.Cfg, key, host)`
`45`	`45`	`if err != nil {`
`46`		`- return nil, err`
	`46`	`+ return nil, analyzers.NewAnalysisError("GitLab", "analyze_permissions", "API", "", err)`
`47`	`47`	`}`
`48`	`48`	`return secretInfoToAnalyzerResult(info), nil`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,20 +28,20 @@ func (a Analyzer) Type() analyzers.AnalyzerType {`
`28`	`28`	`func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {`
`29`	`29`	`token, exist := credInfo["token"]`
`30`	`30`	`if !exist {`
`31`		`- return nil, fmt.Errorf("token not found in credential info")`
	`31`	`+ return nil, analyzers.NewAnalysisError("Jira", "validate_credentials", "config", "", fmt.Errorf("token not found in credential info"))`
`32`	`32`	`}`
`33`	`33`	`domain, exist := credInfo["domain"]`
`34`	`34`	`if !exist {`
`35`		`- return nil, fmt.Errorf("domain not found in credential info")`
	`35`	`+ return nil, analyzers.NewAnalysisError("Jira", "validate_credentials", "config", "", fmt.Errorf("domain not found in credential info"))`
`36`	`36`	`}`
`37`	`37`	`email, exist := credInfo["email"]`
`38`	`38`	`if !exist {`
`39`		`- return nil, fmt.Errorf("email not found in credential info")`
	`39`	`+ return nil, analyzers.NewAnalysisError("Jira", "validate_credentials", "config", "", fmt.Errorf("email not found in credential info"))`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`info, err := AnalyzePermissions(a.Cfg, token, domain, email)`
`43`	`43`	`if err != nil {`
`44`		`- return nil, err`
	`44`	`+ return nil, analyzers.NewAnalysisError("Jira", "analyze_permissions", "API", "", err)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`return secretInfoToAnalyzerResult(info), nil`