Skip to content

Commit

Permalink
Remove unused singleton
Browse files Browse the repository at this point in the history
`singletonRootError` was never returned without being overwritten, so it was essentially unused. I think it's wise to always retry the TUF call on future invocations in case of network errors.

Signed-off-by: Cody Soyland <[email protected]>
  • Loading branch information
codysoyland committed Sep 17, 2024
1 parent 3720290 commit 2b7dc34
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions pkg/tuf/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,9 @@ func ClientFromRemote(_ context.Context, mirror string, rootJSON []byte, targets
}

var (
mu sync.RWMutex
singletonRootError error
timestamp time.Time
trustedRoot *root.TrustedRoot
mu sync.RWMutex
timestamp time.Time
trustedRoot *root.TrustedRoot
)

// GetTrustedRoot returns the trusted root for the TUF repository.
Expand All @@ -311,19 +310,16 @@ func GetTrustedRoot(ctx context.Context) (*root.TrustedRoot, error) {

tufClient, err := tuf.NewFromEnv(context.Background())
if err != nil {
singletonRootError = fmt.Errorf("initializing tuf: %w", err)
return nil, singletonRootError
return nil, fmt.Errorf("initializing tuf: %w", err)
}
// TODO: add support for custom trusted root path
targetBytes, err := tufClient.GetTarget("trusted_root.json")
if err != nil {
singletonRootError = fmt.Errorf("error getting targets: %w", err)
return nil, singletonRootError
return nil, fmt.Errorf("error getting targets: %w", err)
}
trustedRoot, err = root.NewTrustedRootFromJSON(targetBytes)
if err != nil {
singletonRootError = fmt.Errorf("error creating trusted root: %w", err)
return nil, singletonRootError
return nil, fmt.Errorf("error creating trusted root: %w", err)
}

timestamp = now
Expand Down

0 comments on commit 2b7dc34

Please sign in to comment.