Use image-analyzer library (#196)

* Use image-analyzer library

blobscache/client.go

@@ -3,24 +3,15 @@ package blobscache
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"net/http"
 	"time"
 
+	ia "github.com/castai/image-analyzer"
 	json "github.com/json-iterator/go"
 )
 
-var (
-	ErrCacheNotFound = errors.New("blob not found in cache")
-)
-
-type Client interface {
-	PutBlob(ctx context.Context, key string, blob []byte) error
-	GetBlob(ctx context.Context, key string) ([]byte, error)
-}
-
-func NewRemoteBlobsCacheClient(serverURL string) Client {
+func NewRemoteBlobsCacheClient(serverURL string) ia.CacheClient {
 	return &remoteBlobsCache{
 		url: serverURL,
 		client: &http.Client{
@@ -75,7 +66,7 @@ func (c *remoteBlobsCache) GetBlob(ctx context.Context, key string) ([]byte, err
 	defer resp.Body.Close()
 	if st := resp.StatusCode; st != http.StatusOK {
 		if st == http.StatusNotFound {
-			return nil, ErrCacheNotFound
+			return nil, ia.ErrCacheNotFound
 		}
 		return nil, fmt.Errorf("put blob failed, response status=%d", st)
 	}
@@ -87,7 +78,7 @@ func (c *remoteBlobsCache) GetBlob(ctx context.Context, key string) ([]byte, err
 	return res.Blob, nil
 }
 
-func NewMockBlobsCacheClient() Client {
+func NewMockBlobsCacheClient() ia.CacheClient {
 	return &mockBlobsCacheClient{}
 }
 
@@ -99,5 +90,5 @@ func (m mockBlobsCacheClient) PutBlob(ctx context.Context, key string, blob []by
 }
 
 func (m mockBlobsCacheClient) GetBlob(ctx context.Context, key string) ([]byte, error) {
-	return nil, ErrCacheNotFound
+	return nil, ia.ErrCacheNotFound
 }

blobscache/mock/mock.go

@@ -3,7 +3,7 @@ package mock
 import (
 	"context"
 
-	"github.com/castai/kvisor/blobscache"
+	ia "github.com/castai/image-analyzer"
 )
 
 type MockClient struct{}
@@ -13,5 +13,5 @@ func (m MockClient) PutBlob(ctx context.Context, key string, blob []byte) error
 }
 
 func (m MockClient) GetBlob(ctx context.Context, key string) ([]byte, error) {
-	return nil, blobscache.ErrCacheNotFound
+	return nil, ia.ErrCacheNotFound
 }

blobscache/server_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	ia "github.com/castai/image-analyzer"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
 )
@@ -31,7 +32,7 @@ func TestBlobsCacheServer(t *testing.T) {
 	// Wait unti server is ready.
 	r.Eventually(func() bool {
 		_, err := client.GetBlob(ctx, "noop")
-		return errors.Is(err, ErrCacheNotFound)
+		return errors.Is(err, ia.ErrCacheNotFound)
 	}, 3*time.Second, 10*time.Millisecond)
 
 	blob := []byte(`{"some": "json"}`)