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

chore: add a check for Instance state when cloning #570

Merged

Conversation

mojtaba-esk
Copy link
Member

@mojtaba-esk mojtaba-esk commented Oct 8, 2024

Closes #531

Summary by CodeRabbit

  • New Features

    • Introduced a new error message for cloning instances that are not in an appropriate state.
    • Added validation to ensure instances can only be cloned if they are in the StateCommitted or StateStopped states.
  • Documentation

    • Enhanced comments in the cloning method to clarify cloning behavior, especially concerning state requirements.
  • Tests

    • Improved test cases for the Tshark struct by adding a logger and ensuring proper configuration of the test instance before cloning.

Copy link
Contributor

coderabbitai bot commented Oct 8, 2024

Walkthrough

The changes introduce a new error variable ErrCannotCloneInstance in the pkg/instance/errors.go file to improve error handling when cloning instances. Additionally, the CloneWithName method in pkg/instance/instance.go is updated to enforce state checks, allowing cloning only if the instance is in StateCommitted or StateStopped. This modification enhances the control flow regarding instance cloning and provides clearer documentation about the cloning behavior, particularly concerning sidecars.

Changes

File Path Change Summary
pkg/instance/errors.go Added new error variable ErrCannotCloneInstance with a specific message.
pkg/instance/instance.go Updated CloneWithName method to include state validation for cloning. Added a comment clarifying cloning behavior for sidecars.
pkg/sidecars/tshark/tshark_test.go Enhanced TestTsharkClone with logger initialization and proper configuration of testInstance.

Assessment against linked issues

Objective Addressed Explanation
Check for instance state in CloneWithSuffix (#531) The changes do not address the CloneWithSuffix method.

Poem

In the fields where instances play,
A rabbit hops, brightening the day.
With states to check and errors to share,
Cloning now has a thoughtful care.
"Cannot clone!" it softly sings,
As it guards the joy that cloning brings! 🐇✨


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.

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.

@mojtaba-esk mojtaba-esk requested a review from a team October 8, 2024 06:03
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

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 339f749 and a511357.

📒 Files selected for processing (2)
  • pkg/instance/errors.go (1 hunks)
  • pkg/instance/instance.go (1 hunks)
🧰 Additional context used
🔇 Additional comments (1)
pkg/instance/errors.go (1)

223-223: New error definition aligns with PR objectives.

The addition of ErrCannotCloneInstance is consistent with the PR objectives to implement a check for the Instance state during the cloning process. This new error will allow for more specific error handling when attempting to clone an instance that is in an inappropriate state.

The error message format follows the existing pattern in the file, including both the instance name and its current state. This addition enhances the error handling capabilities of the package, providing more detailed feedback for debugging and user information.

To ensure this new error is properly utilized, let's check for its usage in the codebase:

✅ Verification successful

To verify the correct usage of ErrCannotCloneInstance, let's inspect how it's implemented in pkg/instance/instance.go:


Verified: ErrCannotCloneInstance is correctly implemented and used.

The new error ErrCannotCloneInstance is properly defined in pkg/instance/errors.go and is utilized appropriately in pkg/instance/instance.go. It follows the existing error definition pattern and aligns with the PR objectives, providing specific error handling for cloning instances in inappropriate states.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for usage of the new error in the codebase
rg "ErrCannotCloneInstance" --type go

Length of output: 276


Script:

#!/bin/bash
# Retrieve the context around the usage of ErrCannotCloneInstance in instance.go
rg "ErrCannotCloneInstance" pkg/instance/instance.go -A 5 -B 5

Length of output: 548

pkg/instance/instance.go Show resolved Hide resolved
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 (2)
pkg/sidecars/tshark/tshark_test.go (2)

172-175: LGTM! Consider using a constant for the instance name.

The addition of a logger to the SystemDependencies is a good practice for better debugging and tracing.

Consider using a constant for the instance name "testInstance" to improve maintainability:

+const testInstanceName = "testInstance"

-testInstance, err := instance.New("testInstance",
+testInstance, err := instance.New(testInstanceName,

178-179: LGTM! Consider using a constant for the image name.

Setting the image for the test instance is necessary for proper configuration.

Consider using a constant for the image name "testImage" to improve maintainability:

+const testImageName = "testImage"

-err = testInstance.Build().SetImage(context.Background(), "testImage")
+err = testInstance.Build().SetImage(context.Background(), testImageName)
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between bb1056c and ad68f5b.

📒 Files selected for processing (1)
  • pkg/sidecars/tshark/tshark_test.go (2 hunks)
🧰 Additional context used
🔇 Additional comments (2)
pkg/sidecars/tshark/tshark_test.go (2)

172-181: Summary: Test improvements align with PR objectives

The changes to TestTsharkClone enhance the test setup by ensuring the test instance is properly configured and committed before cloning. This aligns well with the PR objective of adding a check for Instance state when cloning.

Key improvements:

  1. Added a logger to SystemDependencies for better tracing.
  2. Set the image for the test instance.
  3. Committed the instance before cloning.

These changes provide a more robust test environment and should help catch any issues related to instance state during cloning.


180-181: Excellent addition! This addresses the PR objective.

Committing the instance before cloning is crucial. This change ensures that the instance is in a committed state, which directly addresses the PR objective of checking the Instance state when cloning.

To further verify the impact of this change, let's check if the CloneWithSuffix method in the instance package now includes a state check:

✅ Verification successful

Verified: CloneWithSuffix includes the necessary state check.

This ensures that the instance is in a committed or stopped state before cloning, fully addressing the PR objective of verifying the instance state during the cloning process.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify if CloneWithSuffix includes a state check

# Test: Search for CloneWithSuffix implementation
rg --type go -A 10 'func \(i \*Instance\) CloneWithSuffix'

Length of output: 936

@mojtaba-esk mojtaba-esk enabled auto-merge (squash) October 8, 2024 08:35
@tty47
Copy link
Contributor

tty47 commented Oct 8, 2024

hello!
I found the CI broken, is it expected?

    build_image_test.go:35: 
        	Error Trace:	/home/runner/work/knuu/knuu/e2e/system/build_image_test.go:35
        	Error:      	Received unexpected error:
        	            	build failed
        	Test:       	TestRunSuite/TestOneVolumeTwoFiles
        	Messages:   	Error setting git repo
--- FAIL: TestRunSuite (134.40s)
    --- PASS: TestRunSuite/TestStartWithCallback (1.70s)
    --- FAIL: TestRunSuite/TestBuildFromGit (9.38s)
panic: test executed panic(nil) or runtime.Goexit

@mojtaba-esk
Copy link
Member Author

hello! I found the CI broken, is it expected?
...

No it is not expected. something might be wrong.

@mojtaba-esk
Copy link
Member Author

When I run the failing test TestRunSuite/TestBuildFromGit locally it passes:

=== RUN   TestRunSuite
time="2024-10-08T15:46:06+03:30" level=info msg="Current log level" file="log/logger.go:41" env_log_level=LOG_LEVEL log_level=info
    suite_setup_test.go:53: Scope: 20241008-154533-860
=== RUN   TestRunSuite/TestBuildFromGit
=== PAUSE TestRunSuite/TestBuildFromGit
=== RUN   TestRunSuite/TestBuildFromGitWithModifications
=== PAUSE TestRunSuite/TestBuildFromGitWithModifications
=== CONT  TestRunSuite/TestBuildFromGit
=== CONT  TestRunSuite/TestBuildFromGitWithModifications
    build_image_test.go:22: Creating new instance
    build_image_test.go:64: Creating new instance
    build_image_test.go:68: Setting git repo
    build_image_test.go:26: Building the image
    build_image_test.go:36: Image built
    build_image_test.go:40: Starting instance
    build_image_test.go:43: Instance started
    build_image_test.go:45: Getting file bytes
=== NAME  TestRunSuite
    suite.go:59: Cleaning up knuu...
    suite.go:63: Knuu is cleaned up
--- PASS: TestRunSuite (54.40s)
    --- PASS: TestRunSuite/TestBuildFromGit (24.49s)
    --- PASS: TestRunSuite/TestBuildFromGitWithModifications (43.83s)
PASS
ok  	github.com/celestiaorg/knuu/e2e/system	98.264s

@mojtaba-esk mojtaba-esk merged commit f86e86c into main Oct 14, 2024
12 checks passed
@mojtaba-esk mojtaba-esk deleted the mojtaba/531-CloneWithSuffix-check-for-Instance-state branch October 14, 2024 12:28
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.

feat: CloneWithSuffix does not check for Instance state
3 participants