feat: node.Read accepts a context

go-task · Sep 2, 2023 · 41a716b · 41a716b
1 parent e6dc41c
commit 41a716b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/taskfile/read/node.go b/taskfile/read/node.go
@@ -1,6 +1,7 @@
 package read
 
 import (
+	"context"
 	"strings"
 
 	"github.com/go-task/task/v3/errors"
@@ -10,7 +11,7 @@ import (
 )
 
 type Node interface {
-	Read() ([]byte, error)
+	Read(ctx context.Context) ([]byte, error)
 	Parent() Node
 	Optional() bool
 	Location() string

diff --git a/taskfile/read/node_file.go b/taskfile/read/node_file.go
@@ -1,6 +1,7 @@
 package read
 
 import (
+	"context"
 	"io"
 	"os"
 	"path/filepath"
@@ -39,7 +40,7 @@ func (node *FileNode) Remote() bool {
 	return false
 }
 
-func (node *FileNode) Read() ([]byte, error) {
+func (node *FileNode) Read(ctx context.Context) ([]byte, error) {
 	if node.Dir == "" {
 		d, err := os.Getwd()
 		if err != nil {

diff --git a/taskfile/read/node_http.go b/taskfile/read/node_http.go
@@ -1,6 +1,7 @@
 package read
 
 import (
+	"context"
 	"io"
 	"net/http"
 	"net/url"
@@ -36,8 +37,13 @@ func (node *HTTPNode) Remote() bool {
 	return true
 }
 
-func (node *HTTPNode) Read() ([]byte, error) {
-	resp, err := http.Get(node.URL.String())
+func (node *HTTPNode) Read(ctx context.Context) ([]byte, error) {
+	req, err := http.NewRequest("GET", node.URL.String(), nil)
+	if err != nil {
+		return nil, errors.TaskfileFetchFailedError{URI: node.URL.String()}
+	}
+
+	resp, err := http.DefaultClient.Do(req.WithContext(ctx))
 	if err != nil {
 		return nil, errors.TaskfileFetchFailedError{URI: node.URL.String()}
 	}

diff --git a/taskfile/read/taskfile.go b/taskfile/read/taskfile.go
@@ -1,6 +1,7 @@
 package read
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -68,7 +69,7 @@ func readTaskfile(
 
 	// If we still don't have a copy, get the file in the usual way
 	if b == nil {
-		b, err = node.Read()
+		b, err = node.Read(context.Background())
 		if err != nil {
 			return nil, err
 		}
@@ -258,7 +259,7 @@ func Taskfile(
 						Entrypoint: path,
 						Dir:        node.Dir,
 					}
-					b, err := osNode.Read()
+					b, err := osNode.Read(context.Background())
 					if err != nil {
 						return nil, err
 					}