Skip to content

Commit 738b246

Browse files
Fix cmd panic (#1692)
Co-authored-by: Azeem Shaikh <azeems@google.com>
1 parent 8377294 commit 738b246

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

checker/client.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,16 @@ func GetClients(ctx context.Context, repoURI, localURI string, logger *log.Logge
3636
var githubRepo clients.Repo
3737
if localURI != "" {
3838
localRepo, errLocal := localdir.MakeLocalDirRepo(localURI)
39+
var retErr error
40+
if errLocal != nil {
41+
retErr = fmt.Errorf("getting local directory client: %w", errLocal)
42+
}
3943
return localRepo, /*repo*/
4044
localdir.CreateLocalDirClient(ctx, logger), /*repoClient*/
4145
nil, /*ossFuzzClient*/
4246
nil, /*ciiClient*/
4347
nil, /*vulnClient*/
44-
fmt.Errorf("getting local directory client: %w", errLocal)
48+
retErr
4549
}
4650

4751
githubRepo, errGitHub := ghrepo.MakeGithubRepo(repoURI)
@@ -55,12 +59,15 @@ func GetClients(ctx context.Context, repoURI, localURI string, logger *log.Logge
5559
}
5660

5761
ossFuzzRepoClient, errOssFuzz := ghrepo.CreateOssFuzzRepoClient(ctx, logger)
58-
62+
var retErr error
63+
if errOssFuzz != nil {
64+
retErr = fmt.Errorf("getting OSS-Fuzz repo client: %w", errOssFuzz)
65+
}
5966
// TODO(repo): Should we be handling the OSS-Fuzz client error like this?
6067
return githubRepo, /*repo*/
6168
ghrepo.CreateGithubRepoClient(ctx, logger), /*repoClient*/
6269
ossFuzzRepoClient, /*ossFuzzClient*/
6370
clients.DefaultCIIBestPracticesClient(), /*ciiClient*/
6471
clients.DefaultVulnerabilitiesClient(), /*vulnClient*/
65-
fmt.Errorf("getting OSS-Fuzz repo client: %w", errOssFuzz)
72+
retErr
6673
}

0 commit comments

Comments
 (0)