diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 324175d295..54a8f3c2f3 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -89,11 +89,11 @@ $(PROTOC_GEN_MICRO): $(BINGO_DIR)/protoc-gen-micro.mod @echo "(re)installing $(GOBIN)/protoc-gen-micro-v1.0.0" @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-micro.mod -o=$(GOBIN)/protoc-gen-micro-v1.0.0 "github.com/go-micro/generator/cmd/protoc-gen-micro" -PROTOC_GEN_MICROWEB := $(GOBIN)/protoc-gen-microweb-v0.0.0-20220407065143-a4a3e07bbb7c +PROTOC_GEN_MICROWEB := $(GOBIN)/protoc-gen-microweb-v0.0.0-20220808092353-b5d6c3960e19 $(PROTOC_GEN_MICROWEB): $(BINGO_DIR)/protoc-gen-microweb.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/protoc-gen-microweb-v0.0.0-20220407065143-a4a3e07bbb7c" - @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-microweb.mod -o=$(GOBIN)/protoc-gen-microweb-v0.0.0-20220407065143-a4a3e07bbb7c "github.com/owncloud/protoc-gen-microweb" + @echo "(re)installing $(GOBIN)/protoc-gen-microweb-v0.0.0-20220808092353-b5d6c3960e19" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-microweb.mod -o=$(GOBIN)/protoc-gen-microweb-v0.0.0-20220808092353-b5d6c3960e19 "github.com/owncloud/protoc-gen-microweb" PROTOC_GEN_OPENAPIV2 := $(GOBIN)/protoc-gen-openapiv2-v2.10.0 $(PROTOC_GEN_OPENAPIV2): $(BINGO_DIR)/protoc-gen-openapiv2.mod diff --git a/.bingo/protoc-gen-microweb.mod b/.bingo/protoc-gen-microweb.mod index 0fbb47f4ad..339b0e4858 100644 --- a/.bingo/protoc-gen-microweb.mod +++ b/.bingo/protoc-gen-microweb.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.17 -require github.com/owncloud/protoc-gen-microweb v0.0.0-20220407065143-a4a3e07bbb7c +require github.com/owncloud/protoc-gen-microweb v0.0.0-20220808092353-b5d6c3960e19 diff --git a/.bingo/protoc-gen-microweb.sum b/.bingo/protoc-gen-microweb.sum index 476628c9b4..df4318c6bd 100644 --- a/.bingo/protoc-gen-microweb.sum +++ b/.bingo/protoc-gen-microweb.sum @@ -261,6 +261,8 @@ github.com/owncloud/protoc-gen-microweb v0.0.0-20211219183901-997c02cae878 h1:rg github.com/owncloud/protoc-gen-microweb v0.0.0-20211219183901-997c02cae878/go.mod h1:FnVsgi9o7QljV0o82CEqgNzRu4FBtDbx0Fl1Bm39vWQ= github.com/owncloud/protoc-gen-microweb v0.0.0-20220407065143-a4a3e07bbb7c h1:zfcwaNIl2ULSwJguxR+IBp1SqJQHYYsQ3oB3ZSipgCg= github.com/owncloud/protoc-gen-microweb v0.0.0-20220407065143-a4a3e07bbb7c/go.mod h1:Tj4b1L5vKN7saayN2uqAKIchkm76R80HViLmZvZP2d0= +github.com/owncloud/protoc-gen-microweb v0.0.0-20220808092353-b5d6c3960e19 h1:ByaZQEfVxPAKlZAS+i0RsXqcLBGLFVu4dTp4lNOZDts= +github.com/owncloud/protoc-gen-microweb v0.0.0-20220808092353-b5d6c3960e19/go.mod h1:Tj4b1L5vKN7saayN2uqAKIchkm76R80HViLmZvZP2d0= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= diff --git a/.bingo/variables.env b/.bingo/variables.env index 507db71fda..baa1809bbf 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -32,7 +32,7 @@ PROTOC_GEN_GO="${GOBIN}/protoc-gen-go-v1.28.0" PROTOC_GEN_MICRO="${GOBIN}/protoc-gen-micro-v1.0.0" -PROTOC_GEN_MICROWEB="${GOBIN}/protoc-gen-microweb-v0.0.0-20220407065143-a4a3e07bbb7c" +PROTOC_GEN_MICROWEB="${GOBIN}/protoc-gen-microweb-v0.0.0-20220808092353-b5d6c3960e19" PROTOC_GEN_OPENAPIV2="${GOBIN}/protoc-gen-openapiv2-v2.10.0" diff --git a/protogen/gen/ocis/services/search/v0/search.pb.web.go b/protogen/gen/ocis/services/search/v0/search.pb.web.go index 427033152b..a6a5842fec 100644 --- a/protogen/gen/ocis/services/search/v0/search.pb.web.go +++ b/protogen/gen/ocis/services/search/v0/search.pb.web.go @@ -11,6 +11,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" "github.com/golang/protobuf/jsonpb" + merrors "go-micro.dev/v4/errors" ) type webSearchProviderHandler struct { @@ -36,7 +37,11 @@ func (h *webSearchProviderHandler) Search(w http.ResponseWriter, r *http.Request req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -58,7 +63,11 @@ func (h *webSearchProviderHandler) IndexSpace(w http.ResponseWriter, r *http.Req req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -99,7 +108,11 @@ func (h *webIndexProviderHandler) Search(w http.ResponseWriter, r *http.Request) req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } diff --git a/protogen/gen/ocis/services/settings/v0/settings.pb.web.go b/protogen/gen/ocis/services/settings/v0/settings.pb.web.go index bcad905cce..ef8718f98f 100644 --- a/protogen/gen/ocis/services/settings/v0/settings.pb.web.go +++ b/protogen/gen/ocis/services/settings/v0/settings.pb.web.go @@ -11,6 +11,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" "github.com/golang/protobuf/jsonpb" + merrors "go-micro.dev/v4/errors" ptypesempty "github.com/golang/protobuf/ptypes/empty" ) @@ -38,7 +39,11 @@ func (h *webBundleServiceHandler) SaveBundle(w http.ResponseWriter, r *http.Requ req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -60,7 +65,11 @@ func (h *webBundleServiceHandler) GetBundle(w http.ResponseWriter, r *http.Reque req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -82,7 +91,11 @@ func (h *webBundleServiceHandler) ListBundles(w http.ResponseWriter, r *http.Req req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -104,7 +117,11 @@ func (h *webBundleServiceHandler) AddSettingToBundle(w http.ResponseWriter, r *h req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -126,7 +143,11 @@ func (h *webBundleServiceHandler) RemoveSettingFromBundle(w http.ResponseWriter, req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -170,7 +191,11 @@ func (h *webValueServiceHandler) SaveValue(w http.ResponseWriter, r *http.Reques req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -192,7 +217,11 @@ func (h *webValueServiceHandler) GetValue(w http.ResponseWriter, r *http.Request req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -214,7 +243,11 @@ func (h *webValueServiceHandler) ListValues(w http.ResponseWriter, r *http.Reque req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -236,7 +269,11 @@ func (h *webValueServiceHandler) GetValueByUniqueIdentifiers(w http.ResponseWrit req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -279,7 +316,11 @@ func (h *webRoleServiceHandler) ListRoles(w http.ResponseWriter, r *http.Request req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -301,7 +342,11 @@ func (h *webRoleServiceHandler) ListRoleAssignments(w http.ResponseWriter, r *ht req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -323,7 +368,11 @@ func (h *webRoleServiceHandler) AssignRoleToUser(w http.ResponseWriter, r *http. req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -345,7 +394,11 @@ func (h *webRoleServiceHandler) RemoveRoleFromUser(w http.ResponseWriter, r *htt req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -388,7 +441,11 @@ func (h *webPermissionServiceHandler) ListPermissionsByResource(w http.ResponseW req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } @@ -410,7 +467,11 @@ func (h *webPermissionServiceHandler) GetPermissionByID(w http.ResponseWriter, r req, resp, ); err != nil { - http.Error(w, err.Error(), http.StatusBadRequest) + if merr, ok := merrors.As(err); ok && merr.Code == http.StatusNotFound { + http.Error(w, err.Error(), http.StatusNotFound) + } else { + http.Error(w, err.Error(), http.StatusBadRequest) + } return } diff --git a/protogen/gen/ocis/services/store/v0/store.pb.micro.go b/protogen/gen/ocis/services/store/v0/store.pb.micro.go index ed25b47564..5312134566 100644 --- a/protogen/gen/ocis/services/store/v0/store.pb.micro.go +++ b/protogen/gen/ocis/services/store/v0/store.pb.micro.go @@ -104,6 +104,7 @@ type Store_ListService interface { Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error + CloseSend() error Close() error Recv() (*ListResponse, error) } @@ -112,6 +113,10 @@ type storeServiceList struct { stream client.Stream } +func (x *storeServiceList) CloseSend() error { + return x.stream.CloseSend() +} + func (x *storeServiceList) Close() error { return x.stream.Close() }