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.

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

refactor: check if the remote exists just before reading it #1713

Merged
merged 4 commits into from
Sep 7, 2024
+21 −12
Merged

refactor: check if the remote exists just before reading it #1713

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d48b5d
refactor: check if the remote exists in the read to avoid doing it in…
vmaerten Jul 7, 2024
3074a9f
fix: timeout error was not working
vmaerten Jul 7, 2024
db2654e
fix: use cached copy if available
vmaerten Jul 7, 2024
ccadcad
Merge branch 'main' into refactor/remote-check-remote-later
vmaerten Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions taskfile/node_http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import (
// An HTTPNode is a node that reads a Taskfile from a remote location via HTTP.
type HTTPNode struct {
*BaseNode
URL *url.URL
URL *url.URL
logger *logger.Logger
timeout time.Duration
}

func NewHTTPNode(
Expand All @@ -36,18 +38,12 @@ func NewHTTPNode(
if url.Scheme == "http" && !insecure {
return nil, &errors.TaskfileNotSecureError{URI: entrypoint}
}
ctx, cf := context.WithTimeout(context.Background(), timeout)
defer cf()
url, err = RemoteExists(ctx, l, url)
if err != nil {
return nil, err
}
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
return nil, &errors.TaskfileNetworkTimeoutError{URI: url.String(), Timeout: timeout}
}

return &HTTPNode{
BaseNode: base,
URL: url,
timeout: timeout,
logger: l,
}, nil
}

Expand All @@ -60,6 +56,14 @@ func (node *HTTPNode) Remote() bool {
}

func (node *HTTPNode) Read(ctx context.Context) ([]byte, error) {
url, err := RemoteExists(ctx, node.logger, node.URL)
if err != nil {
return nil, err
}
node.URL = url
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
Copy link

Choose a reason for hiding this comment

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

Shouldn't this one be before the previous if?

I mean you should be testing this no ?

Suggested change
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
if errors.Is(err, context.DeadlineExceeded) {

Said otherwise, is there any case where RemoteExist will not return an error when the context is expired?

Copy link
Member Author

Choose a reason for hiding this comment

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

You're right, it should be the previous if but it's a bit more complexe to fix than apply your commit
After checking, the Timeout error does not work on main.
Thanks for reporting this

return nil, &errors.TaskfileNetworkTimeoutError{URI: url.String(), Timeout: node.timeout}
}
req, err := http.NewRequest("GET", node.URL.String(), nil)
if err != nil {
return nil, errors.TaskfileFetchFailedError{URI: node.URL.String()}
Expand Down
Loading