Skip to content

Commit

Permalink
pass embedded into initialization
Browse files Browse the repository at this point in the history
Signed-off-by: Asra Ali <asraa@google.com>
  • Loading branch information
asraa committed May 31, 2022
1 parent 410d6cf commit e7bcb69
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions pkg/cosign/tuf/client.go
Expand Up @@ -228,12 +228,14 @@ func (t *TUF) Close() error {
// * mirror: provides a reference to a remote GCS or HTTP mirror.
// * root: provides an external initial root.json. When this is not provided, this
// defaults to the embedded root.json.
// * embedded: An embedded filesystem that provides a trusted root and pre-downloaded
// targets in a targets/ subfolder.
// * forceUpdate: indicates checking the remote for an update, even when the local
// timestamp.json is up to date.
func initializeTUF(ctx context.Context, mirror string, root []byte, forceUpdate bool) (*TUF, error) {
func initializeTUF(ctx context.Context, mirror string, root []byte, embedded fs.FS, forceUpdate bool) (*TUF, error) {
t := &TUF{
mirror: mirror,
embedded: GetEmbedded(),
embedded: embedded,
}

t.targets = newFileImpl()
Expand Down Expand Up @@ -299,12 +301,12 @@ func NewFromEnv(ctx context.Context) (*TUF, error) {
}

// Initializes a new TUF object from the local cache or defaults.
return initializeTUF(ctx, mirror, nil, false)
return initializeTUF(ctx, mirror, nil, GetEmbedded(), false)
}

func Initialize(ctx context.Context, mirror string, root []byte) error {
// Initialize the client. Force an update.
t, err := initializeTUF(ctx, mirror, root, true)
t, err := initializeTUF(ctx, mirror, root, GetEmbedded(), true)
if err != nil {
return err
}
Expand Down

0 comments on commit e7bcb69

Please sign in to comment.