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

fix(cosmovisor): fix show-upgrade info command #22010

Merged
merged 1 commit into from
Oct 1, 2024

Conversation

julienrbrt
Copy link
Member

@julienrbrt julienrbrt commented Oct 1, 2024

Description

Fixes this PR: #21932


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

    • Enhanced command to display the current upgrade-info.json file directly in the command line.
  • Bug Fixes

    • Improved error handling for missing upgrade-info.json file with user-friendly messages.

@julienrbrt julienrbrt requested review from facundomedica and a team as code owners October 1, 2024 18:26
Copy link
Contributor

coderabbitai bot commented Oct 1, 2024

📝 Walkthrough

Walkthrough

The changes involve modifications to the NewShowUpgradeInfoCmd function in show_upgrade.go, which enhances the command for displaying the upgrade-info.json file. The command's execution logic has been consolidated into an inline function, improving clarity and efficiency. Additionally, the command's description has been refined, and error handling for file reading has been improved to provide clearer feedback to the user.

Changes

File Path Change Summary
tools/cosmovisor/cmd/cosmovisor/show_upgrade.go Modified NewShowUpgradeInfoCmd to streamline command creation, updated error handling, and improved command output.

Possibly related PRs

  • feat(tools/cosmovisor): Add ShowUpgradeInfoCmd #21932: The changes in this PR directly relate to the NewShowUpgradeInfoCmd function in show_upgrade.go, which is the same function modified in the main PR to streamline command creation for displaying upgrade-info.json.

Suggested labels

C:Cosmovisor

Suggested reviewers

  • tac0turtle
  • facundomedica

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 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 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 bot added the C:Cosmovisor Issues and PR related to Cosmovisor label Oct 1, 2024
Copy link
Contributor

github-actions bot commented Oct 1, 2024

@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: 1

🧹 Outside diff range and nitpick comments (1)
tools/cosmovisor/cmd/cosmovisor/show_upgrade.go (1)

20-27: Suggestion: Consistent error handling

For consistency, consider using the same error handling pattern for the GetConfigFromFile function call as used for reading the upgrade-info.json file. This would involve wrapping the error in a more descriptive message.

Here's a suggested change:

 configPath, err := cmd.Flags().GetString(cosmovisor.FlagCosmovisorConfig)
 if err != nil {
-  return fmt.Errorf("failed to get config flag: %w", err)
+  return fmt.Errorf("failed to get cosmovisor config flag: %w", err)
 }

 cfg, err := cosmovisor.GetConfigFromFile(configPath)
 if err != nil {
-  return err
+  return fmt.Errorf("failed to get config from file: %w", err)
 }
📜 Review details

Configuration used: .coderabbit.yml
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 52d8b2e and 30b8f1d.

📒 Files selected for processing (1)
  • tools/cosmovisor/cmd/cosmovisor/show_upgrade.go (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
tools/cosmovisor/cmd/cosmovisor/show_upgrade.go (1)

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

🔇 Additional comments (2)
tools/cosmovisor/cmd/cosmovisor/show_upgrade.go (2)

15-15: Improved command description

The updated Short description provides a clearer explanation of the command's purpose. It now explicitly mentions that it displays the current upgrade-info.json file from the application data directory, which is more informative for users.


31-36: Enhanced error handling for file reading

The error handling for reading the upgrade-info.json file has been improved. It now distinguishes between a non-existent file and other read errors, providing a more user-friendly message when the file doesn't exist. This enhancement improves the user experience by offering clearer feedback.

data, err := os.ReadFile(cfg.UpgradeInfoFilePath())
if err != nil {
if os.IsNotExist(err) {
cmd.Printf("No upgrade info found at %s\n", cfg.UpgradeInfoFilePath())
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Suggestion: Use a constant for the file name

Consider defining a constant for the upgrade-info.json file name. This would improve maintainability and reduce the risk of typos if the file name is used in multiple places.

Here's a suggested change:

+const upgradeInfoFileName = "upgrade-info.json"

// In the NewShowUpgradeInfoCmd function
-cmd.Printf("No upgrade info found at %s\n", cfg.UpgradeInfoFilePath())
+cmd.Printf("No %s found at %s\n", upgradeInfoFileName, cfg.UpgradeInfoFilePath())

This change would require adding the constant at the package level.

Committable suggestion was skipped due to low confidence.

@julienrbrt julienrbrt added this pull request to the merge queue Oct 1, 2024
Merged via the queue into main with commit a0f9693 Oct 1, 2024
76 of 78 checks passed
@julienrbrt julienrbrt deleted the julien/fix-show-upgrade branch October 1, 2024 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:Cosmovisor Issues and PR related to Cosmovisor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants