Client cache API paging (#5107)

* internal/clientcache: add -force-reset-schema flag

* clientcache: stream list pages directly to DB

---------

Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
(cherry picked from commit ccea8a4ce53f7b0d1105c1c1e4875e443635d96a)
This commit is contained in:
Irena Rindos authored and Timothy Messier committed 2024-09-24 14:18:53 +00:00
1 parent 3a4ee032d9
commit 2945692bf4
54 files changed
+793 -397

No files matched your search

+22 -4
View File
@@ -155,7 +155,7 @@ func fillTemplates() {
optionsMap[input.Package] = optionMap
}
// Override some defined options
if len(in.fieldOverrides) > 0 && optionsMap != nil {
if len(in.fieldOverrides) > 0 {
for _, override := range in.fieldOverrides {
inOpts := optionsMap[input.Package]
if inOpts != nil {
@@ -243,7 +243,12 @@ func (c *Client) List(ctx context.Context, {{ .CollectionFunctionArg }} string,
opts, apiOpts := getOpts(opt...)
opts.queryMap["{{ snakeCase .CollectionFunctionArg }}"] = {{ .CollectionFunctionArg }}
req, err := c.client.NewRequest(ctx, "GET", "{{ .CollectionPath }}", nil, apiOpts...)
requestPath := "{{ .CollectionPath }}"
if opts.withResourcePathOverride != "" {
requestPath = opts.withResourcePathOverride
}
req, err := c.client.NewRequest(ctx, "GET", requestPath, nil, apiOpts...)
if err != nil {
return nil, fmt.Errorf("error creating List request: %w", err)
}
@@ -404,7 +409,12 @@ func (c *Client) ListNextPage(ctx context.Context, currentPage *{{ .Name }}ListR
opts.queryMap["page_size"] = strconv.FormatUint(uint64(currentPage.pageSize), 10)
}
req, err := c.client.NewRequest(ctx, "GET", "{{ .CollectionPath }}", nil, apiOpts...)
requestPath := "{{ .CollectionPath }}"
if opts.withResourcePathOverride != "" {
requestPath = opts.withResourcePathOverride
}
req, err := c.client.NewRequest(ctx, "GET", requestPath, nil, apiOpts...)
if err != nil {
return nil, fmt.Errorf("error creating List request: %w", err)
}
@@ -434,7 +444,7 @@ func (c *Client) ListNextPage(ctx context.Context, currentPage *{{ .Name }}ListR
// Ensure values are carried forward to the next call
nextPage.{{ .CollectionFunctionArg }} = currentPage.{{ .CollectionFunctionArg }}
{{ if .RecursiveListing }}
{{ if .RecursiveListing }}
nextPage.recursive = currentPage.recursive
{{ end }}
nextPage.pageSize = currentPage.pageSize
@@ -943,6 +953,7 @@ type options struct {
withListToken string
withClientDirectedPagination bool
withPageSize uint32
withResourcePathOverride string
{{ if .RecursiveListing }} withRecursive bool {{ end }}
}
@@ -1031,6 +1042,13 @@ func WithPageSize(with uint32) Option {
o.withPageSize = with
}
}
// WithResourcePathOverride tells the API to use the provided resource path
func WithResourcePathOverride(path string) Option {
return func(o *options) {
o.withResourcePathOverride = path
}
}
{{ if .RecursiveListing }}
// WithRecursive tells the API to use recursion for listing operations on this
// resource