Skip to content
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

feat(runtime(v2)): add sanity checks on store upgrades #21748

Merged
merged 5 commits into from
Sep 17, 2024

Conversation

julienrbrt
Copy link
Member

@julienrbrt julienrbrt commented Sep 16, 2024

Description

Closes: #20725


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title, you can find examples of the prefixes below:
  • confirmed ! in the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • updated the relevant documentation or specification, including comments for documenting Go code
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

Summary by CodeRabbit

  • New Features
    • Introduced a new validation process for store upgrades to ensure integrity and prevent errors during the upgrade process.
  • Bug Fixes
    • Enhanced error handling for invalid store upgrade configurations, improving overall robustness.

@julienrbrt julienrbrt added the backport/v0.52.x PR scheduled for inclusion in the v0.52's next stable release label Sep 16, 2024
@julienrbrt julienrbrt requested review from hieuvubk and a team as code owners September 16, 2024 10:19
Copy link
Contributor

coderabbitai bot commented Sep 16, 2024

Walkthrough

Walkthrough

The changes introduce a new function, checkStoreUpgrade, in two files that performs sanity checks on the storeUpgrades parameter used in the UpgradeStoreLoader function. This function verifies that the storeUpgrades is not nil, checks for duplicate keys in the Added and Deleted lists, and ensures that no key appears in both lists. The UpgradeStoreLoader function has been updated to call checkStoreUpgrade at the start, enhancing the validation process before executing the store upgrade logic.

Changes

Files Change Summary
runtime/store.go Added func checkStoreUpgrade(storeUpgrades *store.StoreUpgrades) error for sanity checks.
runtime/store_test.go Added unit tests for checkStoreUpgrade to validate upgrade configurations.
runtime/v2/store.go Added func checkStoreUpgrade(storeUpgrades *store.StoreUpgrades) error for sanity checks.
runtime/v2/store_test.go Added unit tests for checkStoreUpgrade to validate upgrade configurations.

Assessment against linked issues

Objective Addressed Explanation
Add sanity checks for duplication of added keys (20725)
Check existence of renamed old key and deleted key (20725)

Possibly related PRs

Suggested labels

C:server/v2, C:x/upgrade


Recent review details

Configuration used: .coderabbit.yml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between e68a8b7 and 6cf700d.

Files selected for processing (4)
  • runtime/store.go (3 hunks)
  • runtime/store_test.go (1 hunks)
  • runtime/v2/store.go (3 hunks)
  • runtime/v2/store_test.go (1 hunks)
Files skipped from review as they are similar to previous changes (2)
  • runtime/store.go
  • runtime/v2/store.go
Additional context used
Path-based instructions (2)
runtime/store_test.go (2)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.


Pattern **/*_test.go: "Assess the unit test code assessing sufficient code coverage for the changes associated in the pull request"

runtime/v2/store_test.go (2)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.


Pattern **/*_test.go: "Assess the unit test code assessing sufficient code coverage for the changes associated in the pull request"

Additional comments not posted (2)
runtime/store_test.go (1)

11-65: Excellent test coverage for the checkStoreUpgrade function!

The TestCheckStoreUpgrade function provides a comprehensive set of test cases to verify the behavior of the checkStoreUpgrade function. It covers various scenarios, including:

  • Nil StoreUpgrades
  • Valid StoreUpgrades
  • Duplicate keys in the Added list
  • Duplicate keys in the Deleted list
  • Keys present in both Added and Deleted lists

The test function is well-structured, using a slice of anonymous structs to define the test cases and iterating over them using a for loop. It utilizes the testing package effectively and makes use of the require package for assertions.

The test cases provide good coverage and help ensure that the checkStoreUpgrade function handles different scenarios correctly and returns the expected errors for invalid StoreUpgrades.

Overall, this test function is a great addition to the test suite and enhances the reliability of the checkStoreUpgrade function.

runtime/v2/store_test.go (1)

9-71: Excellent test coverage!

The test function TestCheckStoreUpgrade is well-structured and covers important scenarios for the checkStoreUpgrade function. It includes test cases for nil upgrades, valid upgrades, duplicate keys, and keys present in both added and deleted lists. The test cases verify the error conditions and compare the error messages accurately.

The test function follows the standard Go testing conventions and provides comprehensive coverage for the checkStoreUpgrade function.


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?

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 generate interesting stats about this repository and render them as a table.
    -- @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 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.

Copy link
Contributor

@julienrbrt your pull request is missing a changelog!

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: 0

Outside diff range and nitpick comments (1)
runtime/v2/store.go (1)

98-131: Great addition of sanity checks!

The checkStoreUpgrade function performs important sanity checks on the storeUpgrades parameter. The checks for nil storeUpgrades, duplicate keys, and keys present in both Added and Deleted lists are crucial to ensure the validity of the store upgrades.

Consider refactoring the duplicate key checks for Added and Deleted lists into a separate function to reduce code duplication. For example:

func checkDuplicateKeys(keys []string, listName string, storeUpgrades *store.StoreUpgrades) error {
    var exists = make(map[string]bool)
    for _, key := range keys {
        if exists[key] {
            return fmt.Errorf("store upgrade has duplicate key %s in %s", key, listName)
        }
        if listName == "added" && storeUpgrades.IsDeleted(key) {
            return fmt.Errorf("store upgrade has key %s in both added and deleted", key)
        }
        if listName == "deleted" && storeUpgrades.IsAdded(key) {
            return fmt.Errorf("store upgrade has key %s in both added and deleted", key)
        }
        exists[key] = true
    }
    return nil
}

Then, you can call this function for both Added and Deleted lists:

if err := checkDuplicateKeys(storeUpgrades.Added, "added", storeUpgrades); err != nil {
    return err
}
if err := checkDuplicateKeys(storeUpgrades.Deleted, "deleted", storeUpgrades); err != nil {
    return err
}
Review details

Configuration used: .coderabbit.yml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between c0eced8 and e68a8b7.

Files selected for processing (2)
  • runtime/store.go (3 hunks)
  • runtime/v2/store.go (3 hunks)
Additional context used
Path-based instructions (2)
runtime/v2/store.go (1)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.

runtime/store.go (1)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.

Additional comments not posted (3)
runtime/v2/store.go (1)

73-76: LGTM!

The addition of the checkStoreUpgrade function call and the panic on error is a good way to enforce the sanity checks and prevent further execution if the checks fail.

runtime/store.go (2)

189-192: LGTM!

The addition of the checkStoreUpgrade call and the panic on error enhances the robustness of the upgrade process by enforcing the sanity checks before proceeding. This is a good practice to prevent upgrades with invalid configurations.


211-244: Great work on the checkStoreUpgrade function!

The function performs important sanity checks on the storeUpgrades parameter:

  • Checking for nil storeUpgrades is a good defensive programming practice.
  • Checking for duplicate keys in Added and Deleted lists prevents invalid configurations.
  • Checking for keys present in both Added and Deleted lists is crucial to prevent conflicts.

The error messages are clear and informative, making it easy to identify the cause of the failure.

Overall, this function enhances the reliability of the store upgrade process by catching potential issues early.

Copy link
Contributor

@cool-develope cool-develope left a comment

Choose a reason for hiding this comment

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

overall, looks good to me! Could you please add some unit-tests for that feature?

Copy link
Contributor

@hieuvubk hieuvubk left a comment

Choose a reason for hiding this comment

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

LGTM

@hieuvubk
Copy link
Contributor

let fix the lint

@julienrbrt julienrbrt added this pull request to the merge queue Sep 17, 2024
Merged via the queue into main with commit c9f0e2e Sep 17, 2024
72 checks passed
@julienrbrt julienrbrt deleted the julien/sanity-checks branch September 17, 2024 10:57
@julienrbrt
Copy link
Member Author

@Mergifyio backport release/v0.52.x

mergify bot pushed a commit that referenced this pull request Sep 17, 2024
(cherry picked from commit c9f0e2e)

# Conflicts:
#	runtime/v2/store.go
Copy link
Contributor

mergify bot commented Sep 17, 2024

backport release/v0.52.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Sep 17, 2024
(cherry picked from commit c9f0e2e)

# Conflicts:
#	runtime/v2/store.go
julienrbrt added a commit that referenced this pull request Sep 17, 2024
…) (#21778)

Co-authored-by: Julien Robert <julien@rbrt.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/v0.52.x PR scheduled for inclusion in the v0.52's next stable release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sanity checks in StoreUpgrades
4 participants