Skip to content

refactor: add proper logging to key delete#3196

Merged
perkinsjr merged 2 commits intomainfrom
key-deletion-logs
Apr 25, 2025
Merged

refactor: add proper logging to key delete#3196
perkinsjr merged 2 commits intomainfrom
key-deletion-logs

Conversation

@ogzhanolguncu
Copy link
Contributor

@ogzhanolguncu ogzhanolguncu commented Apr 25, 2025

What does this PR do?

This PR adds some proper logging to key deletion tRPC endpoint and audit insertion.

If there is not an issue for this, please create one first. This is used to tracking purposes and also helps use understand why this PR exists

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (refactoring code, technical debt, workflow improvements)
  • Enhancement (small improvements)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How should this be tested?

  • Test A
  • Test B

Checklist

Required

  • Filled out the "How to test" section in this PR
  • Read Contributing Guide
  • Self-reviewed my own code
  • Commented on my code in hard-to-understand areas
  • Ran pnpm build
  • Ran pnpm fmt
  • Checked for warnings, there are none
  • Removed all console.logs
  • Merged the latest changes from main onto my branch with git pull origin main
  • My changes don't cause any responsiveness issues

Appreciated

  • If a UI change was made: Added a screen recording or screenshots to this PR
  • Updated the Unkey Docs if changes were necessary

Summary by CodeRabbit

  • Bug Fixes

    • Improved validation when deleting keys, ensuring at least one key ID must be provided.
    • Enhanced error messages for missing keys or workspaces during deletion.
  • New Features

    • Added detailed runtime logging for audit log insertions and key deletion actions, improving transparency and traceability for these operations.

@changeset-bot
Copy link

changeset-bot bot commented Apr 25, 2025

⚠️ No Changeset found

Latest commit: 8bd6c04

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@vercel
Copy link

vercel bot commented Apr 25, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
dashboard ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 25, 2025 2:24pm
engineering ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 25, 2025 2:24pm

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Apr 25, 2025

📝 Walkthrough

Walkthrough

This update introduces extensive logging enhancements and stricter input validation to two core modules. The insertAuditLogs function in the audit library now provides detailed runtime logs at various stages of the audit log insertion process. In the key deletion router, the mutation procedure enforces a non-empty array of key IDs, adds comprehensive logging throughout the deletion workflow, clarifies error messages, and improves error handling for both workspace and key lookup failures. No public API signatures are changed, except for stricter input schema validation.

Changes

File(s) Change Summary
apps/dashboard/lib/audit.ts Enhanced insertAuditLogs with detailed logging at each stage: when no logs are provided, before insertion (with counts and details), per-entry insert, per-resource insert, and on completion. No changes to function signature or control flow.
apps/dashboard/lib/trpc/routers/key/delete.ts Refined input schema to require at least one key ID. Added detailed logging at all stages: input validation, workspace/key lookup, transaction start/end, and error handling. Improved error messages for workspace/key not found. Wrapped key deletion in a transaction with explicit logging. Enhanced audit log insertion and error handling for permission/audit failures.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant deleteKeys Procedure
    participant DB
    participant AuditLog

    Client->>deleteKeys Procedure: Request to delete keys (with keyIds)
    deleteKeys Procedure->>deleteKeys Procedure: Validate keyIds (must not be empty)
    deleteKeys Procedure->>DB: Find workspace by tenantId and userId
    alt Workspace not found
        deleteKeys Procedure-->>Client: Throw NOT_FOUND error
    else Workspace found
        deleteKeys Procedure->>DB: Find keys by keyIds in workspace
        alt No keys found
            deleteKeys Procedure-->>Client: Throw NOT_FOUND error
        else Keys found
            deleteKeys Procedure->>DB: Begin transaction
            deleteKeys Procedure->>DB: Mark keys as deleted
            deleteKeys Procedure->>AuditLog: Insert audit logs for deleted keys
            DB-->>deleteKeys Procedure: Commit transaction
            deleteKeys Procedure-->>Client: Respond with success
        end
    end
    Note over deleteKeys Procedure: Logs at each stage and on errors
Loading

Possibly related PRs

  • fix: transaction deadlock in trpc #2843: Modifies the same insertAuditLogs function by changing its signature and moving workspace fetching, making it code-level related to the logging enhancements in this PR.

Suggested labels

Bug

Suggested reviewers

  • perkinsjr
  • mcstepp
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions
Copy link
Contributor

github-actions bot commented Apr 25, 2025

Thank you for following the naming conventions for pull request titles! 🙏

@vercel vercel bot temporarily deployed to Preview – dashboard April 25, 2025 12:20 Inactive
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🧹 Nitpick comments (2)
apps/dashboard/lib/audit.ts (1)

109-128: Reduce verbosity and avoid leaking identifiers in info-level logs

  1. These console.info statements emit full workspaceIds, auditLogIds and raw resources, which might be considered sensitive metadata or breach GDPR/PII guidelines if they end up in shared log collectors.
  2. High-volume endpoints (e.g. bulk key deletion) will generate thousands of lines, potentially throttling STDOUT and slowing the event-loop.

Consider:

  • Downgrading most of these to logger.debug / trace.
  • Masking or hashing IDs, or logging counts instead of full arrays when the array size is > N.
  • Wrapping the whole block with logger.isLevelEnabled("debug") if the underlying logger supports it.

Example:

-  console.info({
+  logger.debug({
     message: "Inserting audit logs",
-    events: logs.map((log) => log.event),
-    workspaceIds: [...new Set(logs.map((log) => log.workspaceId))],
+    eventCount: logs.length,
   });

Also applies to: 146-151, 169-172

apps/dashboard/lib/trpc/routers/key/delete.ts (1)

28-38: Duplicate empty-array guard is unreachable

z.array(...).min(1) already rejects empty arrays, so this runtime check will never execute. Removing it reduces noise and keeps the control-flow lean.

-    if (keyIds.length === 0) {
-      console.warn({ ... });
-      throw new TRPCError({
-        code: "BAD_REQUEST",
-        message: "No keys were provided for deletion",
-      });
-    }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between fa27104 and 8ff054c.

📒 Files selected for processing (2)
  • apps/dashboard/lib/audit.ts (3 hunks)
  • apps/dashboard/lib/trpc/routers/key/delete.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (14)
  • GitHub Check: Test Packages / Test ./apps/dashboard
  • GitHub Check: Test Packages / Test ./packages/rbac
  • GitHub Check: Test Packages / Test ./packages/nextjs
  • GitHub Check: Test Packages / Test ./packages/hono
  • GitHub Check: Test Packages / Test ./packages/cache
  • GitHub Check: Test Packages / Test ./packages/api
  • GitHub Check: Test Packages / Test ./internal/clickhouse
  • GitHub Check: Test Packages / Test ./internal/resend
  • GitHub Check: Test Packages / Test ./internal/keys
  • GitHub Check: Test Packages / Test ./internal/id
  • GitHub Check: Test Packages / Test ./internal/hash
  • GitHub Check: Test Packages / Test ./internal/billing
  • GitHub Check: autofix
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (1)
apps/dashboard/lib/trpc/routers/key/delete.ts (1)

12-13: Good input hardening with min(1)

Requiring at least one key ID at the schema level eliminates empty-payload edge cases before they hit business logic.

@perkinsjr
Copy link
Member

Can you resolve Rabbit comments first :) cc @ogzhanolguncu

@perkinsjr perkinsjr self-assigned this Apr 25, 2025
@vercel vercel bot temporarily deployed to Preview – engineering April 25, 2025 14:22 Inactive
@vercel vercel bot temporarily deployed to Preview – dashboard April 25, 2025 14:24 Inactive
@perkinsjr perkinsjr added this pull request to the merge queue Apr 25, 2025
Merged via the queue into main with commit fce34ba Apr 25, 2025
30 checks passed
@perkinsjr perkinsjr deleted the key-deletion-logs branch April 25, 2025 14:41
@coderabbitai coderabbitai bot mentioned this pull request Jul 14, 2025
18 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants