mirror of
https://github.com/argoproj/argo-cd
synced 2026-05-24 09:50:08 +00:00
* fix: compile time validation of interface contract
Signed-off-by: Shoubhik Bose <shbose@redhat.com>
* fix: application specific parameter override is not reflected in application parameters tab (#5845)
Signed-off-by: May Zhang <may_zhang@intuit.com>
Signed-off-by: Shoubhik Bose <shbose@redhat.com>
* chore: compile time resolution
Signed-off-by: Shoubhik Bose <shbose@redhat.com>
* chore: adherance to contract
Signed-off-by: Shoubhik Bose <shbose@redhat.com>
* Revert "fix: application specific parameter override is not reflected in application parameters tab (#5845)"
This reverts commit 43c8012062.
Signed-off-by: Shoubhik Bose <shbose@redhat.com>
Co-authored-by: May Zhang <may_zhang@intuit.com>
123 lines
2.8 KiB
Go
123 lines
2.8 KiB
Go
package cache
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"time"
|
|
|
|
ioutil "github.com/argoproj/argo-cd/v2/util/io"
|
|
|
|
rediscache "github.com/go-redis/cache/v8"
|
|
"github.com/go-redis/redis/v8"
|
|
)
|
|
|
|
func NewRedisCache(client *redis.Client, expiration time.Duration) CacheClient {
|
|
return &redisCache{
|
|
client: client,
|
|
expiration: expiration,
|
|
cache: rediscache.New(&rediscache.Options{Redis: client}),
|
|
}
|
|
}
|
|
|
|
// compile-time validation of adherance of the CacheClient contract
|
|
var _ CacheClient = &redisCache{}
|
|
|
|
type redisCache struct {
|
|
expiration time.Duration
|
|
client *redis.Client
|
|
cache *rediscache.Cache
|
|
}
|
|
|
|
func (r *redisCache) Set(item *Item) error {
|
|
expiration := item.Expiration
|
|
if expiration == 0 {
|
|
expiration = r.expiration
|
|
}
|
|
|
|
val, err := json.Marshal(item.Object)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return r.cache.Set(&rediscache.Item{
|
|
Key: item.Key,
|
|
Value: val,
|
|
TTL: expiration,
|
|
})
|
|
}
|
|
|
|
func (r *redisCache) Get(key string, obj interface{}) error {
|
|
var data []byte
|
|
err := r.cache.Get(context.TODO(), key, &data)
|
|
if err == rediscache.ErrCacheMiss {
|
|
err = ErrCacheMiss
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return json.Unmarshal(data, obj)
|
|
}
|
|
|
|
func (r *redisCache) Delete(key string) error {
|
|
return r.cache.Delete(context.TODO(), key)
|
|
}
|
|
|
|
func (r *redisCache) OnUpdated(ctx context.Context, key string, callback func() error) error {
|
|
pubsub := r.client.Subscribe(ctx, key)
|
|
defer ioutil.Close(pubsub)
|
|
|
|
ch := pubsub.Channel()
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil
|
|
case <-ch:
|
|
if err := callback(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (r *redisCache) NotifyUpdated(key string) error {
|
|
return r.client.Publish(context.TODO(), key, "").Err()
|
|
}
|
|
|
|
type MetricsRegistry interface {
|
|
IncRedisRequest(failed bool)
|
|
ObserveRedisRequestDuration(duration time.Duration)
|
|
}
|
|
|
|
var metricStartTimeKey = struct{}{}
|
|
|
|
type redisHook struct {
|
|
registry MetricsRegistry
|
|
}
|
|
|
|
func (rh *redisHook) BeforeProcess(ctx context.Context, cmd redis.Cmder) (context.Context, error) {
|
|
return context.WithValue(ctx, metricStartTimeKey, time.Now()), nil
|
|
}
|
|
|
|
func (rh *redisHook) AfterProcess(ctx context.Context, cmd redis.Cmder) error {
|
|
cmdErr := cmd.Err()
|
|
rh.registry.IncRedisRequest(cmdErr != nil && cmdErr != redis.Nil)
|
|
|
|
startTime := ctx.Value(metricStartTimeKey).(time.Time)
|
|
duration := time.Since(startTime)
|
|
rh.registry.ObserveRedisRequestDuration(duration)
|
|
|
|
return nil
|
|
}
|
|
|
|
func (redisHook) BeforeProcessPipeline(ctx context.Context, _ []redis.Cmder) (context.Context, error) {
|
|
return ctx, nil
|
|
}
|
|
|
|
func (redisHook) AfterProcessPipeline(_ context.Context, _ []redis.Cmder) error {
|
|
return nil
|
|
}
|
|
|
|
// CollectMetrics add transport wrapper that pushes metrics into the specified metrics registry
|
|
func CollectMetrics(client *redis.Client, registry MetricsRegistry) {
|
|
client.AddHook(&redisHook{registry: registry})
|
|
}
|