Skip to content

Commit

Permalink
Minor fixes to error messages patch.go (#1145)
Browse files Browse the repository at this point in the history
* dependencies--> dependents

Signed-off-by: Rebecca Metzman <rmetzman@google.com>

* renaming in patch.go

Signed-off-by: Rebecca Metzman <rmetzman@google.com>

* error messaged changed

Signed-off-by: Rebecca Metzman <rmetzman@google.com>

---------

Signed-off-by: Rebecca Metzman <rmetzman@google.com>
Co-authored-by: Rebecca Metzman <rmetzman@google.com>
  • Loading branch information
rmetzman and Rebecca Metzman committed Aug 23, 2023
1 parent 655342e commit 0423c59
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions cmd/guacone/cmd/patch.go
Expand Up @@ -72,14 +72,14 @@ var queryPatchCmd = &cobra.Command{
startID, err = getPkgID(ctx, gqlClient, opts.startPurl, opts.isPackageVersionStart)

if err != nil {
logger.Fatalf("error getting start pkg from purl inputted %s \n", err)
logger.Fatalf("error getting start pkg from purl inputted: %s \n", err)
}

if opts.stopPurl != "" {
stopPkg, err := getPkgID(ctx, gqlClient, opts.stopPurl, opts.isPackageVersionStop)

if err != nil {
logger.Fatalf("error getting stop pkg from purl inputted %s\n", err)
logger.Fatalf("error getting stop pkg from purl inputted: %s\n", err)
}

stopID = &stopPkg
Expand Down Expand Up @@ -248,7 +248,10 @@ func getPkgID(ctx context.Context, gqlClient graphql.Client, purl string, isPack
pkgResponse, err := model.Packages(ctx, gqlClient, pkgFilter)

if err != nil || len(pkgResponse.Packages) == 0 {
return "", fmt.Errorf("error finding package with given purl (may have set is-pkg-version incorrectly): %s", purl)
if err != nil {
return "", fmt.Errorf("error finding package with given purl: %s, got error: %s", purl, err)
}
return "", fmt.Errorf("error finding a matching package with given purl: %s", purl)
}

if version {
Expand All @@ -262,6 +265,9 @@ func validateQueryPatchFlags(graphqlEndpoint, startPurl string, stopPurl string,
opts.startPurl = startPurl

if _, err := helpers.PurlToPkg(startPurl); startPurl != "" && err != nil {
if err != nil {
return opts, fmt.Errorf("expected start input to be purl but got an error parsing: %s", err)
}
return opts, fmt.Errorf("expected start input to be purl")
}

Expand Down

0 comments on commit 0423c59

Please sign in to comment.