Use errors.is, flatten chain

authzed · Sep 19, 2024 · 05907d8 · 05907d8
1 parent 75a4c78
commit 05907d8
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/internal/storage/config.go b/internal/storage/config.go
@@ -3,6 +3,7 @@ package storage
 import (
 	"encoding/json"
 	"errors"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -119,10 +120,9 @@ var _ ConfigStore = JSONConfigStore{}
 // Get parses a Config from the filesystem.
 func (s JSONConfigStore) Get() (Config, error) {
 	cfgBytes, err := os.ReadFile(filepath.Join(s.ConfigPath, configFileName))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return Config{}, ErrConfigNotFound
-		}
+	if errors.Is(err, fs.ErrNotExist) {
+		return Config{}, ErrConfigNotFound
+	} else if err != nil {
 		return Config{}, err
 	}
 
@@ -149,11 +149,9 @@ func (s JSONConfigStore) Put(cfg Config) error {
 }
 
 func (s JSONConfigStore) Exists() (bool, error) {
-	_, err := os.Stat(filepath.Join(s.ConfigPath, configFileName))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return false, nil
-		}
+	if _, err := os.Stat(filepath.Join(s.ConfigPath, configFileName)); errors.Is(err, fs.ErrNotExist) {
+		return false, nil
+	} else if err != nil {
 		return false, err
 	}
 	return true, nil