Skip to content

Commit 50682e3

Browse files
committed
rename tuf client var and log init error
1 parent 621090d commit 50682e3

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

public_root_of_trust.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,16 @@ func GetTargets(usage sigtuf.UsageKind, proxy Proxy) ([]sigtuf.TargetFile, error
4444
if err != nil {
4545
return nil, fmt.Errorf("could not create remote store object: %s", err.Error())
4646
}
47-
tufClient := tufclient.NewClient(tufclient.MemoryLocalStore(), remoteStore)
48-
tufClient.Init([]byte(SigstoreTUFRootJSON))
49-
err = tufClient.UpdateRoots()
47+
localClient := tufclient.NewClient(tufclient.MemoryLocalStore(), remoteStore)
48+
err = localClient.Init([]byte(SigstoreTUFRootJSON))
49+
if err != nil {
50+
return nil, fmt.Errorf("error initializing tuf client: %s", err.Error())
51+
}
52+
err = localClient.UpdateRoots()
5053
if err != nil {
5154
return nil, fmt.Errorf("error updating tuf client roots: %s", err.Error())
5255
}
53-
_, err = tufClient.Update()
56+
_, err = localClient.Update()
5457
if err != nil {
5558
return nil, fmt.Errorf("error updating tuf client metadata: %s", err.Error())
5659
}
@@ -65,7 +68,7 @@ func GetTargets(usage sigtuf.UsageKind, proxy Proxy) ([]sigtuf.TargetFile, error
6568
Sigstore customMetadata `json:"sigstore"`
6669
}
6770

68-
targets, err := tufClient.Targets()
71+
targets, err := localClient.Targets()
6972
if err != nil {
7073
return nil, fmt.Errorf("error getting targets: %w", err)
7174
}
@@ -83,7 +86,7 @@ func GetTargets(usage sigtuf.UsageKind, proxy Proxy) ([]sigtuf.TargetFile, error
8386
}
8487
if scm.Sigstore.Usage == usage {
8588
dest := inMemoryDest{}
86-
err = tufClient.Download(name, dest)
89+
err = localClient.Download(name, dest)
8790
if err != nil {
8891
globalBuffer.Reset()
8992
return nil, fmt.Errorf("error downloading target: %s", err.Error())

0 commit comments

Comments
 (0)