Merge pull request #3310 from rikatz/implement-error-checker

vmware · Dec 11, 2023 · e54d539 · e54d539
2 parents 72fe969 + 980d22d
commit e54d539
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/vapi/rest/client.go b/vapi/rest/client.go
@@ -155,6 +155,14 @@ func (e *statusError) Error() string {
 	return fmt.Sprintf("%s %s: %s", e.res.Request.Method, e.res.Request.URL, e.res.Status)
 }
 
+func IsStatusError(err error, code int) bool {
+	statusErr, ok := err.(*statusError)
+	if !ok || statusErr == nil || statusErr.res == nil {
+		return false
+	}
+	return statusErr.res.StatusCode == code
+}
+
 // RawResponse may be used with the Do method as the resBody argument in order
 // to capture the raw response data.
 type RawResponse struct {

diff --git a/vapi/rest/client_test.go b/vapi/rest/client_test.go
@@ -27,9 +27,8 @@ import (
 	"github.com/vmware/govmomi/simulator"
 	"github.com/vmware/govmomi/vapi/internal"
 	"github.com/vmware/govmomi/vapi/rest"
-	"github.com/vmware/govmomi/vim25"
-
 	_ "github.com/vmware/govmomi/vapi/simulator"
+	"github.com/vmware/govmomi/vim25"
 )
 
 func TestSession(t *testing.T) {
@@ -58,6 +57,12 @@ func TestSession(t *testing.T) {
 		if session == nil {
 			t.Fatal("expected non-nil session")
 		}
+
+		path := c.Resource("/xpto/bla")
+		err = c.Do(ctx, path.Request(http.MethodGet), nil)
+		if !rest.IsStatusError(err, http.StatusNotFound) {
+			t.Fatal("expecting error to be 'StatusNotFound'", err)
+		}
 	})
 }