gerrit: switch to a generic NotExist error
...and notice that only the one I just added is being used...
For golang/go#51797.
Change-Id: If62d643c2a0524231e88f1cde2cd4c980e63dd57
Reviewed-on: https://go-review.googlesource.com/c/build/+/411896
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Heschi Kreinick <heschi@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/gerrit/gerrit.go b/gerrit/gerrit.go
index e6e31d0..e62dadc 100644
--- a/gerrit/gerrit.go
+++ b/gerrit/gerrit.go
@@ -57,6 +57,10 @@
return http.DefaultClient
}
+// ErrResourceNotExist is returned when the requested resource doesn't exist.
+// It is only for use with errors.Is.
+var ErrResourceNotExist = errors.New("gerrit: requested resource does not exist")
+
// HTTPError is the error type returned when a Gerrit API call does not return
// the expected status.
type HTTPError struct {
@@ -69,6 +73,10 @@
return fmt.Sprintf("HTTP status %s on request to %s; %s", e.Res.Status, e.Res.Request.URL, e.Body)
}
+func (e *HTTPError) Is(target error) bool {
+ return target == ErrResourceNotExist && e.Res.StatusCode == http.StatusNotFound
+}
+
// doArg is an optional argument for the Client.do method.
type doArg interface {
isDoArg()
@@ -463,7 +471,6 @@
// GetChange returns information about a single change.
// For the API call, see https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#get-change
-// If the change doesn't exist, the error will be ErrChangeNotExist.
func (c *Client) GetChange(ctx context.Context, changeID string, opts ...QueryChangesOpt) (*ChangeInfo, error) {
var opt QueryChangesOpt
switch len(opts) {
@@ -478,9 +485,6 @@
"n": condInt(opt.N),
"o": opt.Fields,
})
- if he, ok := err.(*HTTPError); ok && he.Res.StatusCode == 404 {
- return nil, ErrChangeNotExist
- }
return &change, err
}
@@ -774,24 +778,10 @@
return c.do(ctx, nil, "POST", "/changes/"+changeID+"/edit:publish", wantResStatus(http.StatusNoContent))
}
-// ErrXNotExist is returned when the requested X doesn't exist.
-// It is not necessarily returned unless a method is documented as
-// returning it.
-var (
- ErrProjectNotExist = errors.New("gerrit: requested project does not exist")
- ErrChangeNotExist = errors.New("gerrit: requested change does not exist")
- ErrTagNotExist = errors.New("gerrit: requested tag does not exist")
- ErrBranchNotExist = errors.New("gerrit: requested branch does not exist")
-)
-
// GetProjectInfo returns info about a project.
-// If the project doesn't exist, the error will be ErrProjectNotExist.
func (c *Client) GetProjectInfo(ctx context.Context, name string) (ProjectInfo, error) {
var res ProjectInfo
err := c.do(ctx, &res, "GET", fmt.Sprintf("/projects/%s", name))
- if he, ok := err.(*HTTPError); ok && he.Res.StatusCode == 404 {
- return res, ErrProjectNotExist
- }
return res, err
}
@@ -818,16 +808,12 @@
return m, nil
}
-// GetBranch gets a particular branch in project. If the branch doesn't exist, the
-// error will be ErrBranchNotExist.
+// GetBranch gets a particular branch in project.
//
// See https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#get-branch.
func (c *Client) GetBranch(ctx context.Context, project, branch string) (BranchInfo, error) {
var res BranchInfo
err := c.do(ctx, &res, "GET", fmt.Sprintf("/projects/%s/branches/%s", project, branch))
- if he, ok := err.(*HTTPError); ok && he.Res.StatusCode == 404 {
- return BranchInfo{}, ErrBranchNotExist
- }
return res, err
}
@@ -896,16 +882,12 @@
return m, nil
}
-// GetTag returns a particular tag on project. If the tag doesn't exist, the
-// error will be ErrTagNotExist.
+// GetTag returns a particular tag on project.
//
// See https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#get-tag.
func (c *Client) GetTag(ctx context.Context, project, tag string) (TagInfo, error) {
var res TagInfo
err := c.do(ctx, &res, "GET", fmt.Sprintf("/projects/%s/tags/%s", project, tag))
- if he, ok := err.(*HTTPError); ok && he.Res.StatusCode == 404 {
- return TagInfo{}, ErrTagNotExist
- }
return res, err
}
diff --git a/gerrit/gerrit_test.go b/gerrit/gerrit_test.go
index 2ec6016..e865667 100644
--- a/gerrit/gerrit_test.go
+++ b/gerrit/gerrit_test.go
@@ -6,6 +6,7 @@
import (
"context"
+ "errors"
"io"
"net/http"
"net/http/httptest"
@@ -69,8 +70,8 @@
defer s.Close()
c := NewClient(s.URL, NoAuth)
_, err := c.GetProjectInfo(context.Background(), "unknown")
- if err != ErrProjectNotExist {
- t.Errorf("expected to get ErrProjectNotExist, got %v", err)
+ if !errors.Is(err, ErrResourceNotExist) {
+ t.Errorf("expected to get ErrResourceNotExist, got %v", err)
}
}
@@ -176,8 +177,8 @@
if !hitServer {
t.Errorf("expected to hit test server, didn't")
}
- if err != ErrChangeNotExist {
- t.Errorf("expected ErrChangeNotExist, got %v", err)
+ if !errors.Is(err, ErrResourceNotExist) {
+ t.Errorf("expected ErrResourceNotExist, got %v", err)
}
}
diff --git a/internal/task/gerrit.go b/internal/task/gerrit.go
index b15a794..21d7ec5 100644
--- a/internal/task/gerrit.go
+++ b/internal/task/gerrit.go
@@ -2,6 +2,7 @@
import (
"context"
+ "errors"
"fmt"
"strings"
"time"
@@ -93,7 +94,7 @@
func (c *RealGerritClient) Tag(ctx context.Context, project, tag, commit string) error {
info, err := c.Client.GetTag(ctx, project, tag)
- if err != nil && err != gerrit.ErrTagNotExist {
+ if err != nil && !errors.Is(err, gerrit.ErrResourceNotExist) {
return fmt.Errorf("checking if tag already exists: %v", err)
}
if err == nil {
