diff --git a/config/default.yaml b/config/default.yaml index 80a459e..7c2a8f2 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -35,7 +35,10 @@ extensions: enrichment: webhook_urls: - ttl: 24h + cache: + ttl: 24h + addrs: "localhost:6739" + username: "" webhook_timeout: 500ms cloud_save: url: diff --git a/config/local.yaml b/config/local.yaml index 77f2124..62c90ac 100644 --- a/config/local.yaml +++ b/config/local.yaml @@ -39,6 +39,10 @@ enrichment: webhook_urls: dummy_tenant_id: "localhost:8080/" webhook_timeout: 500ms + cache: + ttl: 24h + addrs: "localhost:6739" + username: "" cloud_save: url: "localhost:8888/" disabled: \ No newline at end of file diff --git a/leaderboard/enriching/enricher_test.go b/leaderboard/enriching/enricher_test.go index 11d1f3c..3f04197 100644 --- a/leaderboard/enriching/enricher_test.go +++ b/leaderboard/enriching/enricher_test.go @@ -7,7 +7,6 @@ import ( . "github.com/onsi/gomega" mock_enriching "github.com/topfreegames/podium/leaderboard/v2/mocks" "github.com/topfreegames/podium/leaderboard/v2/model" - "go.uber.org/zap" "net/http" "net/http/httptest" ) @@ -32,7 +31,8 @@ var _ = Describe("Enricher tests", func() { It("should not enrich if no webhook url is configured and cloud save service is disabled", func() { cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache, + enrich := NewEnricher( + cache, WithCloudSaveDisabled(map[string]bool{tenantID: true}), ) @@ -62,7 +62,10 @@ var _ = Describe("Enricher tests", func() { }) cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache, WithCloudSaveUrl(server.URL)) + enrich := NewEnricher( + cache, + WithCloudSaveUrl(server.URL), + ) members := []*model.Member{ { @@ -90,7 +93,10 @@ var _ = Describe("Enricher tests", func() { }) cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache, WithCloudSaveUrl(server.URL)) + enrich := NewEnricher( + cache, + WithCloudSaveUrl(server.URL), + ) members := []*model.Member{ { @@ -118,7 +124,10 @@ var _ = Describe("Enricher tests", func() { }) cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache, WithCloudSaveUrl(server.URL)) + enrich := NewEnricher( + cache, + WithCloudSaveUrl(server.URL), + ) members := []*model.Member{ { @@ -155,7 +164,7 @@ var _ = Describe("Enricher tests", func() { }) cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache, + enrich := NewEnricher(cache, WithWebhookUrls(map[string]string{ tenantID: server.URL, }), @@ -187,7 +196,8 @@ var _ = Describe("Enricher tests", func() { }) cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache, + enrich := NewEnricher( + cache, WithWebhookUrls(map[string]string{ tenantID: server.URL, }), @@ -217,7 +227,8 @@ var _ = Describe("Enricher tests", func() { }) cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache, + enrich := NewEnricher( + cache, WithWebhookUrls(map[string]string{ tenantID: server.URL, }), @@ -254,7 +265,7 @@ var _ = Describe("Enricher tests", func() { It("should return cached data if all members are cached", func() { cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache) + enrich := NewEnricher(cache) members := []*model.Member{ { @@ -293,7 +304,7 @@ var _ = Describe("Enricher tests", func() { }) cache := mock_enriching.NewMockEnricherCache(gomock.NewController(GinkgoT())) - enrich := NewEnricher(zap.NewNop(), cache, + enrich := NewEnricher(cache, WithWebhookUrls(map[string]string{ tenantID: server.URL, }),