Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-02 06:16:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

staticupload: correctly set invalidation timeout

Browse source 
Previously the timeout was not set in the client's constructor, thus the
zero value was used. The client did not wait for invalidation.
To prevent this in the future a warning is logged if wait is disabled.

Co-authored-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Otto Bittner 2023-08-31 10:31:45 +02:00
parent fdaa5aab3c
commit 97dc15b1d1
14 changed files with 113 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/api/versionsapi/cli/add.go
View file

@ -71,12 +71,12 @@ func runAdd(cmd *cobra.Command, _ []string) (retErr error) {
if err != nil {
return fmt.Errorf("creating client: %w", err)
}
defer func(retErr *error) {
log.Infof("Invalidating cache. This may take some time")
if err := clientClose(cmd.Context()); err != nil && retErr == nil {
*retErr = fmt.Errorf("invalidating cache: %w", err)
defer func() {
err := clientClose(cmd.Context())
if err != nil {
retErr = errors.Join(retErr, fmt.Errorf("failed to invalidate cache: %w", err))
}
}(&retErr)
}()
log.Infof("Adding version")
if err := ensureVersion(cmd.Context(), client, flags.kind, ver, versionsapi.GranularityMajor, log); err != nil {

8
internal/api/versionsapi/cli/latest.go
View file

@ -8,6 +8,7 @@ package main
import (
"encoding/json"
"errors"
"fmt"
"github.com/edgelesssys/constellation/v2/internal/api/versionsapi"
@ -32,7 +33,7 @@ func newLatestCmd() *cobra.Command {
return cmd
}
func runLatest(cmd *cobra.Command, _ []string) error {
func runLatest(cmd *cobra.Command, _ []string) (retErr error) {
flags, err := parseLatestFlags(cmd)
if err != nil {
return err
@ -51,8 +52,9 @@ func runLatest(cmd *cobra.Command, _ []string) error {
return fmt.Errorf("creating client: %w", err)
}
defer func() {
if err := clientClose(cmd.Context()); err != nil {
log.Errorf("Closing versions API client: %v", err)
err := clientClose(cmd.Context())
if err != nil {
retErr = errors.Join(retErr, fmt.Errorf("failed to invalidate cache: %w", err))
}
}()

7
internal/api/versionsapi/cli/list.go
View file

@ -38,7 +38,7 @@ func newListCmd() *cobra.Command {
return cmd
}
func runList(cmd *cobra.Command, _ []string) error {
func runList(cmd *cobra.Command, _ []string) (retErr error) {
flags, err := parseListFlags(cmd)
if err != nil {
return err
@ -57,8 +57,9 @@ func runList(cmd *cobra.Command, _ []string) error {
return fmt.Errorf("creating client: %w", err)
}
defer func() {
if err := clientClose(cmd.Context()); err != nil {
log.Errorf("Closing versions API client: %v", err)
err := clientClose(cmd.Context())
if err != nil {
retErr = errors.Join(retErr, fmt.Errorf("failed to invalidate cache: %w", err))
}
}()

10
internal/api/versionsapi/cli/rm.go
View file

@ -105,12 +105,12 @@ func runRemove(cmd *cobra.Command, _ []string) (retErr error) {
if err != nil {
return fmt.Errorf("creating client: %w", err)
}
defer func(retErr *error) {
log.Infof("Invalidating cache. This may take some time")
if err := verclientClose(cmd.Context()); err != nil && retErr == nil {
*retErr = fmt.Errorf("invalidating cache: %w", err)
defer func() {
err := verclientClose(cmd.Context())
if err != nil {
retErr = errors.Join(retErr, fmt.Errorf("failed to invalidate cache: %w", err))
}
}(&retErr)
}()
imageClients := rmImageClients{
version: verclient,