WIP

pkg/cache/cache.go

@@ -1,6 +1,6 @@
 package cache
 
 type Cache interface {
-	Get(key string) (interface{}, error)
-	Set(key string, schema interface{}) error
+	Get(key string) ([]byte, error)
+	Set(key string, schema []byte) error
 }

pkg/cache/inmemory.go

@@ -10,18 +10,18 @@ import (
 //   - This cache caches the parsed Schemas
 type inMemory struct {
 	sync.RWMutex
-	schemas map[string]interface{}
+	schemas map[string][]byte
 }
 
 // New creates a new cache for downloaded schemas
 func NewInMemoryCache() Cache {
 	return &inMemory{
-		schemas: map[string]interface{}{},
+		schemas: make(map[string][]byte),
 	}
 }
 
 // Get retrieves the JSON schema given a resource signature
-func (c *inMemory) Get(key string) (interface{}, error) {
+func (c *inMemory) Get(key string) ([]byte, error) {
 	c.RLock()
 	defer c.RUnlock()
 	schema, ok := c.schemas[key]
@@ -34,7 +34,7 @@ func (c *inMemory) Get(key string) (interface{}, error) {
 }
 
 // Set adds a JSON schema to the schema cache
-func (c *inMemory) Set(key string, schema interface{}) error {
+func (c *inMemory) Set(key string, schema []byte) error {
 	c.Lock()
 	defer c.Unlock()
 	c.schemas[key] = schema

pkg/cache/ondisk.go

@@ -27,7 +27,7 @@ func cachePath(folder, key string) string {
 }
 
 // Get retrieves the JSON schema given a resource signature
-func (c *onDisk) Get(key string) (interface{}, error) {
+func (c *onDisk) Get(key string) ([]byte, error) {
 	c.RLock()
 	defer c.RUnlock()
 
@@ -41,8 +41,12 @@ func (c *onDisk) Get(key string) (interface{}, error) {
 }
 
 // Set adds a JSON schema to the schema cache
-func (c *onDisk) Set(key string, schema interface{}) error {
+func (c *onDisk) Set(key string, schema []byte) error {
 	c.Lock()
 	defer c.Unlock()
-	return os.WriteFile(cachePath(c.folder, key), schema.([]byte), 0644)
+
+	if _, err := os.Stat(cachePath(c.folder, key)); os.IsNotExist(err) {
+		return os.WriteFile(cachePath(c.folder, key), schema, 0644)
+	}
+	return nil
 }

pkg/loader/file.go

@@ -1,9 +1,12 @@
 package loader
 
 import (
+	"bytes"
+	"errors"
 	"fmt"
 	"github.com/santhosh-tekuri/jsonschema/v6"
 	"github.com/yannh/kubeconform/pkg/cache"
+	"io"
 	gourl "net/url"
 	"os"
 	"path/filepath"
@@ -23,28 +26,32 @@ func (l FileLoader) Load(url string) (any, error) {
 	}
 	if l.cache != nil {
 		if cached, err := l.cache.Get(path); err == nil {
-			return cached, nil
+			return jsonschema.UnmarshalJSON(bytes.NewReader(cached))
 		}
 	}
 
 	f, err := os.Open(path)
 	if err != nil {
+		if os.IsNotExist(err) {
+			msg := fmt.Sprintf("could not open file %s", path)
+			return nil, NewNotFoundError(errors.New(msg))
+		}
 		return nil, err
 	}
 	defer f.Close()
 
-	s, err := jsonschema.UnmarshalJSON(f)
+	content, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}
 
 	if l.cache != nil {
-		if err = l.cache.Set(path, s); err != nil {
+		if err = l.cache.Set(path, content); err != nil {
 			return nil, fmt.Errorf("failed to write cache to disk: %s", err)
 		}
 	}
 
-	return s, nil
+	return jsonschema.UnmarshalJSON(bytes.NewReader(content))
 }
 
 // ToFile is helper method to convert file url to file path.
@@ -54,7 +61,7 @@ func (l FileLoader) ToFile(url string) (string, error) {
 		return "", err
 	}
 	if u.Scheme != "file" {
-		return "", fmt.Errorf("invalid file url: %s", u)
+		return url, nil
 	}
 	path := u.Path
 	if runtime.GOOS == "windows" {

pkg/loader/http.go

@@ -21,7 +21,7 @@ type HTTPURLLoader struct {
 func (l *HTTPURLLoader) Load(url string) (any, error) {
 	if l.cache != nil {
 		if cached, err := l.cache.Get(url); err == nil {
-			return cached, nil
+			return jsonschema.UnmarshalJSON(bytes.NewReader(cached))
 		}
 	}
 
@@ -47,17 +47,18 @@ func (l *HTTPURLLoader) Load(url string) (any, error) {
 		msg := fmt.Sprintf("failed parsing schema from %s: %s", url, err)
 		return nil, errors.New(msg)
 	}
+
+	if l.cache != nil {
+		if err = l.cache.Set(url, body); err != nil {
+			return nil, fmt.Errorf("failed to write cache to disk: %s", err)
+		}
+	}
+
 	s, err := jsonschema.UnmarshalJSON(bytes.NewReader(body))
 	if err != nil {
 		return nil, err
 	}
 
-	if l.cache != nil {
-		if err = l.cache.Set(url, s); err != nil {
-			return nil, fmt.Errorf("failed to write cache to disk: %s", err)
-		}
-	}
-
 	return s, nil
 }