go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-09-16 09:26:16 +02:00
Code Issues Releases Activity

refactor: consistent naming for errors

Browse Source
This commit is contained in:
Pete Davison
2024-01-11 22:30:52 +00:00
committed by Andrey Nering
parent e2b85c6aa1
commit 26e79121f9
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
errors/errors_taskfile.go
View File

@@ -107,20 +107,20 @@ func (err *TaskfileNotSecureError) Code() int {
return CodeTaskfileNotSecure
}
// TaskfileCacheNotFound is returned when the user attempts to use an offline
// TaskfileCacheNotFoundError is returned when the user attempts to use an offline
// (cached) Taskfile but the files does not exist in the cache.
type TaskfileCacheNotFound struct {
type TaskfileCacheNotFoundError struct {
URI string
}
func (err *TaskfileCacheNotFound) Error() string {
func (err *TaskfileCacheNotFoundError) Error() string {
return fmt.Sprintf(
`task: Taskfile %q was not found in the cache. Remove the --offline flag to use a remote copy or download it using the --download flag`,
err.URI,
)
}
func (err *TaskfileCacheNotFound) Code() int {
func (err *TaskfileCacheNotFoundError) Code() int {
return CodeTaskfileCacheNotFound
}
@@ -152,15 +152,15 @@ func (err *TaskfileVersionCheckError) Code() int {
return CodeTaskfileVersionCheckError
}
// TaskfileNetworkTimeout is returned when the user attempts to use a remote
// TaskfileNetworkTimeoutError is returned when the user attempts to use a remote
// Taskfile but a network connection could not be established within the timeout.
type TaskfileNetworkTimeout struct {
type TaskfileNetworkTimeoutError struct {
URI string
Timeout time.Duration
CheckedCache bool
}
func (err *TaskfileNetworkTimeout) Error() string {
func (err *TaskfileNetworkTimeoutError) Error() string {
var cacheText string
if err.CheckedCache {
cacheText = " and no offline copy was found in the cache"
@@ -171,6 +171,6 @@ func (err *TaskfileNetworkTimeout) Error() string {
)
}
func (err *TaskfileNetworkTimeout) Code() int {
func (err *TaskfileNetworkTimeoutError) Code() int {
return CodeTaskfileNetworkTimeout
}

6
taskfile/reader.go
View File

@@ -189,7 +189,7 @@ func readTaskfile(
// If the file is remote and we're in offline mode, check if we have a cached copy
if node.Remote() && offline {
if b, err = cache.read(node); errors.Is(err, os.ErrNotExist) {
return nil, &errors.TaskfileCacheNotFound{URI: node.Location()}
return nil, &errors.TaskfileCacheNotFoundError{URI: node.Location()}
} else if err != nil {
return nil, err
}
@@ -207,11 +207,11 @@ func readTaskfile(
if node.Remote() && errors.Is(ctx.Err(), context.DeadlineExceeded) {
// If a download was requested, then we can't use a cached copy
if download {
return nil, &errors.TaskfileNetworkTimeout{URI: node.Location(), Timeout: timeout}
return nil, &errors.TaskfileNetworkTimeoutError{URI: node.Location(), Timeout: timeout}
}
// Search for any cached copies
if b, err = cache.read(node); errors.Is(err, os.ErrNotExist) {
return nil, &errors.TaskfileNetworkTimeout{URI: node.Location(), Timeout: timeout, CheckedCache: true}
return nil, &errors.TaskfileNetworkTimeoutError{URI: node.Location(), Timeout: timeout, CheckedCache: true}
} else if err != nil {
return nil, err
}