From 3ead57e3c0cbc0470e519c7363c27d3bc355f132 Mon Sep 17 00:00:00 2001 From: ko_oler <kooler89@gmail.com> Date: Thu, 13 Apr 2023 16:41:35 +0300 Subject: [PATCH] fix --- pkg/files/transport/client.microgen.go | 2 +- pkg/files/transport/exchanges.microgen.go | 2 +- pkg/files/transport/grpc/client.microgen.go | 2 +- .../protobuf_endpoint_converters.microgen.go | 4 +- .../grpc/protobuf_type_converters.microgen.go | 2 +- pkg/files/transport/grpc/server.microgen.go | 2 +- pkg/files/transport/http/server.go | 41 ------------------- pkg/files/transport/server.microgen.go | 2 +- 8 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 pkg/files/transport/http/server.go diff --git a/pkg/files/transport/client.microgen.go b/pkg/files/transport/client.microgen.go index e576fb7a..64272362 100644 --- a/pkg/files/transport/client.microgen.go +++ b/pkg/files/transport/client.microgen.go @@ -5,7 +5,7 @@ package transport import ( "context" "errors" - files "git.perx.ru/perxis/perxis/services/files" + files "git.perx.ru/perxis/perxis-go/pkg/files" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" ) diff --git a/pkg/files/transport/exchanges.microgen.go b/pkg/files/transport/exchanges.microgen.go index 7f211c4b..df9a4782 100644 --- a/pkg/files/transport/exchanges.microgen.go +++ b/pkg/files/transport/exchanges.microgen.go @@ -2,7 +2,7 @@ package transport -import files "git.perx.ru/perxis/perxis/services/files" +import files "git.perx.ru/perxis/perxis-go/pkg/files" type ( StartUploadRequest struct { diff --git a/pkg/files/transport/grpc/client.microgen.go b/pkg/files/transport/grpc/client.microgen.go index 5a9fdcb8..0b373ba8 100644 --- a/pkg/files/transport/grpc/client.microgen.go +++ b/pkg/files/transport/grpc/client.microgen.go @@ -3,8 +3,8 @@ package transportgrpc import ( + transport "git.perx.ru/perxis/perxis-go/pkg/files/transport" pb "git.perx.ru/perxis/perxis-go/proto/files" - transport "git.perx.ru/perxis/perxis/services/files/transport" grpckit "github.com/go-kit/kit/transport/grpc" empty "github.com/golang/protobuf/ptypes/empty" grpc "google.golang.org/grpc" diff --git a/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go index fe10ff27..6168318d 100644 --- a/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go +++ b/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go @@ -7,9 +7,9 @@ import ( "context" "errors" + "git.perx.ru/perxis/perxis-go/pkg/files" + "git.perx.ru/perxis/perxis-go/pkg/files/transport" pb "git.perx.ru/perxis/perxis-go/proto/files" - "git.perx.ru/perxis/perxis/services/files" - "git.perx.ru/perxis/perxis/services/files/transport" empty "github.com/golang/protobuf/ptypes/empty" ) diff --git a/pkg/files/transport/grpc/protobuf_type_converters.microgen.go b/pkg/files/transport/grpc/protobuf_type_converters.microgen.go index 812c21d6..1240f9fc 100644 --- a/pkg/files/transport/grpc/protobuf_type_converters.microgen.go +++ b/pkg/files/transport/grpc/protobuf_type_converters.microgen.go @@ -5,8 +5,8 @@ package transportgrpc import ( + "git.perx.ru/perxis/perxis-go/pkg/files" pb "git.perx.ru/perxis/perxis-go/proto/files" - "git.perx.ru/perxis/perxis/services/files" ) func PtrMultipartUploadToProto(upload *files.MultipartUpload) (*pb.MultipartUpload, error) { diff --git a/pkg/files/transport/grpc/server.microgen.go b/pkg/files/transport/grpc/server.microgen.go index 7f08a8d9..c4fb6cd1 100644 --- a/pkg/files/transport/grpc/server.microgen.go +++ b/pkg/files/transport/grpc/server.microgen.go @@ -4,8 +4,8 @@ package transportgrpc import ( + transport "git.perx.ru/perxis/perxis-go/pkg/files/transport" pb "git.perx.ru/perxis/perxis-go/proto/files" - transport "git.perx.ru/perxis/perxis/services/files/transport" grpc "github.com/go-kit/kit/transport/grpc" empty "github.com/golang/protobuf/ptypes/empty" context "golang.org/x/net/context" diff --git a/pkg/files/transport/http/server.go b/pkg/files/transport/http/server.go deleted file mode 100644 index 644cb621..00000000 --- a/pkg/files/transport/http/server.go +++ /dev/null @@ -1,41 +0,0 @@ -package transporthttp - -import ( - "context" - "net/http" - - "git.perx.ru/perxis/perxis/internal/urlsigner" - "git.perx.ru/perxis/perxis/services/files" - "github.com/gorilla/mux" -) - -func NewHTTPHandler(fs files.Files, s urlsigner.URLSigner) http.Handler { - m := mux.NewRouter() - m.Methods("GET"). - Path("/{id}"). - HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if !s.Check(r.URL) { - w.WriteHeader(http.StatusForbidden) - return - } - w.Header().Set("Content-Type", "text/html; charset=utf-8") - - f := &files.File{ - ID: mux.Vars(r)["id"], - } - res, err := fs.GetFile(context.Background(), f) - if err != nil { - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(err.Error())) - return - } - - if res == nil || res.URL == "" { - w.WriteHeader(http.StatusNotFound) - return - } - w.Header().Set("Location", res.URL) - w.WriteHeader(http.StatusMovedPermanently) - }) - return m -} diff --git a/pkg/files/transport/server.microgen.go b/pkg/files/transport/server.microgen.go index 8eece994..90c16c7f 100644 --- a/pkg/files/transport/server.microgen.go +++ b/pkg/files/transport/server.microgen.go @@ -4,7 +4,7 @@ package transport import ( "context" - files "git.perx.ru/perxis/perxis/services/files" + files "git.perx.ru/perxis/perxis-go/pkg/files" endpoint "github.com/go-kit/kit/endpoint" ) -- GitLab