IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Storage: Support get with resourceversion (#83849)

Browse Source 
support getting old resourceversion, return explicit resource version in list
This commit is contained in:
Dan Cech
2024-03-05 10:57:32 -05:00
committed by GitHub
parent b3efb4217e
commit 9fa9eaab44
5 changed files with 150 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/apiserver/service.go
View File

@@ -161,6 +161,7 @@ func ProvideService(
s.rr.Group("/readyz", proxyHandler)
s.rr.Group("/healthz", proxyHandler)
s.rr.Group("/openapi", proxyHandler)
s.rr.Group("/version", proxyHandler)
return s, nil
}

24
pkg/services/apiserver/storage/entity/storage.go
View File

@@ -278,10 +278,20 @@ func (s *Storage) Watch(ctx context.Context, key string, opts storage.ListOption
// The returned contents may be delayed, but it is guaranteed that they will
// match 'opts.ResourceVersion' according 'opts.ResourceVersionMatch'.
func (s *Storage) Get(ctx context.Context, key string, opts storage.GetOptions, objPtr runtime.Object) error {
resourceVersion := int64(0)
var err error
if opts.ResourceVersion != "" {
resourceVersion, err = strconv.ParseInt(opts.ResourceVersion, 10, 64)
if err != nil {
return apierrors.NewBadRequest(fmt.Sprintf("invalid resource version: %s", opts.ResourceVersion))
}
}
rsp, err := s.store.Read(ctx, &entityStore.ReadEntityRequest{
Key: key,
WithBody: true,
WithStatus: true,
Key: key,
WithBody: true,
WithStatus: true,
ResourceVersion: resourceVersion,
})
if err != nil {
return err
@@ -360,15 +370,9 @@ func (s *Storage) GetList(ctx context.Context, key string, opts storage.ListOpti
return apierrors.NewInternalError(err)
}
maxResourceVersion := int64(0)
for _, r := range rsp.Results {
res := s.newFunc()
if r.ResourceVersion > maxResourceVersion {
maxResourceVersion = r.ResourceVersion
}
err := entityToResource(r, res, s.codec)
if err != nil {
return apierrors.NewInternalError(err)
@@ -395,7 +399,7 @@ func (s *Storage) GetList(ctx context.Context, key string, opts storage.ListOpti
listAccessor.SetContinue(rsp.NextPageToken)
}
listAccessor.SetResourceVersion(strconv.FormatInt(maxResourceVersion, 10))
listAccessor.SetResourceVersion(strconv.FormatInt(rsp.ResourceVersion, 10))
return nil
}