marco/plugin-barman-cloud
1
0
Fork 0
mirror of https://github.com/cloudnative-pg/plugin-barman-cloud.git synced 2026-01-12 13:43:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: logic to retrieve ObjectStore from cache (#429)

Browse Source 
There was mistake on the object used to compare the ObjectStore, we were
using a type Secret instead of ObjectStore.

Also, make it more clear the logic to retrieve the cached objects by getting
the cached objects when are cached.

Signed-off-by: Jonathan Gonzalez V. <jonathan.gonzalez@enterprisedb.com>
This commit is contained in:
Jonathan Gonzalez V. 2025-07-02 11:12:54 +02:00 committed by GitHub
parent 0769a28a8e
commit 2a75d40356
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/cnpgi/instance/internal/client/client.go
View File

@ -11,6 +11,8 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
pluginBarman "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
) )
// DefaultTTLSeconds is the default TTL in seconds of cache entries // DefaultTTLSeconds is the default TTL in seconds of cache entries
@ -48,7 +50,7 @@ func (e *ExtendedClient) isObjectCached(obj client.Object) bool {
return true return true
} }
if _, isObjectStore := obj.(*corev1.Secret); isObjectStore { if _, isObjectStore := obj.(*pluginBarman.ObjectStore); isObjectStore {
return true return true
} }
@ -62,11 +64,11 @@ func (e *ExtendedClient) Get(
obj client.Object, obj client.Object,
opts ...client.GetOption, opts ...client.GetOption,
) error { ) error {
if !e.isObjectCached(obj) { if e.isObjectCached(obj) {
return e.Client.Get(ctx, key, obj, opts...) return e.getCachedObject(ctx, key, obj, opts...)
} }
return e.getCachedObject(ctx, key, obj, opts...) return e.Client.Get(ctx, key, obj, opts...)
} }
func (e *ExtendedClient) getCachedObject( func (e *ExtendedClient) getCachedObject(