storm/skald
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace uses of os.IsExist and os.IsNotExist with errors.Is.

Browse Source 
The former don't properly unwrap errors.
This commit is contained in:
Juliusz Chroboczek
2024-04-14 13:33:52 +02:00
parent 68887f13d5
commit 3409f5a27f
10 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
token/stateful.go
+5 -5
View File
@@ -62,7 +62,7 @@ func getStateful(token string) (*Stateful, error) {
defer tokens.mu.Unlock()
err := tokens.load()
if err != nil {
if os.IsNotExist(err) {
if errors.Is(err, os.ErrNotExist) {
return nil, nil
}
return nil, err
@@ -109,7 +109,7 @@ func (state *state) load() error {
state.modTime = time.Time{}
state.fileSize = 0
state.tokens = nil
if os.IsNotExist(err) {
if errors.Is(err, os.ErrNotExist) {
return nil
}
return err
@@ -125,7 +125,7 @@ func (state *state) load() error {
state.modTime = time.Time{}
state.fileSize = 0
state.tokens = nil
if os.IsNotExist(err) {
if errors.Is(err, os.ErrNotExist) {
return nil
}
return err
@@ -153,7 +153,7 @@ func (state *state) load() error {
state.modTime = time.Time{}
state.fileSize = 0
state.tokens = nil
if os.IsNotExist(err) {
if errors.Is(err, os.ErrNotExist) {
return nil
}
return err
@@ -262,7 +262,7 @@ func (state *state) extend(group, token string, expires time.Time) (*Stateful, e
func (state *state) rewrite() error {
if state.tokens == nil || len(state.tokens) == 0 {
err := os.Remove(state.filename)
if err == nil || os.IsNotExist(err) {
if err == nil || errors.Is(err, os.ErrNotExist) {
return nil
}
return err