From 78a49bd0efd44c3c767dff8ddad0f5f3ec1f26c6 Mon Sep 17 00:00:00 2001
From: kinarashah <kinara@rancher.com>
Date: Tue, 19 Nov 2019 11:12:09 -0800
Subject: [PATCH] vendor update norman

---
 go.mod                                                     | 2 +-
 go.sum                                                     | 6 ++----
 vendor/github.com/rancher/norman/httperror/error.go        | 7 +++++++
 .../github.com/rancher/norman/store/proxy/proxy_store.go   | 2 +-
 vendor/modules.txt                                         | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 39e9d73f..66d9bd57 100644
--- a/go.mod
+++ b/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/coreos/prometheus-operator v0.33.0
 	github.com/knative/pkg v0.0.0-20190817231834-12ee58e32cc8
 	github.com/pkg/errors v0.8.1
-	github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36
+	github.com/rancher/norman v0.0.0-20191119190041-530c6591c6fe
 	github.com/sirupsen/logrus v1.4.2
 	golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c // indirect
 	k8s.io/api v0.0.0
diff --git a/go.sum b/go.sum
index 69799643..c95e3d57 100644
--- a/go.sum
+++ b/go.sum
@@ -476,8 +476,8 @@ github.com/prometheus/tsdb v0.8.0/go.mod h1:fSI0j+IUQrDd7+ZtR9WKIGtoYAYAJUKcKhYL
 github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
 github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 h1:Xsxh7fX3+2wAUJtPy8g2lZh0cYuyifqhBL0vxCIYojs=
 github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U=
-github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36 h1:N0ZUBJRq/ydy2ULiuqKhmiKShmEtpDOWXxKzVZxTzHk=
-github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
+github.com/rancher/norman v0.0.0-20191119190041-530c6591c6fe h1:/kDZz8znCHJUzOVGv2+A5hbK0eSb5BXSQsKW1Xa2nH0=
+github.com/rancher/norman v0.0.0-20191119190041-530c6591c6fe/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
 github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e h1:j6+HqCET/NLPBtew2m5apL7jWw/PStQ7iGwXjgAqdvo=
 github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e/go.mod h1:XbYHTPaXuw8ZY9bylhYKQh/nJxDaTKk3YhAxPl4Qy/k=
 github.com/rancher/wrangler v0.1.5 h1:HiXOeP6Kci2DK+e04D1g6INT77xAYpAr54zmTTe0Spk=
@@ -678,8 +678,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac h1:MQEvx39qSf8vyrx3XRaOe+j1UDIzKwkYOVObRgGPVqI=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190926165942-a8d5d34286bd h1:L7bTtbmMojUZYEAt0OrTU0Z/KmN+uX195615ty32gkA=
-golang.org/x/tools v0.0.0-20190926165942-a8d5d34286bd/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c h1:IGkKhmfzcztjm6gYkykvu/NiS8kaqbCWAEWWAyf8J5U=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/vendor/github.com/rancher/norman/httperror/error.go b/vendor/github.com/rancher/norman/httperror/error.go
index 84938d6d..8ac835b4 100644
--- a/vendor/github.com/rancher/norman/httperror/error.go
+++ b/vendor/github.com/rancher/norman/httperror/error.go
@@ -120,3 +120,10 @@ func IsConflict(err error) bool {
 
 	return false
 }
+
+func IsForbidden(err error) bool {
+	if apiError, ok := err.(*APIError); ok {
+		return apiError.Code.Status == 403
+	}
+	return false
+}
diff --git a/vendor/github.com/rancher/norman/store/proxy/proxy_store.go b/vendor/github.com/rancher/norman/store/proxy/proxy_store.go
index ec9385c9..4b8e8895 100644
--- a/vendor/github.com/rancher/norman/store/proxy/proxy_store.go
+++ b/vendor/github.com/rancher/norman/store/proxy/proxy_store.go
@@ -317,7 +317,7 @@ func (s *Store) realWatch(apiContext *types.APIContext, schema *types.Schema, op
 		for event := range watcher.ResultChan() {
 			if data, ok := event.Object.(*metav1.Status); ok {
 				// just logging it, keeping the same behavior as before
-				logrus.Errorf("watcher error %s", data.Message)
+				logrus.Debugf("watcher status for %s: %s", schema.ID, data.Message)
 			} else {
 				data := event.Object.(*unstructured.Unstructured)
 				s.fromInternal(apiContext, schema, data.Object)
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 80143cac..947915f5 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -84,7 +84,7 @@ github.com/prometheus/procfs
 github.com/prometheus/procfs/nfs
 github.com/prometheus/procfs/xfs
 github.com/prometheus/procfs/internal/util
-# github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36
+# github.com/rancher/norman v0.0.0-20191119190041-530c6591c6fe
 github.com/rancher/norman/controller
 github.com/rancher/norman/lifecycle
 github.com/rancher/norman/objectclient