Skip to content

Commit 6df95a7

Browse files
authored
refactor(controlplane): remove NATS backend from JWT claims and memberships caches (#3009)
Signed-off-by: Miguel Martinez Trivino <miguel@chainloop.dev>
1 parent c8400fc commit 6df95a7

File tree

2 files changed

+10
-34
lines changed

2 files changed

+10
-34
lines changed

app/controlplane/cmd/wire.go

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -146,28 +146,16 @@ var cacheProviderSet = wire.NewSet(
146146
attestationbundle.New,
147147
)
148148

149-
func newClaimsCache(ctx context.Context, rc *natsconn.ReloadableConnection, logger log.Logger) (cache.Cache[*jwt.MapClaims], error) {
149+
func newClaimsCache(logger log.Logger) (cache.Cache[*jwt.MapClaims], error) {
150150
l := log.NewHelper(logger)
151-
backend := "memory"
152151
opts := []cache.Option{cache.WithTTL(10 * time.Second), cache.WithLogger(l), cache.WithDescription("Cache for JWT claims")}
153-
if rc != nil {
154-
backend = "nats"
155-
opts = append(opts, cache.WithNATS(rc.Conn, "chainloop-jwt-claims"))
156-
opts = append(opts, cache.WithReconnect(rc.Subscribe(ctx)))
157-
}
158-
l.Infow("msg", "cache initialized", "bucket", "chainloop-jwt-claims", "backend", backend, "ttl", "10s")
152+
l.Infow("msg", "cache initialized", "backend", "memory", "ttl", "10s")
159153
return cache.New[*jwt.MapClaims](opts...)
160154
}
161155

162-
func newMembershipsCache(ctx context.Context, rc *natsconn.ReloadableConnection, logger log.Logger) (cache.Cache[*entities.Membership], error) {
156+
func newMembershipsCache(logger log.Logger) (cache.Cache[*entities.Membership], error) {
163157
l := log.NewHelper(logger)
164-
backend := "memory"
165158
opts := []cache.Option{cache.WithTTL(time.Second), cache.WithLogger(l), cache.WithDescription("Cache for org memberships")}
166-
if rc != nil {
167-
backend = "nats"
168-
opts = append(opts, cache.WithNATS(rc.Conn, "chainloop-memberships"))
169-
opts = append(opts, cache.WithReconnect(rc.Subscribe(ctx)))
170-
}
171-
l.Infow("msg", "cache initialized", "bucket", "chainloop-memberships", "backend", backend, "ttl", "1s")
159+
l.Infow("msg", "cache initialized", "backend", "memory", "ttl", "1s")
172160
return cache.New[*entities.Membership](opts...)
173161
}

app/controlplane/cmd/wire_gen.go

Lines changed: 6 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)