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

client: fix SetProxyURL functionality #3109

Merged
merged 3 commits into from
Aug 29, 2024
Merged

client: fix SetProxyURL functionality #3109

merged 3 commits into from
Aug 29, 2024

Conversation

efectn
Copy link
Member

@efectn efectn commented Aug 23, 2024

Description

Fixes #3085

Changes introduced

  • Benchmarks: Describe any performance benchmarks and improvements related to the changes.
  • Documentation Update: Detail the updates made to the documentation and links to the changed files.
  • Changelog/What's New: Include a summary of the additions for the upcoming release notes.
  • Migration Guide: If necessary, provide a guide or steps for users to migrate their existing code to accommodate these changes.
  • API Alignment with Express: Explain how the changes align with the Express API.
  • API Longevity: Discuss the steps taken to ensure that the new or updated APIs are consistent and not prone to breaking changes.
  • Examples: Provide examples demonstrating the new features or changes in action.

Type of change

  • Enhancement (improvement to existing features and functionality)

Checklist

Before you submit your pull request, please make sure you meet these requirements:

  • Followed the inspiration of the Express.js framework for new functionalities, making them similar in usage.
  • Conducted a self-review of the code and provided comments for complex or critical parts.
  • Updated the documentation in the /docs/ directory for Fiber's documentation.
  • Added or updated unit tests to validate the effectiveness of the changes or new features.
  • Ensured that new and existing unit tests pass locally with the changes.
  • Verified that any new dependencies are essential and have been agreed upon by the maintainers/community.
  • Aimed for optimal performance with minimal allocations in the new code.
  • Provided benchmarks for the new code to analyze and improve upon.

Commit formatting

Please use emojis in commit messages for an easy way to identify the purpose or intention of a commit. Check out the emoji cheatsheet here: CONTRIBUTING.md

@efectn efectn requested a review from a team as a code owner August 23, 2024 16:52
@efectn efectn requested review from gaby, sixcolors and ReneWerner87 and removed request for a team August 23, 2024 16:52
Copy link
Contributor

coderabbitai bot commented Aug 23, 2024

Walkthrough

The changes involve a substantial refactoring of the Client struct and its methods, particularly in how proxy configurations are implemented. The proxyURL field was removed, and the SetProxyURL method now utilizes the fasthttpproxy package for enhanced proxy handling. Additionally, the testing framework has been updated to reflect these changes, ensuring proper validation of proxy functionality during requests.

Changes

Files Change Summary
client/client.go Removed proxyURL field from Client struct; updated SetProxyURL method to utilize fasthttpproxy for setting the proxy.
client/client_test.go Modified Test_Client_SetProxyURL to implement a new proxy server using fasthttp; updated tests to verify correct proxy behavior and response handling.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant Proxy
    participant Server

    Client->>Proxy: SetProxyURL(proxyURL)
    Proxy-->>Client: Proxy set successfully
    Client->>Proxy: Send request
    Proxy->>Server: Forward request
    Server-->>Proxy: Return response
    Proxy-->>Client: Return response
Loading

Assessment against linked issues

Objective Addressed Explanation
Set proxy should be used when making requests (#3085)
Proxy configuration should be properly validated No validation logic for proxy URL errors present.

🐇 In the meadow where fibers play,
A proxy hops, brightening the day.
With SetProxyURL, swift and spry,
Now requests soar, like clouds in the sky!
Hooray for the changes, let’s leap and cheer,
For efficient proxies, our vision is clear! 🌼


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>.
    • 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 show all the console.log statements in this repository.
    • @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.

Copy link

codecov bot commented Aug 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.82%. Comparing base (25e3992) to head (841a100).
Report is 6 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3109      +/-   ##
==========================================
+ Coverage   80.77%   80.82%   +0.04%     
==========================================
  Files         116      116              
  Lines        8850     8846       -4     
==========================================
+ Hits         7149     7150       +1     
+ Misses       1302     1299       -3     
+ Partials      399      397       -2     
Flag Coverage Δ
unittests 80.82% <100.00%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

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 260c5e5 and b141ef7.

Files ignored due to path filters (2)
  • go.mod is excluded by !**/*.mod
  • go.sum is excluded by !**/*.sum, !**/*.sum
Files selected for processing (2)
  • client/client.go (5 hunks)
  • client/client_test.go (3 hunks)
Additional context used
golangci-lint
client/client_test.go

1581-1581: go-require: require must only be used in the goroutine running the test function

(testifylint)

GitHub Check: lint
client/client_test.go

[failure] 1581-1581:
go-require: require must only be used in the goroutine running the test function (testifylint)

Additional comments not posted (2)
client/client.go (1)

227-229: Efficient proxy handling with fasthttpproxy.FasthttpHTTPDialer.

The update to use fasthttpproxy.FasthttpHTTPDialer in the SetProxyURL method simplifies proxy configuration and enhances efficiency by leveraging the external library's capabilities.

client/client_test.go (1)

Line range hint 1543-1614: Effective proxy functionality testing.

The test case now correctly verifies the proxy functionality by using a proxy server and checking the response for the "isProxy" header.

Tools
golangci-lint

1581-1581: go-require: require must only be used in the goroutine running the test function

(testifylint)

GitHub Check: lint

[failure] 1581-1581:
go-require: require must only be used in the goroutine running the test function (testifylint)

@ReneWerner87 ReneWerner87 added this to the v3 milestone Aug 26, 2024
@ReneWerner87
Copy link
Member

Code looks good. @efectn can you fix the lint error

@ReneWerner87
Copy link
Member

Nvm i will do it, its just one word change

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 b141ef7 and e6762be.

Files selected for processing (1)
  • client/client_test.go (3 hunks)

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

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between e6762be and 37d5b47.

Files selected for processing (1)
  • client/client.go (5 hunks)
Files skipped from review as they are similar to previous changes (1)
  • client/client.go

@ReneWerner87
Copy link
Member

@efectn something seems to be not thread safe
image

}

// Create a simple proxy sever
proxyServer := fiber.New()
Copy link
Member

Choose a reason for hiding this comment

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

This is probably creating a server in a port already used

Copy link
Member

Choose a reason for hiding this comment

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

Could we use a InmemoryListener for tests?

Copy link
Member

Choose a reason for hiding this comment

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

@efectn can you check this

Copy link
Member Author

Choose a reason for hiding this comment

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

Could we use a InmemoryListener for tests?

i dont't think we can, since FasthttpHTTPDialer only accepts a valid proxy url at ip:port format

However, i'll randomize de port instead of using fixed port

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, codebase verification and nitpick comments (1)
client/client_test.go (1)

Line range hint 1543-1618: Improve robustness and reliability of the test case.

The updated test case correctly verifies the proxy functionality by checking the "isProxy" header. However, consider the following improvements:

  • Use dynamic port allocation for the proxy server to avoid potential conflicts.
  • Ensure proper cleanup and shutdown of the proxy server to prevent resource leaks.

Apply this diff to use dynamic port allocation and ensure proper cleanup:

- go func() {
- 	assert.NoError(t, proxyServer.Listen(":0", fiber.ListenConfig{
- 		DisableStartupMessage: true,
- 		ListenerAddrFunc: func(addr net.Addr) {
- 			addrChan <- addr.String()
- 		},
- 	}))
- }()
+ listener, err := net.Listen("tcp", "127.0.0.1:0") // Dynamic port allocation
+ require.NoError(t, err)
+ defer listener.Close()
+ go func() {
+ 	assert.NoError(t, proxyServer.Listener(listener, fiber.ListenConfig{
+ 		DisableStartupMessage: true,
+ 	}))
+ }()
+ addrChan <- listener.Addr().String()
Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 37d5b47 and 841a100.

Files selected for processing (2)
  • client/client.go (5 hunks)
  • client/client_test.go (3 hunks)
Additional comments not posted (3)
client/client.go (2)

21-21: LGTM!

The import statement for fasthttpproxy is correct and necessary for the updated SetProxyURL method.


225-227: LGTM!

The SetProxyURL method correctly uses fasthttpproxy.FasthttpHTTPDialer to set the proxy URL, enhancing the efficiency of proxy handling.

client/client_test.go (1)

22-22: LGTM!

The import statement for fasthttp is correct and necessary for the updated test case.

@ReneWerner87 ReneWerner87 merged commit 4b1ee0b into main Aug 29, 2024
15 of 16 checks passed
@efectn efectn deleted the v3-client-proxy branch September 1, 2024 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

🐛 [Bug]: v3 Client ignores proxy settings
4 participants