8000 Fix: how we update rules on active deployment by Meldiron · Pull Request #9902 · appwrite/appwrite · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix: how we update rules on active deployment #9902

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
May 26, 2025
Merged

Fix: how we update rules on active deployment #9902

merged 2 commits into from
May 26, 2025
+4 −32

Conversation

Meldiron
Copy link
Contributor
@Meldiron Meldiron commented May 26, 2025 •
edited by coderabbitai bot
Loading

What does this PR do?

(Provide a description of what this PR does and why it's needed.)

Test Plan

(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Screenshots may also be helpful.)

Related PRs and Issues

  • (Related PR or issue)

Checklist

  • Have you read the Contributing Guidelines on issues?
  • If the PR includes a change to an API's metadata (desc, label, params, etc.), does it also include updated API specs and example docs?

Summary by CodeRabbit

  • Refactor
    • Removed conditional logic related to previous deployment internal IDs across deployment update and site deployment processes.
    • Simplified query construction to always include a branch-related filter, standardizing rule management.
    • Enhanced consistency in handling branch-specific deployment rules for functions and sites.

@coderabbitai coderabbitai
Copy link
coderabbitai bot commented May 26, 2025 •
edited
Loading

Walkthrough

The changes remove conditional logic based on the previous deployment internal ID from deployment update and build processes for functions and sites. Query construction is simplified by always including a filter for an empty deploymentVcsProviderBranch, standardizing rule management and eliminating branching based on legacy deployment identifiers.

Changes

File(s) Change Summary
src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php Removed retrieval and conditional logic for $oldDeploymentInternalId; queries now always filter by empty deploymentVcsProviderBranch.
src/Appwrite/Platform/Modules/Functions/Workers/Builds.php Standardized rule queries to always include deploymentVcsProviderBranch; removed conditional logic for deployment IDs; updated branch rule creation.
src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php Removed use of $oldDeploymentInternalId; queries now unconditionally filter by empty deploymentVcsProviderBranch.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant UpdateHandler
    participant RuleManager

    Client->>UpdateHandler: Request deployment update
    UpdateHandler->>RuleManager: List rules with Query::equal("deploymentVcsProviderBranch", [""])
    RuleManager-->>UpdateHandler: Return matching rules
    UpdateHandler-->>Client: Respond with update result
Loading

Possibly related PRs

Suggested reviewers

  • christyjacob4
  • TorstenDittmann

Poem

Hopping through code with a tidy mind,
Old IDs and branches left behind.
Queries now simple, no more fuss,
Every deployment runs smoother for us.
With a twitch of my nose and a hop so spry,
I celebrate code that’s neat—oh my!
🐇✨

📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between f6dd9b0 and 51f6751.

📒 Files selected for processing (1)
  • src/Appwrite/Platform/Modules/Functions/Workers/Builds.php (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (20)
  • GitHub Check: E2E Service Test (VCS)
  • GitHub Check: E2E Service Test (Users)
  • GitHub Check: E2E Service Test (Webhooks)
  • GitHub Check: E2E Service Test (Teams)
  • GitHub Check: E2E Service Test (Proxy)
  • GitHub Check: E2E Service Test (Realtime)
  • GitHub Check: E2E Service Test (Projects)
  • GitHub Check: E2E Service Test (Health)
  • GitHub Check: E2E Service Test (GraphQL)
  • GitHub Check: E2E Service Test (Functions)
  • GitHub Check: E2E Service Test (Databases)
  • GitHub Check: E2E Service Test (Console)
  • GitHub Check: Unit Test
  • GitHub Check: E2E Service Test (FunctionsSchedule)
  • GitHub Check: E2E Service Test (Account)
  • GitHub Check: E2E Service Test (Avatars)
  • GitHub Check: E2E Service Test (Dev Keys)
  • GitHub Check: E2E General Test
  • GitHub Check: Benchmark
  • GitHub Check: scan
🔇 Additional comments (2)
src/Appwrite/Platform/Modules/Functions/Workers/Builds.php (2)

1089-1089: LGTM! Proper rule filtering for VCS branch deployments.

This addition correctly filters for rules with empty deploymentVcsProviderBranch, ensuring that only main deployment rules are updated during function activation. This prevents unintended updates to branch-specific deployment rules and maintains proper separation between different deployment types.

1114-1114: LGTM! Consistent rule filtering implementation.

This mirrors the same improvement made for functions at line 1089, ensuring consistent rule management across both resource types. The filtering for empty deploymentVcsProviderBranch properly isolates main deployment rules from branch-specific ones during sites activation.

✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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.

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 GitHub Actions
Copy link
8000
github-actions bot commented May 26, 2025 •
edited
Loading

Security Scan Results for PR

Docker Image Scan Results

Package Version Vulnerability Severity
binutils 2.42-r0 CVE-2025-0840 HIGH
libexpat 2.6.4-r0 CVE-2024-8176 HIGH
libxml2 2.12.7-r0 CVE-2024-56171 HIGH
libxml2 2.12.7-r0 CVE-2025-24928 HIGH
libxml2 2.12.7-r0 CVE-2025-27113 HIGH
libxml2 2.12.7-r0 CVE-2025-32414 HIGH
libxml2 2.12.7-r0 CVE-2025-32415 HIGH
sqlite-libs 3.45.3-r1 CVE-2025-29087 HIGH
xz 5.6.2-r0 CVE-2025-31115 HIGH
xz-libs 5.6.2-r0 CVE-2025-31115 HIGH
golang.org/x/crypto v0.31.0 CVE-2025-22869 HIGH

Source Code Scan Results

🎉 No vulnerabilities found!

Meldiron
Meldiron commented May 26, 2025
View reviewed changes
christyjacob4
christyjacob4 reviewed May 26, 2025
View reviewed changes
@github-actions GitHub Actions
Copy link
github-actions bot commented May 26, 2025 •
edited
Loading

✨ Benchmark results

  • Requests per second: 942
  • Requests with 200 status code: 169,655
  • P99 latency: 0.199539428

⚡ Benchmark Comparison

Metric This PR Latest version
RPS 942 1,141
200 169,655 205,447
P99 0.199539428 0.163859883

@Meldiron Meldiron merged commit 08370c1 into 1.7.x May 26, 2025
65 of 66 checks passed
@coderabbitai coderabbitai bot mentioned this pull request May 29, 2025
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vermakhushboo vermakhushboo vermakhushboo left review comments

@christyjacob4 christyjacob4 christyjacob4 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3B69
Development

Successfully merging this pull request may close these issues.
3 participants
@Meldiron @christyjacob4 @vermakhushboo
0