-
Notifications
You must be signed in to change notification settings - Fork 502
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: capture uniqueness error and return it correctly #2337
Conversation
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
|
📝 WalkthroughWalkthroughThe pull request introduces updates to the identity creation functionality within the API. It enhances the test suite for the Changes
Possibly related PRs
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
Thank you for following the naming conventions for pull request titles! 🙏 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 0
🧹 Outside diff range and nitpick comments (5)
apps/api/src/routes/v1_identities_createIdentity.error.test.ts (1)
42-74
: LGTM: Well-structured test for duplicate identity creationThe new test case effectively simulates a duplicate identity creation scenario and checks for the correct error response. Good use of IntegrationHarness for setup and database operations.
Minor suggestion: Consider adding a comment explaining the significance of the 412 status code for better clarity.
You could add a comment like this before the status code assertion:
// 412 Precondition Failed - indicates that the server doesn't meet one of the preconditions that the requester put on the request, in this case, the uniqueness of the identity expect(res.status).toEqual(412);apps/api/src/routes/v1_identities_createIdentity.ts (4)
32-34
: Improved documentation forexternalId
uniqueness.The added description clearly explains the uniqueness requirement for
externalId
across the workspace and specifies the error code for duplicate entries. This enhancement aligns well with the PR objective of capturing uniqueness errors.Consider adding an example of how to handle the
PRECONDITION_FAILED
error in the client code to make the documentation even more helpful for developers.
133-145
: Improved transaction logic and error handling for duplicate entries.The changes enhance readability and correctly implement the
PRECONDITION_FAILED
error for duplicate identities, aligning with the PR objective.For consistency with other error messages in the codebase, consider updating the error message to be more specific:
message: "Duplicate identity: An identity with this externalId already exists in the workspace",
Line range hint
162-250
: Improved structure of audit log insertion logic.The restructuring enhances code organization while maintaining the existing functionality. Audit logs are correctly created for both identity and ratelimit creation events, and the use of
waitUntil
for non-blocking analytics ingestion is preserved.Consider extracting the common audit log structure into a separate function to reduce code duplication between the database insertion and analytics ingestion. For example:
function createAuditLog(event: string, resourceType: string, resourceId: string) { return { workspaceId: authorizedWorkspaceId, event, actor: { type: "key", id: rootKeyId, }, description: `Created ${resourceId}`, resources: [ { type: resourceType, id: resourceId, }, ], context: { location: c.get("location"), userAgent: c.get("userAgent"), }, }; }This function can then be used for both database insertion and analytics ingestion, reducing duplication and improving maintainability.
252-261
: Enhanced error handling at the end of the transaction.The new error handling logic improves the robustness of the code by distinguishing between
UnkeyApiError
and other types of errors. This change aligns well with the PR objective of returning errors correctly.Consider adding error logging for non-
UnkeyApiError
instances before throwing the genericINTERNAL_SERVER_ERROR
. This can help with debugging in production environments. For example:if (e instanceof UnkeyApiError) { throw e; } console.error("Unexpected error during identity creation:", e); throw new UnkeyApiError({ code: "INTERNAL_SERVER_ERROR", message: "Unable to store identity and ratelimits in the database", });
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
⛔ Files ignored due to path filters (1)
pnpm-lock.yaml
is excluded by!**/pnpm-lock.yaml
📒 Files selected for processing (2)
- apps/api/src/routes/v1_identities_createIdentity.error.test.ts (2 hunks)
- apps/api/src/routes/v1_identities_createIdentity.ts (3 hunks)
🧰 Additional context used
🔇 Additional comments (4)
apps/api/src/routes/v1_identities_createIdentity.error.test.ts (2)
1-5
: LGTM: Import changes look goodThe new imports (ErrorResponse, schema, newId) are necessary for the added test case. The reordering of imports improves readability by grouping third-party imports first, followed by local imports.
65-71
: Verify corresponding route implementationThe test expects a specific error response for duplicate identity creation. Let's verify that the actual route implementation matches these expectations.
Run the following script to check the implementation of the createIdentity route:
apps/api/src/routes/v1_identities_createIdentity.ts (2)
147-160
: Improved readability of ratelimits insertion logic.The reformatting enhances code readability while maintaining the existing functionality. The conditional insertion of ratelimits is preserved, ensuring they are only inserted when present.
Line range hint
1-265
: Overall assessment: Excellent improvements to error handling and code clarity.The changes in this file significantly enhance the
createIdentity
route by improving error handling for duplicate entries, enhancing code readability, and providing clearer documentation. These improvements align well with the PR objective of capturing uniqueness errors and returning them correctly.Key improvements:
- Better documentation for
externalId
uniqueness requirements.- Improved error handling for duplicate entries.
- Enhanced readability of transaction and audit log insertion logic.
- More robust error handling at the end of the transaction.
The suggested minor improvements, if implemented, would further enhance the code's quality and maintainability.
* fix:breadcrum-cache-issue * chore:rename-revalidateMytag * refactor: move-revalidateTag * refactor: extract tags into reusable utility * feat: add template * Update 3_follow_the_unkey_x_account.md (#2323) * fix: capture uniqueness error and return it correctly (#2337) * docs: getVerifications instead of get (#2329) * Update 3_follow_the_unkey_x_account.md (#2324) Followed unkey on Twitter Co-authored-by: Andreas Thomas <dev@chronark.com> * fix: transaction ...: in use: for query (#2278) * fix: transaction ...: in use: for query - Fixes #2197 - The error is caused by the cache revalidation happening in the background, so we have a racecondition with the other queries we are running in the insertGenericAuditLogs function * docs: explain for future self * fix: another racecondition also bulk insert auditLogs and auditLogTargets * [autofix.ci] apply automated fixes --------- Co-authored-by: chronark <dev@chronark.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> * fix: handle undefined ratelimits * Update 3_follow_the_unkey_x_account.md (#2338) * fix: handle case when blogs array is empty * [oss.gg] side quest : added another framework; hono on cloudflare workers. (#2345) * fix: weird spacing in changelog by removing the extra gap (#2340) * fix: weird spacing in changelog * feat: formatted * oss.gg: create a template for ratelimiting a oak server in deno with unkey (#2308) Co-authored-by: Andreas Thomas <dev@chronark.com> * follow unkey on X #2252 (#2315) Co-authored-by: Your Name <you@example.com> * Follow the Unkey X account: @unkeydev Complete! (#2332) * Update 3_follow_the_unkey_x_account.md * Update 3_follow_the_unkey_x_account.md --------- Co-authored-by: Andreas Thomas <dev@chronark.com> * fix(www): analytics bento code snippet is not readable (#2311) - add hover effect to analytics bento removing gradient background - make copy code button sticky to top-right corner - impl independent vertical scrolls for language switcher and code editor * Update 7_create_a_template.md * Update 7_create_a_template.md * chore(deps-dev): bump @content-collections/core from 0.6.2 to 0.7.2 (#2255) Bumps @content-collections/core from 0.6.2 to 0.7.2. --- updated-dependencies: - dependency-name: "@content-collections/core" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: order audit logs by time, show latest on top (#2295) * feat: add template * feat: Unkey FastAPI boilerplate (#2307) * feat: add template * feat: follow unkey on X (#2357) * Update 6_record_onboarding.md (#2301) * fix: reset input fields in API delete dialog after reopening (#2316) * fix: reset input fields in API delete dialog after reopening * refactor: remove unnecessary useEffect and utilize existing onOpenChange function for dialog * refactor: removed unused imports * Update 3_follow_the_unkey_x_account.md (#2364) Added name to the followed list. Co-authored-by: Andreas Thomas <dev@chronark.com> * ci: add label * feat: add hover to input fields * Added gaps and width for md (#2371) * docs: update overview.mdx (#2384) avaliable -> available * oss.gg side quest 3_follow_the_unkey_x_account.md (#2399) Followed the unkey x account * feat: Following unkey acc on twitter #2407 (#2408) * Feat: Followed Unkey on X * Feat: Followed Unkey on Twitter --------- Co-authored-by: Andreas Thomas <dev@chronark.com> * resolve merge conflicts * resolve merge conflicts --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: chronark <dev@chronark.com> Co-authored-by: Emily Marie Ahtúnan <86572370+Emmarie-Ahtunan@users.noreply.github.com> Co-authored-by: Harsh Shrikant Bhat <90265455+harshsbhat@users.noreply.github.com> Co-authored-by: Aritra Sadhukhan <60315087+aritradevelops@users.noreply.github.com> Co-authored-by: Flo <53355483+Flo4604@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Devang Rakholiya <116096508+Devang0907@users.noreply.github.com> Co-authored-by: Prabin <42871240+prabincankod@users.noreply.github.com> Co-authored-by: ZiaCodes <72739794+Khaan25@users.noreply.github.com> Co-authored-by: Devansh Baghel <77718741+Devansh-Baghel@users.noreply.github.com> Co-authored-by: Shreenarayan jaiswal <127131074+shreenarayan123@users.noreply.github.com> Co-authored-by: Your Name <you@example.com> Co-authored-by: Chirag Arora <chirag8023@gmail.com> Co-authored-by: Nazar Poshtarenko <32395926+unrenamed@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Saketh Pavan Goti <44170829+Sakethpavan@users.noreply.github.com> Co-authored-by: Teddy ASSIH <110066080+Ionfinisher@users.noreply.github.com> Co-authored-by: Vardhaman Bhandari <97441447+Vardhaman619@users.noreply.github.com> Co-authored-by: Atharva_404 <72994819+Atharva-3000@users.noreply.github.com> Co-authored-by: Rishi <rishipatel0826@gmail.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: Ayan Mondal <ayanmondal1805@gmail.com> Co-authored-by: Kunal Arya <105645118+kunalarya873@users.noreply.github.com>
Summary by CodeRabbit
New Features
externalId
.PRECONDITION_FAILED
response.Bug Fixes
Documentation