feat: v1.4.3

darkweak · darkweak · commit 9f49621390a2 · 2021-03-18T03:26:58.000+01:00
diff --git a/Dockerfile-dev b/Dockerfile-dev
@@ -21,10 +21,9 @@ ADD ./default /app/src/github.com/darkweak/souin/default
 ADD ./errors /app/src/github.com/darkweak/souin/errors
 ADD ./helpers /app/src/github.com/darkweak/souin/helpers
 ADD ./providers /app/src/github.com/darkweak/souin/providers
-ADD ./plugins /app/src/github.com/darkweak/souin/plugins
 
 WORKDIR /app/src/github.com/darkweak/souin
 
 EXPOSE 80
 
-CMD ["go", "run", "plugins/souin/main.go"]
+CMD ["go", "run", "main.go"]
diff --git a/Dockerfile-prod b/Dockerfile-prod
@@ -21,7 +21,6 @@ ADD ./default /app/src/github.com/darkweak/souin/default
 ADD ./errors /app/src/github.com/darkweak/souin/errors
 ADD ./helpers /app/src/github.com/darkweak/souin/helpers
 ADD ./providers /app/src/github.com/darkweak/souin/providers
-ADD ./plugins /app/src/github.com/darkweak/souin/plugins
 
 WORKDIR /app/src/github.com/darkweak/souin
 RUN go mod download
diff --git a/api/souin.go b/api/souin.go
@@ -12,10 +12,10 @@ import (
 
 // SouinAPI object contains informations related to the endpoints
 type SouinAPI struct {
-	basePath string
-	enabled  bool
+	basePath  string
+	enabled   bool
 	providers map[string]types.AbstractProviderInterface
-	security *auth.SecurityAPI
+	security  *auth.SecurityAPI
 }
 
 func initializeSouin(providers map[string]types.AbstractProviderInterface, configuration configurationtypes.AbstractConfigurationInterface, api *auth.SecurityAPI) *SouinAPI {
diff --git a/api/souin_test.go b/api/souin_test.go
@@ -26,8 +26,8 @@ func TestSouinAPI_BulkDelete(t *testing.T) {
 	souinMock := mockSouinAPI()
 	defer souinMock.providers["olric"].Reset()
 	for _, provider := range souinMock.providers {
-		provider.Set("key", []byte("value"), tests.GetMatchedURL("key"), 20 * time.Second)
-		provider.Set("key2", []byte("value"), tests.GetMatchedURL("key"), 20 * time.Second)
+		provider.Set("key", []byte("value"), tests.GetMatchedURL("key"), 20*time.Second)
+		provider.Set("key2", []byte("value"), tests.GetMatchedURL("key"), 20*time.Second)
 	}
 	time.Sleep(3 * time.Second)
 	for _, v := range souinMock.GetAll() {
@@ -48,7 +48,7 @@ func TestSouinAPI_Delete(t *testing.T) {
 	souinMock := mockSouinAPI()
 	defer souinMock.providers["olric"].Reset()
 	for _, provider := range souinMock.providers {
-		provider.Set("key", []byte("value"), tests.GetMatchedURL("key"), 20 * time.Second)
+		provider.Set("key", []byte("value"), tests.GetMatchedURL("key"), 20*time.Second)
 	}
 	time.Sleep(3 * time.Second)
 	for _, v := range souinMock.GetAll() {
@@ -75,7 +75,7 @@ func TestSouinAPI_GetAll(t *testing.T) {
 	}
 
 	for _, provider := range souinMock.providers {
-		provider.Set("key", []byte("value"), tests.GetMatchedURL("key"), 6 * time.Second)
+		provider.Set("key", []byte("value"), tests.GetMatchedURL("key"), 6*time.Second)
 	}
 	time.Sleep(3 * time.Second)
 	for _, v := range souinMock.GetAll() {
diff --git a/cache/coalescing/requestCoalescing_test.go b/cache/coalescing/requestCoalescing_test.go
@@ -18,7 +18,7 @@ func TestServeResponse(t *testing.T) {
 	rc := Initialize()
 	retriever := &types.RetrieverResponseProperties{
 		Configuration: c,
-		Providers:      prs,
+		Providers:     prs,
 		MatchedURL:    tests.GetMatchedURL(tests.PATH),
 		RegexpUrls:    regexpUrls,
 	}
diff --git a/cache/providers/olricProvider.go b/cache/providers/olricProvider.go
@@ -12,7 +12,7 @@ import (
 // Olric provider type
 type Olric struct {
 	*client.Client
-	dm *client.DMap
+	dm       *client.DMap
 	keySaver *keysaver.ClearKey
 }
 
@@ -65,7 +65,7 @@ func (provider *Olric) Get(key string) []byte {
 func (provider *Olric) Set(key string, value []byte, url t.URL, duration time.Duration) {
 	if duration == 0 {
 		ttl, _ := strconv.Atoi(url.TTL)
-		duration = time.Duration(ttl)*time.Second
+		duration = time.Duration(ttl) * time.Second
 	}
 
 	err := provider.dm.PutEx(key, value, duration)
diff --git a/cache/providers/olricProvider_test.go b/cache/providers/olricProvider_test.go
@@ -26,7 +26,7 @@ func TestIShouldBeAbleToReadAndWriteDataInOlric(t *testing.T) {
 	client, u := getOlricClientAndMatchedURL("Test")
 	defer client.Reset()
 	client.Set("Test", []byte(OLRICVALUE), u, time.Duration(10)*time.Second)
-	time.Sleep(3*time.Second)
+	time.Sleep(3 * time.Second)
 	res := client.Get("Test")
 	if OLRICVALUE != string(res) {
 		errors.GenerateError(t, fmt.Sprintf("%s not corresponding to %s", res, OLRICVALUE))
@@ -45,15 +45,15 @@ func TestOlric_GetRequestInCache(t *testing.T) {
 func TestOlric_SetRequestInCache_OneByte(t *testing.T) {
 	client, u := getOlricClientAndMatchedURL(BYTEKEY)
 	defer client.Reset()
-	client.Set(BYTEKEY, []byte{65}, u, time.Duration(20) * time.Second)
+	client.Set(BYTEKEY, []byte{65}, u, time.Duration(20)*time.Second)
 }
 
 func TestOlric_SetRequestInCache_TTL(t *testing.T) {
 	key := "MyEmptyKey"
 	client, matchedURL := getOlricClientAndMatchedURL(key)
 	defer client.Reset()
 	nv := []byte("Hello world")
-	setValueThenVerify(client, key, nv, matchedURL, time.Duration(20) * time.Second, t)
+	setValueThenVerify(client, key, nv, matchedURL, time.Duration(20)*time.Second, t)
 }
 
 func TestOlric_SetRequestInCache_NoTTL(t *testing.T) {
diff --git a/cache/providers/redisProvider.go b/cache/providers/redisProvider.go
@@ -55,7 +55,7 @@ func (provider *Redis) Get(key string) []byte {
 func (provider *Redis) Set(key string, value []byte, url t.URL, duration time.Duration) {
 	if duration == 0 {
 		ttl, _ := strconv.Atoi(url.TTL)
-		duration = time.Duration(ttl)*time.Second
+		duration = time.Duration(ttl) * time.Second
 	}
 
 	err := provider.Client.Set(provider.Context(), key, string(value), duration).Err()
diff --git a/cache/providers/redisProvider_test.go b/cache/providers/redisProvider_test.go
@@ -40,14 +40,14 @@ func TestRedis_GetRequestInCache(t *testing.T) {
 
 func TestRedis_SetRequestInCache_OneByte(t *testing.T) {
 	client, u := getRedisClientAndMatchedURL(BYTEKEY)
-	client.Set(BYTEKEY, []byte{65}, u, time.Duration(20) * time.Second)
+	client.Set(BYTEKEY, []byte{65}, u, time.Duration(20)*time.Second)
 }
 
 func TestRedis_SetRequestInCache_TTL(t *testing.T) {
 	key := "MyEmptyKey"
 	client, matchedURL := getRedisClientAndMatchedURL(key)
 	nv := []byte("Hello world")
-	setValueThenVerify(client, key, nv, matchedURL, time.Duration(20) * time.Second, t)
+	setValueThenVerify(client, key, nv, matchedURL, time.Duration(20)*time.Second, t)
 }
 
 func TestRedis_SetRequestInCache_NoTTL(t *testing.T) {
diff --git a/cache/service/responseRetriever_test.go b/cache/service/responseRetriever_test.go
@@ -27,6 +27,7 @@ func TestServeResponse(t *testing.T) {
 		w,
 		r,
 		retriever,
-		func(rw http.ResponseWriter, rq *http.Request, r types.RetrieverResponsePropertiesInterface, key string) {},
+		func(rw http.ResponseWriter, rq *http.Request, r types.RetrieverResponsePropertiesInterface, key string) {
+		},
 	)
 }
diff --git a/cache/types/souin.go b/cache/types/souin.go
@@ -21,9 +21,9 @@ type TransportInterface interface {
 type Transport struct {
 	// The RoundTripper interface actually used to make requests
 	// If nil, http.DefaultTransport is used
-	Transport           http.RoundTripper
-	Providers           map[string]AbstractProviderInterface
-	ConfigurationURL    configurationtypes.URL
+	Transport        http.RoundTripper
+	Providers        map[string]AbstractProviderInterface
+	ConfigurationURL configurationtypes.URL
 	// If true, responses returned from the cache will be given an extra header, X-From-Cache
 	MarkCachedResponses bool
 }
@@ -73,7 +73,7 @@ func (r *RetrieverResponseProperties) SetMatchedURL(url configurationtypes.URL)
 			providers = append(providers, k)
 		}
 	}
-	url.Providers= providers
+	url.Providers = providers
 	r.MatchedURL = url
 }
 
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func TestServeResponse(t *testing.T) {`
`18`	`18`	`rc := Initialize()`
`19`	`19`	`retriever := &types.RetrieverResponseProperties{`
`20`	`20`	`Configuration: c,`
`21`		`- Providers: prs,`
	`21`	`+ Providers: prs,`
`22`	`22`	`MatchedURL: tests.GetMatchedURL(tests.PATH),`
`23`	`23`	`RegexpUrls: regexpUrls,`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (provider *Redis) Get(key string) []byte {`
`55`	`55`	`func (provider *Redis) Set(key string, value []byte, url t.URL, duration time.Duration) {`
`56`	`56`	`if duration == 0 {`
`57`	`57`	`ttl, _ := strconv.Atoi(url.TTL)`
`58`		`- duration = time.Duration(ttl)*time.Second`
	`58`	`+ duration = time.Duration(ttl) * time.Second`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`err := provider.Client.Set(provider.Context(), key, string(value), duration).Err()`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,14 @@ func TestRedis_GetRequestInCache(t *testing.T) {`
`40`	`40`
`41`	`41`	`func TestRedis_SetRequestInCache_OneByte(t *testing.T) {`
`42`	`42`	`client, u := getRedisClientAndMatchedURL(BYTEKEY)`
`43`		`- client.Set(BYTEKEY, []byte{65}, u, time.Duration(20) * time.Second)`
	`43`	`+ client.Set(BYTEKEY, []byte{65}, u, time.Duration(20)*time.Second)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func TestRedis_SetRequestInCache_TTL(t *testing.T) {`
`47`	`47`	`key := "MyEmptyKey"`
`48`	`48`	`client, matchedURL := getRedisClientAndMatchedURL(key)`
`49`	`49`	`nv := []byte("Hello world")`
`50`		`- setValueThenVerify(client, key, nv, matchedURL, time.Duration(20) * time.Second, t)`
	`50`	`+ setValueThenVerify(client, key, nv, matchedURL, time.Duration(20)*time.Second, t)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func TestRedis_SetRequestInCache_NoTTL(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ func TestServeResponse(t *testing.T) {`
`27`	`27`	`w,`
`28`	`28`	`r,`
`29`	`29`	`retriever,`
`30`		`- func(rw http.ResponseWriter, rq *http.Request, r types.RetrieverResponsePropertiesInterface, key string) {},`
	`30`	`+ func(rw http.ResponseWriter, rq *http.Request, r types.RetrieverResponsePropertiesInterface, key string) {`
	`31`	`+ },`
`31`	`32`	`)`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ type TransportInterface interface {`
`21`	`21`	`type Transport struct {`
`22`	`22`	`// The RoundTripper interface actually used to make requests`
`23`	`23`	`// If nil, http.DefaultTransport is used`
`24`		`- Transport http.RoundTripper`
`25`		`- Providers map[string]AbstractProviderInterface`
`26`		`- ConfigurationURL configurationtypes.URL`
	`24`	`+ Transport http.RoundTripper`
	`25`	`+ Providers map[string]AbstractProviderInterface`
	`26`	`+ ConfigurationURL configurationtypes.URL`
`27`	`27`	`// If true, responses returned from the cache will be given an extra header, X-From-Cache`
`28`	`28`	`MarkCachedResponses bool`
`29`	`29`	`}`
`@@ -73,7 +73,7 @@ func (r *RetrieverResponseProperties) SetMatchedURL(url configurationtypes.URL)`
`73`	`73`	`providers = append(providers, k)`
`74`	`74`	`}`
`75`	`75`	`}`
`76`		`- url.Providers= providers`
	`76`	`+ url.Providers = providers`
`77`	`77`	`r.MatchedURL = url`
`78`	`78`	`}`
`79`	`79`