Return correct error

jirwin · jirwin · commit 7c016d282af9 · 2025-10-14T15:43:27.000-07:00
diff --git a/pkg/postgres/roles.go b/pkg/postgres/roles.go
@@ -393,7 +393,7 @@ func (c *Client) SafeDeleteRole(ctx context.Context, roleName string) error {
 	if grantsRevokeError != nil {
 		l.Error("error revoking grants from role", zap.Error(grantsRevokeError))
 		if !errors.Is(grantsRevokeError, errRevokeGrantsFromRole) {
-			return fmt.Errorf("error revoking existing grants from role: %w", err)
+			return fmt.Errorf("error revoking existing grants from role: %w", grantsRevokeError)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ func (c *Client) SafeDeleteRole(ctx context.Context, roleName string) error {`
`393`	`393`	`if grantsRevokeError != nil {`
`394`	`394`	`l.Error("error revoking grants from role", zap.Error(grantsRevokeError))`
`395`	`395`	`if !errors.Is(grantsRevokeError, errRevokeGrantsFromRole) {`
`396`		`- return fmt.Errorf("error revoking existing grants from role: %w", err)`
	`396`	`+ return fmt.Errorf("error revoking existing grants from role: %w", grantsRevokeError)`
`397`	`397`	`}`
`398`	`398`	`}`
`399`	`399`