Skip to content
This repository has been archived by the owner on Jun 19, 2022. It is now read-only.

Commit

Permalink
Better ingress error message on permission denied (#1666)
Browse files Browse the repository at this point in the history
  • Loading branch information
cathyzhyi authored Sep 3, 2020
1 parent 10a6cf4 commit b0e7371
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions pkg/broker/ingress/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import (
"github.com/google/wire"
"go.opencensus.io/trace"
"go.uber.org/zap"
grpccode "google.golang.org/grpc/codes"
grpcstatus "google.golang.org/grpc/status"
"k8s.io/apimachinery/pkg/types"
"knative.dev/eventing/pkg/kncloudevents"
"knative.dev/eventing/pkg/logging"
Expand All @@ -52,6 +54,11 @@ const (

// For probes.
heathCheckPath = "/healthz"

// for permission denied error msg
// TODO(cathyzhyi) point to official doc rather than github doc
deniedErrMsg string = `Failed to publish to PubSub because permission denied.
Please refer to "Configure the Authentication Mechanism for GCP" at https://github.com/google/knative-gcp/blob/master/docs/install/install-gcp-broker.md`
)

// HandlerSet provides a handler with a real HTTPMessageReceiver and pubsub MultiTopicDecoupleSink.
Expand Down Expand Up @@ -160,10 +167,15 @@ func (h *Handler) ServeHTTP(response nethttp.ResponseWriter, request *nethttp.Re
if res := h.decouple.Send(ctx, broker, *event); !cev2.IsACK(res) {
logging.FromContext(ctx).Error("Error publishing to PubSub", zap.String("broker", broker.String()), zap.Error(res))
statusCode = nethttp.StatusInternalServerError
if errors.Is(res, ErrNotFound) {

switch {
case errors.Is(res, ErrNotFound):
statusCode = nethttp.StatusNotFound
} else if errors.Is(res, ErrNotReady) {
case errors.Is(res, ErrNotReady):
statusCode = nethttp.StatusServiceUnavailable
case grpcstatus.Code(res) == grpccode.PermissionDenied:
nethttp.Error(response, deniedErrMsg, statusCode)
return
}
nethttp.Error(response, "Failed to publish to PubSub", statusCode)
return
Expand Down

0 comments on commit b0e7371

Please sign in to comment.