diff --git a/pkg/middleware/cache.go b/pkg/middleware/cache.go index 10f7e8c..40286c8 100644 --- a/pkg/middleware/cache.go +++ b/pkg/middleware/cache.go @@ -9,9 +9,8 @@ import ( "github.com/mikestefanello/pagoda/pkg/context" "github.com/mikestefanello/pagoda/pkg/services" - lib_store "github.com/eko/gocache/lib/v4/store" + libstore "github.com/eko/gocache/lib/v4/store" "github.com/labstack/echo/v4" - "github.com/redis/go-redis/v9" ) // CachedPageGroup stores the cache group for cached pages @@ -58,7 +57,7 @@ func ServeCachedPage(ch *services.CacheClient) echo.MiddlewareFunc { if err != nil { switch { - case errors.Is(err, &lib_store.NotFound{}) || err == redis.Nil: + case errors.Is(err, &libstore.NotFound{}): c.Logger().Info("no cached page found") case context.IsCanceledError(err): return nil diff --git a/pkg/services/cache.go b/pkg/services/cache.go index 6a04a0e..ec38c83 100644 --- a/pkg/services/cache.go +++ b/pkg/services/cache.go @@ -8,8 +8,8 @@ import ( "github.com/eko/gocache/lib/v4/cache" "github.com/eko/gocache/lib/v4/marshaler" - lib_store "github.com/eko/gocache/lib/v4/store" - redis_store "github.com/eko/gocache/store/redis/v4" + libstore "github.com/eko/gocache/lib/v4/store" + redisstore "github.com/eko/gocache/store/redis/v4" "github.com/mikestefanello/pagoda/config" "github.com/redis/go-redis/v9" ) @@ -77,7 +77,7 @@ func NewCacheClient(cfg *config.Config) (*CacheClient, error) { } } - cacheStore := redis_store.NewRedis(c.Client) + cacheStore := redisstore.NewRedis(c.Client) c.cache = cache.New[any](cacheStore) return c, nil } @@ -152,9 +152,9 @@ func (c *cacheSet) Save(ctx context.Context) error { return errors.New("no cache key specified") } - opts := []lib_store.Option{ - lib_store.WithExpiration(c.expiration), - lib_store.WithTags(c.tags), + opts := []libstore.Option{ + libstore.WithExpiration(c.expiration), + libstore.WithTags(c.tags), } return marshaler. @@ -214,7 +214,7 @@ func (c *cacheFlush) Tags(tags ...string) *cacheFlush { // Execute flushes the data from the cache func (c *cacheFlush) Execute(ctx context.Context) error { if len(c.tags) > 0 { - if err := c.client.cache.Invalidate(ctx, lib_store.WithInvalidateTags(c.tags)); err != nil { + if err := c.client.cache.Invalidate(ctx, libstore.WithInvalidateTags(c.tags)); err != nil { return err } } diff --git a/pkg/services/cache_test.go b/pkg/services/cache_test.go index 778d09b..0995b8a 100644 --- a/pkg/services/cache_test.go +++ b/pkg/services/cache_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - lib_store "github.com/eko/gocache/lib/v4/store" + libstore "github.com/eko/gocache/lib/v4/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -64,7 +64,7 @@ func TestCacheClient(t *testing.T) { Key(key). Type(new(cacheTest)). Fetch(context.Background()) - assert.True(t, errors.Is(err, &lib_store.NotFound{})) + assert.True(t, errors.Is(err, &libstore.NotFound{})) } assertFlushed()