Compare commits
8 commits
8bc961e1be
...
efd0924c60
| Author | SHA1 | Date | |
|---|---|---|---|
|
efd0924c60 | ||
|
|
a995f4c75a | ||
|
|
d5610fbb30 | ||
|
|
79d9ae5ab5 | ||
|
|
d690b2c162 | ||
|
|
875e4eefbd | ||
|
|
5761bf88c6 | ||
|
|
d146541088 |
17 changed files with 391 additions and 318 deletions
18
cmd/main.go
18
cmd/main.go
|
|
@ -7,15 +7,18 @@ import (
|
|||
"imageStorage/config"
|
||||
"imageStorage/internal/app"
|
||||
"imageStorage/internal/convert"
|
||||
"imageStorage/internal/httpDelivery"
|
||||
"imageStorage/internal/mainHandler"
|
||||
"imageStorage/internal/router"
|
||||
"imageStorage/internal/utils"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
func main() {
|
||||
//c := config.NewConfig()
|
||||
c := config.DevConfig()
|
||||
c := config.NewConfig()
|
||||
//c := config.DevConfig()
|
||||
config.LogSetup(c.App.LogLevel)
|
||||
log.Infof("Log level: %s", c.App.LogLevel)
|
||||
|
||||
|
|
@ -27,14 +30,25 @@ func main() {
|
|||
ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||
defer cancel()
|
||||
|
||||
u := utils.NewHandler(c.App.Domain, c.App.Volume)
|
||||
|
||||
r := router.SetRouter("debug")
|
||||
mainRoute := r.Group("/")
|
||||
|
||||
delivery := httpDelivery.NewHandler(u)
|
||||
delivery.RegisterRoutes(mainRoute)
|
||||
|
||||
converter := convert.NewHandler()
|
||||
imageServerHandler := mainHandler.NewHandler(mainHandler.Deps{
|
||||
Converter: converter,
|
||||
Volume: c.App.Volume,
|
||||
Utils: u,
|
||||
})
|
||||
|
||||
a := app.NewApp(app.Deps{
|
||||
Config: c,
|
||||
GrpcServer: imageServerHandler,
|
||||
HttpServer: r,
|
||||
})
|
||||
|
||||
if err := a.Start(ctx); err != nil {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package config
|
||||
|
||||
import "strings"
|
||||
|
||||
type Config struct {
|
||||
App AppConfig
|
||||
}
|
||||
|
|
@ -19,9 +21,13 @@ func NewConfig() *Config {
|
|||
Host: getEnv("HOST", ""),
|
||||
HttpPort: getEnv("HTTP_PORT", ""),
|
||||
GrpcPort: getEnv("GRPC_PORT", ""),
|
||||
Domain: getEnv("DOMAIN", ""),
|
||||
Domain: formatDomain(getEnv("DOMAIN", "")),
|
||||
Volume: getEnv("VOLUME", ""),
|
||||
LogLevel: getEnv("LOG_LEVEL", ""),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func formatDomain(domain string) string {
|
||||
return strings.TrimRight(domain, "/")
|
||||
}
|
||||
|
|
|
|||
33
go.mod
33
go.mod
|
|
@ -4,15 +4,44 @@ go 1.25.3
|
|||
|
||||
require (
|
||||
github.com/davidbyttow/govips/v2 v2.16.0
|
||||
github.com/gin-gonic/gin v1.11.0
|
||||
github.com/sirupsen/logrus v1.9.3
|
||||
google.golang.org/grpc v1.76.0
|
||||
google.golang.org/protobuf v1.36.10
|
||||
)
|
||||
|
||||
require (
|
||||
golang.org/x/image v0.18.0 // indirect
|
||||
github.com/bytedance/gopkg v0.1.3 // indirect
|
||||
github.com/bytedance/sonic v1.14.1 // indirect
|
||||
github.com/bytedance/sonic/loader v0.3.0 // indirect
|
||||
github.com/cloudwego/base64x v0.1.6 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.10 // indirect
|
||||
github.com/gin-contrib/sse v1.1.0 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
github.com/go-playground/validator/v10 v10.28.0 // indirect
|
||||
github.com/goccy/go-json v0.10.5 // indirect
|
||||
github.com/goccy/go-yaml v1.18.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
|
||||
github.com/leodido/go-urn v1.4.0 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
||||
github.com/quic-go/qpack v0.5.1 // indirect
|
||||
github.com/quic-go/quic-go v0.55.0 // indirect
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||
github.com/ugorji/go/codec v1.3.0 // indirect
|
||||
go.uber.org/mock v0.6.0 // indirect
|
||||
golang.org/x/arch v0.22.0 // indirect
|
||||
golang.org/x/crypto v0.43.0 // indirect
|
||||
golang.org/x/image v0.32.0 // indirect
|
||||
golang.org/x/mod v0.29.0 // indirect
|
||||
golang.org/x/net v0.46.0 // indirect
|
||||
golang.org/x/sync v0.17.0 // indirect
|
||||
golang.org/x/sys v0.37.0 // indirect
|
||||
golang.org/x/text v0.30.0 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20251020155222-88f65dc88635 // indirect
|
||||
golang.org/x/tools v0.38.0 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
|
||||
)
|
||||
|
|
|
|||
82
go.sum
82
go.sum
|
|
@ -1,30 +1,87 @@
|
|||
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
|
||||
github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
|
||||
github.com/bytedance/sonic v1.14.1 h1:FBMC0zVz5XUmE4z9wF4Jey0An5FueFvOsTKKKtwIl7w=
|
||||
github.com/bytedance/sonic v1.14.1/go.mod h1:gi6uhQLMbTdeP0muCnrjHLeCUPyb70ujhnNlhOylAFc=
|
||||
github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
|
||||
github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
|
||||
github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
|
||||
github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davidbyttow/govips/v2 v2.16.0 h1:1nH/Rbx8qZP1hd+oYL9fYQjAnm1+KorX9s07ZGseQmo=
|
||||
github.com/davidbyttow/govips/v2 v2.16.0/go.mod h1:clH5/IDVmG5eVyc23qYpyi7kmOT0B/1QNTKtci4RkyM=
|
||||
github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
|
||||
github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
|
||||
github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
|
||||
github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
|
||||
github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk=
|
||||
github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls=
|
||||
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
||||
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
||||
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
|
||||
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
|
||||
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
|
||||
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
|
||||
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
|
||||
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
||||
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
||||
github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
|
||||
github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
|
||||
github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
|
||||
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
||||
github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
|
||||
github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
|
||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
|
||||
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
|
||||
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
|
||||
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
|
||||
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
|
||||
github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
|
||||
github.com/quic-go/quic-go v0.55.0 h1:zccPQIqYCXDt5NmcEabyYvOnomjs8Tlwl7tISjJh9Mk=
|
||||
github.com/quic-go/quic-go v0.55.0/go.mod h1:DR51ilwU1uE164KuWXhinFcKWGlEjzys2l8zUl5Ss1U=
|
||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
||||
github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
|
||||
github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
|
||||
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
|
||||
|
|
@ -38,18 +95,27 @@ go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFh
|
|||
go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
|
||||
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
|
||||
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
|
||||
go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
|
||||
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
|
||||
golang.org/x/arch v0.22.0 h1:c/Zle32i5ttqRXjdLyyHZESLD/bB90DCU1g9l/0YBDI=
|
||||
golang.org/x/arch v0.22.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
|
||||
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
|
||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||
golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
|
||||
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
|
||||
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
|
||||
golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
|
||||
golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ=
|
||||
golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
|
||||
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||
|
|
@ -66,6 +132,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|||
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
|
||||
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
|
|
@ -73,6 +141,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
|
|
@ -104,16 +173,19 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
|
|||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
||||
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
||||
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
|
||||
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
|
||||
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20251020155222-88f65dc88635 h1:3uycTxukehWrxH4HtPRtn1PDABTU331ViDjyqrUbaog=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20251020155222-88f65dc88635/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 h1:M1rk8KBnUsBDg1oPGHNCxG4vc1f49epmTO7xscSajMk=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
|
||||
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
|
||||
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
|
||||
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
|
||||
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
|
|
|||
|
|
@ -2,32 +2,49 @@ package app
|
|||
|
||||
import (
|
||||
"context"
|
||||
"github.com/gin-gonic/gin"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"google.golang.org/grpc"
|
||||
"imageStorage/config"
|
||||
"net"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
||||
type App struct {
|
||||
config *config.Config
|
||||
grpcServer *grpc.Server
|
||||
httpServer *gin.Engine
|
||||
httpServerAddr string
|
||||
}
|
||||
|
||||
type Deps struct {
|
||||
Config *config.Config
|
||||
GrpcServer *grpc.Server
|
||||
HttpServer *gin.Engine
|
||||
}
|
||||
|
||||
func NewApp(deps Deps) *App {
|
||||
return &App{
|
||||
config: deps.Config,
|
||||
grpcServer: deps.GrpcServer,
|
||||
httpServer: deps.HttpServer,
|
||||
}
|
||||
}
|
||||
|
||||
func (app *App) Start(ctx context.Context) error {
|
||||
serverErr := make(chan error, 1)
|
||||
|
||||
addr := app.config.App.Host + ":" + app.config.App.HttpPort
|
||||
server := &http.Server{
|
||||
Handler: app.httpServer,
|
||||
Addr: addr,
|
||||
}
|
||||
go func() {
|
||||
log.Info("Starting server on: ", addr)
|
||||
serverErr <- server.ListenAndServe()
|
||||
}()
|
||||
|
||||
endpoint := net.JoinHostPort(app.config.App.Host, app.config.App.GrpcPort)
|
||||
go func() {
|
||||
listener, err := net.Listen("tcp", endpoint)
|
||||
|
|
|
|||
63
internal/httpDelivery/controller.go
Normal file
63
internal/httpDelivery/controller.go
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
package httpDelivery
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"github.com/gin-gonic/gin"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
type controller struct {
|
||||
service *service
|
||||
}
|
||||
|
||||
func newController(s *service) *controller {
|
||||
return &controller{
|
||||
service: s,
|
||||
}
|
||||
}
|
||||
|
||||
func (h *Handler) RegisterRoutes(r *gin.RouterGroup) {
|
||||
merchImages := r.Group("/merchImages")
|
||||
merchImages.GET("/:userUuid/:merchUuid", h.controller.GetImage)
|
||||
log.Debug("Image delivery | Register routes")
|
||||
}
|
||||
|
||||
func (co *controller) GetImage(c *gin.Context) {
|
||||
userUuid := c.Param("userUuid")
|
||||
merchUuid := c.Param("merchUuid")
|
||||
imgType := c.Query("type")
|
||||
|
||||
if userUuid == "" || merchUuid == "" || imgType == "" {
|
||||
log.WithFields(log.Fields{
|
||||
"msg": "empty path/query param(s)",
|
||||
"userUuid": userUuid,
|
||||
"merchUuid": merchUuid,
|
||||
"imgType": imgType,
|
||||
}).Debug(logGetImage)
|
||||
c.AbortWithStatus(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if imgType != "thumbnail" && imgType != "full" {
|
||||
log.WithField("msg", "invalid image type").Debug(logGetImage)
|
||||
c.AbortWithStatus(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
link, err := co.service.GetImage(userUuid, merchUuid, imgType)
|
||||
if err != nil {
|
||||
if errors.Is(err, notFound) {
|
||||
log.WithField("msg", err.Error()).Debug(logGetImage)
|
||||
c.AbortWithStatus(http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
|
||||
log.WithField("msg", err.Error()).Debug(logGetImage)
|
||||
c.AbortWithStatus(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
log.WithField("msg", "success").Info(logGetImage)
|
||||
c.File(link)
|
||||
}
|
||||
18
internal/httpDelivery/handler.go
Normal file
18
internal/httpDelivery/handler.go
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
package httpDelivery
|
||||
|
||||
import "imageStorage/internal/interfaces"
|
||||
|
||||
type Handler struct {
|
||||
controller *controller
|
||||
service *service
|
||||
}
|
||||
|
||||
func NewHandler(utils interfaces.Utils) *Handler {
|
||||
s := newService(utils)
|
||||
c := newController(s)
|
||||
|
||||
return &Handler{
|
||||
controller: c,
|
||||
service: s,
|
||||
}
|
||||
}
|
||||
9
internal/httpDelivery/msg.go
Normal file
9
internal/httpDelivery/msg.go
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
package httpDelivery
|
||||
|
||||
import (
|
||||
"errors"
|
||||
)
|
||||
|
||||
const logGetImage = "Image delivery | Get image"
|
||||
|
||||
var notFound = errors.New("not found")
|
||||
32
internal/httpDelivery/service.go
Normal file
32
internal/httpDelivery/service.go
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
package httpDelivery
|
||||
|
||||
import (
|
||||
"imageStorage/internal/interfaces"
|
||||
"os"
|
||||
"path/filepath"
|
||||
)
|
||||
|
||||
type service struct {
|
||||
utils interfaces.Utils
|
||||
}
|
||||
|
||||
func newService(utils interfaces.Utils) *service {
|
||||
return &service{
|
||||
utils: utils,
|
||||
}
|
||||
}
|
||||
|
||||
func (s *service) GetImage(userUuid, merchUuid, imgType string) (string, error) {
|
||||
path := s.utils.MerchImageVolumePath(userUuid, merchUuid)
|
||||
file := s.utils.FilenameFromType(imgType)
|
||||
|
||||
fullPath := filepath.Join(path, file)
|
||||
|
||||
if _, err := os.Stat(fullPath); err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return "", notFound
|
||||
}
|
||||
return "", err
|
||||
}
|
||||
return fullPath, nil
|
||||
}
|
||||
7
internal/interfaces/utils.go
Normal file
7
internal/interfaces/utils.go
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
package interfaces
|
||||
|
||||
type Utils interface {
|
||||
MerchImageVolumePath(u, m string) string
|
||||
FilenameFromType(imgType string) string
|
||||
MerchImageURL(u, m, t string) string
|
||||
}
|
||||
|
|
@ -9,22 +9,22 @@ import (
|
|||
type ImageHandler struct {
|
||||
pb.UnimplementedImageStorageServer
|
||||
converter interfaces.Converter
|
||||
domain string
|
||||
volume string
|
||||
utils interfaces.Utils
|
||||
}
|
||||
|
||||
type Deps struct {
|
||||
Converter interfaces.Converter
|
||||
Domain string
|
||||
Volume string
|
||||
Utils interfaces.Utils
|
||||
}
|
||||
|
||||
func NewHandler(deps Deps) *grpc.Server {
|
||||
srv := grpc.NewServer()
|
||||
imgSrv := ImageHandler{
|
||||
converter: deps.Converter,
|
||||
domain: deps.Domain,
|
||||
volume: deps.Volume,
|
||||
utils: deps.Utils,
|
||||
}
|
||||
|
||||
pb.RegisterImageStorageServer(srv, &imgSrv)
|
||||
|
|
|
|||
|
|
@ -2,14 +2,12 @@ package mainHandler
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/status"
|
||||
"google.golang.org/protobuf/types/known/emptypb"
|
||||
pb "imageStorage/pkg/proto/imageStorage"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func (i *ImageHandler) UploadImage(ctx context.Context, req *pb.UploadMerchImageRequest) (*pb.UploadMerchImageResponse, error) {
|
||||
|
|
@ -17,20 +15,18 @@ func (i *ImageHandler) UploadImage(ctx context.Context, req *pb.UploadMerchImage
|
|||
return nil, status.Errorf(codes.InvalidArgument, "image data is empty")
|
||||
}
|
||||
|
||||
path := i._makeMerchImagePath(req.UserUuid, req.MerchUuid)
|
||||
path := i.utils.MerchImageVolumePath(req.UserUuid, req.MerchUuid)
|
||||
if err := os.MkdirAll(path, 0777); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
full := filepath.Join(path, "full.jpg")
|
||||
thumbnail := filepath.Join(path, "thumbnail.jpg")
|
||||
|
||||
fullFile, err := os.Create(full)
|
||||
fullFile, err := os.Create(filepath.Join(path, i.utils.FilenameFromType("full")))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer fullFile.Close()
|
||||
|
||||
thumbnailFile, err := os.Create(thumbnail)
|
||||
thumbnailFile, err := os.Create(filepath.Join(path, i.utils.FilenameFromType("thumbnail")))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -41,38 +37,15 @@ func (i *ImageHandler) UploadImage(ctx context.Context, req *pb.UploadMerchImage
|
|||
}
|
||||
|
||||
response := &pb.UploadMerchImageResponse{
|
||||
FullImage: i._makeMerchImageURL(req.UserUuid, req.MerchUuid, full),
|
||||
Thumbnail: i._makeMerchImageURL(req.UserUuid, req.MerchUuid, thumbnail),
|
||||
FullImage: i.utils.MerchImageURL(req.UserUuid, req.MerchUuid, "full"),
|
||||
Thumbnail: i.utils.MerchImageURL(req.UserUuid, req.MerchUuid, "thumbnail"),
|
||||
}
|
||||
|
||||
return response, nil
|
||||
}
|
||||
|
||||
func (i *ImageHandler) GetImage(ctx context.Context, req *pb.GetImageRequest) (*pb.GetImageResponse, error) {
|
||||
path := i._makeMerchImagePath(req.UserUuid, req.MerchUuid)
|
||||
unk := status.Error(codes.InvalidArgument, "unknown image type")
|
||||
|
||||
switch req.ImgType {
|
||||
case pb.ImageType_UNKNOWN:
|
||||
return nil, unk
|
||||
case pb.ImageType_FULL:
|
||||
return &pb.GetImageResponse{
|
||||
Url: fmt.Sprintf("%s/%s", i.domain, filepath.Join(path, "full.jpg")),
|
||||
Etag: "",
|
||||
}, nil
|
||||
case pb.ImageType_THUMBNAIL:
|
||||
return &pb.GetImageResponse{
|
||||
Url: fmt.Sprintf("%s/%s", i.domain, filepath.Join(path, "thumbnail.jpg")),
|
||||
Etag: "",
|
||||
}, nil
|
||||
|
||||
default:
|
||||
return nil, unk
|
||||
}
|
||||
}
|
||||
|
||||
func (i *ImageHandler) DeleteImage(ctx context.Context, req *pb.DeleteImageRequest) (*emptypb.Empty, error) {
|
||||
path := i._makeMerchImagePath(req.UserUuid, req.MerchUuid)
|
||||
path := i.utils.MerchImageVolumePath(req.UserUuid, req.MerchUuid)
|
||||
|
||||
entries, err := os.ReadDir(path)
|
||||
if err != nil {
|
||||
|
|
@ -93,12 +66,3 @@ func (i *ImageHandler) DeleteImage(ctx context.Context, req *pb.DeleteImageReque
|
|||
|
||||
return &emptypb.Empty{}, nil
|
||||
}
|
||||
|
||||
func (i *ImageHandler) _makeMerchImagePath(u, m string) string {
|
||||
return fmt.Sprintf("%s/merchImages/%s/%s", i.volume, u, m)
|
||||
}
|
||||
|
||||
func (i *ImageHandler) _makeMerchImageURL(u, m, n string) string {
|
||||
d := strings.TrimSuffix(i.domain, "/")
|
||||
return fmt.Sprintf("%s/merchImages/%s/%s/%s", d, u, m, n)
|
||||
}
|
||||
|
|
|
|||
29
internal/router/handler.go
Normal file
29
internal/router/handler.go
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
package router
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func SetRouter(mode string) *gin.Engine {
|
||||
if mode == "release" {
|
||||
gin.SetMode(gin.ReleaseMode)
|
||||
} else {
|
||||
gin.SetMode(gin.DebugMode)
|
||||
}
|
||||
|
||||
engine := gin.Default()
|
||||
if mode == "release" {
|
||||
err := engine.SetTrustedProxies([]string{"172.20.0.0/16"})
|
||||
if err != nil {
|
||||
log.WithError(err).Error("Router | Set proxies failed")
|
||||
}
|
||||
}
|
||||
|
||||
engine.NoRoute(func(c *gin.Context) {
|
||||
c.Status(http.StatusForbidden)
|
||||
})
|
||||
|
||||
return engine
|
||||
}
|
||||
50
internal/utils/handler.go
Normal file
50
internal/utils/handler.go
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
package utils
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
type Handler struct {
|
||||
domain string
|
||||
volume string
|
||||
}
|
||||
|
||||
func NewHandler(domain, volume string) *Handler {
|
||||
return &Handler{
|
||||
domain: domain,
|
||||
volume: volume,
|
||||
}
|
||||
}
|
||||
|
||||
// MerchImageVolumePath
|
||||
// Returns a string like volume/merchImages/userUuid/merchUuid/filename.jpg
|
||||
func (h *Handler) MerchImageVolumePath(u, m string) string {
|
||||
return fmt.Sprintf("%s/merchImages/%s/%s", h.volume, u, m)
|
||||
}
|
||||
|
||||
func (h *Handler) FilenameFromType(imgType string) string {
|
||||
switch imgType {
|
||||
case "thumbnail":
|
||||
return "thumbnail.jpg"
|
||||
case "full":
|
||||
return "full.jpg"
|
||||
default:
|
||||
return "unknown"
|
||||
}
|
||||
}
|
||||
|
||||
func (h *Handler) MerchImageURL(u, m, t string) string {
|
||||
base, err := url.Parse(h.domain)
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("invalid domain in MerchImageURL: %w", err))
|
||||
}
|
||||
|
||||
base.Path = fmt.Sprintf("/merchImages/%s/%s", url.PathEscape(u), url.PathEscape(m))
|
||||
|
||||
params := url.Values{}
|
||||
params.Set("type", t)
|
||||
base.RawQuery = params.Encode()
|
||||
|
||||
return base.String()
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@ syntax="proto3";
|
|||
import "google/protobuf/empty.proto";
|
||||
|
||||
package imageStorage;
|
||||
option go_package = "imageStorage/";
|
||||
option go_package = "imageStorage/pkg/proto/imageStorage";
|
||||
|
||||
message UploadMerchImageRequest{
|
||||
bytes imageData = 1;
|
||||
|
|
@ -16,23 +16,6 @@ message UploadMerchImageResponse {
|
|||
string thumbnail = 2;
|
||||
}
|
||||
|
||||
enum ImageType {
|
||||
UNKNOWN = 0;
|
||||
FULL = 1;
|
||||
THUMBNAIL = 2;
|
||||
}
|
||||
|
||||
message GetImageRequest {
|
||||
string userUuid = 1;
|
||||
string merchUuid = 2;
|
||||
ImageType imgType = 3;
|
||||
}
|
||||
|
||||
message GetImageResponse{
|
||||
string url = 1;
|
||||
string etag = 2;
|
||||
}
|
||||
|
||||
message DeleteImageRequest {
|
||||
string userUuid = 1;
|
||||
string merchUuid = 2;
|
||||
|
|
@ -40,6 +23,5 @@ message DeleteImageRequest {
|
|||
|
||||
service ImageStorage {
|
||||
rpc UploadImage(UploadMerchImageRequest) returns (UploadMerchImageResponse);
|
||||
rpc GetImage(GetImageRequest) returns (GetImageResponse);
|
||||
rpc DeleteImage(DeleteImageRequest) returns (google.protobuf.Empty);
|
||||
}
|
||||
|
|
@ -22,55 +22,6 @@ const (
|
|||
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
|
||||
)
|
||||
|
||||
type ImageType int32
|
||||
|
||||
const (
|
||||
ImageType_UNKNOWN ImageType = 0
|
||||
ImageType_FULL ImageType = 1
|
||||
ImageType_THUMBNAIL ImageType = 2
|
||||
)
|
||||
|
||||
// Enum value maps for ImageType.
|
||||
var (
|
||||
ImageType_name = map[int32]string{
|
||||
0: "UNKNOWN",
|
||||
1: "FULL",
|
||||
2: "THUMBNAIL",
|
||||
}
|
||||
ImageType_value = map[string]int32{
|
||||
"UNKNOWN": 0,
|
||||
"FULL": 1,
|
||||
"THUMBNAIL": 2,
|
||||
}
|
||||
)
|
||||
|
||||
func (x ImageType) Enum() *ImageType {
|
||||
p := new(ImageType)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x ImageType) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (ImageType) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_imageStorage_proto_enumTypes[0].Descriptor()
|
||||
}
|
||||
|
||||
func (ImageType) Type() protoreflect.EnumType {
|
||||
return &file_imageStorage_proto_enumTypes[0]
|
||||
}
|
||||
|
||||
func (x ImageType) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use ImageType.Descriptor instead.
|
||||
func (ImageType) EnumDescriptor() ([]byte, []int) {
|
||||
return file_imageStorage_proto_rawDescGZIP(), []int{0}
|
||||
}
|
||||
|
||||
type UploadMerchImageRequest struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
ImageData []byte `protobuf:"bytes,1,opt,name=imageData,proto3" json:"imageData,omitempty"`
|
||||
|
|
@ -183,118 +134,6 @@ func (x *UploadMerchImageResponse) GetThumbnail() string {
|
|||
return ""
|
||||
}
|
||||
|
||||
type GetImageRequest struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
UserUuid string `protobuf:"bytes,1,opt,name=userUuid,proto3" json:"userUuid,omitempty"`
|
||||
MerchUuid string `protobuf:"bytes,2,opt,name=merchUuid,proto3" json:"merchUuid,omitempty"`
|
||||
ImgType ImageType `protobuf:"varint,3,opt,name=imgType,proto3,enum=imageStorage.ImageType" json:"imgType,omitempty"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
|
||||
func (x *GetImageRequest) Reset() {
|
||||
*x = GetImageRequest{}
|
||||
mi := &file_imageStorage_proto_msgTypes[2]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
||||
func (x *GetImageRequest) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*GetImageRequest) ProtoMessage() {}
|
||||
|
||||
func (x *GetImageRequest) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_imageStorage_proto_msgTypes[2]
|
||||
if x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use GetImageRequest.ProtoReflect.Descriptor instead.
|
||||
func (*GetImageRequest) Descriptor() ([]byte, []int) {
|
||||
return file_imageStorage_proto_rawDescGZIP(), []int{2}
|
||||
}
|
||||
|
||||
func (x *GetImageRequest) GetUserUuid() string {
|
||||
if x != nil {
|
||||
return x.UserUuid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *GetImageRequest) GetMerchUuid() string {
|
||||
if x != nil {
|
||||
return x.MerchUuid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *GetImageRequest) GetImgType() ImageType {
|
||||
if x != nil {
|
||||
return x.ImgType
|
||||
}
|
||||
return ImageType_UNKNOWN
|
||||
}
|
||||
|
||||
type GetImageResponse struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
|
||||
Etag string `protobuf:"bytes,2,opt,name=etag,proto3" json:"etag,omitempty"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
|
||||
func (x *GetImageResponse) Reset() {
|
||||
*x = GetImageResponse{}
|
||||
mi := &file_imageStorage_proto_msgTypes[3]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
||||
func (x *GetImageResponse) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*GetImageResponse) ProtoMessage() {}
|
||||
|
||||
func (x *GetImageResponse) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_imageStorage_proto_msgTypes[3]
|
||||
if x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use GetImageResponse.ProtoReflect.Descriptor instead.
|
||||
func (*GetImageResponse) Descriptor() ([]byte, []int) {
|
||||
return file_imageStorage_proto_rawDescGZIP(), []int{3}
|
||||
}
|
||||
|
||||
func (x *GetImageResponse) GetUrl() string {
|
||||
if x != nil {
|
||||
return x.Url
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *GetImageResponse) GetEtag() string {
|
||||
if x != nil {
|
||||
return x.Etag
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type DeleteImageRequest struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
UserUuid string `protobuf:"bytes,1,opt,name=userUuid,proto3" json:"userUuid,omitempty"`
|
||||
|
|
@ -305,7 +144,7 @@ type DeleteImageRequest struct {
|
|||
|
||||
func (x *DeleteImageRequest) Reset() {
|
||||
*x = DeleteImageRequest{}
|
||||
mi := &file_imageStorage_proto_msgTypes[4]
|
||||
mi := &file_imageStorage_proto_msgTypes[2]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
|
@ -317,7 +156,7 @@ func (x *DeleteImageRequest) String() string {
|
|||
func (*DeleteImageRequest) ProtoMessage() {}
|
||||
|
||||
func (x *DeleteImageRequest) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_imageStorage_proto_msgTypes[4]
|
||||
mi := &file_imageStorage_proto_msgTypes[2]
|
||||
if x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
|
|
@ -330,7 +169,7 @@ func (x *DeleteImageRequest) ProtoReflect() protoreflect.Message {
|
|||
|
||||
// Deprecated: Use DeleteImageRequest.ProtoReflect.Descriptor instead.
|
||||
func (*DeleteImageRequest) Descriptor() ([]byte, []int) {
|
||||
return file_imageStorage_proto_rawDescGZIP(), []int{4}
|
||||
return file_imageStorage_proto_rawDescGZIP(), []int{2}
|
||||
}
|
||||
|
||||
func (x *DeleteImageRequest) GetUserUuid() string {
|
||||
|
|
@ -358,25 +197,13 @@ const file_imageStorage_proto_rawDesc = "" +
|
|||
"\tmerchUuid\x18\x03 \x01(\tR\tmerchUuid\"V\n" +
|
||||
"\x18UploadMerchImageResponse\x12\x1c\n" +
|
||||
"\tfullImage\x18\x01 \x01(\tR\tfullImage\x12\x1c\n" +
|
||||
"\tthumbnail\x18\x02 \x01(\tR\tthumbnail\"~\n" +
|
||||
"\x0fGetImageRequest\x12\x1a\n" +
|
||||
"\buserUuid\x18\x01 \x01(\tR\buserUuid\x12\x1c\n" +
|
||||
"\tmerchUuid\x18\x02 \x01(\tR\tmerchUuid\x121\n" +
|
||||
"\aimgType\x18\x03 \x01(\x0e2\x17.imageStorage.ImageTypeR\aimgType\"8\n" +
|
||||
"\x10GetImageResponse\x12\x10\n" +
|
||||
"\x03url\x18\x01 \x01(\tR\x03url\x12\x12\n" +
|
||||
"\x04etag\x18\x02 \x01(\tR\x04etag\"N\n" +
|
||||
"\tthumbnail\x18\x02 \x01(\tR\tthumbnail\"N\n" +
|
||||
"\x12DeleteImageRequest\x12\x1a\n" +
|
||||
"\buserUuid\x18\x01 \x01(\tR\buserUuid\x12\x1c\n" +
|
||||
"\tmerchUuid\x18\x02 \x01(\tR\tmerchUuid*1\n" +
|
||||
"\tImageType\x12\v\n" +
|
||||
"\aUNKNOWN\x10\x00\x12\b\n" +
|
||||
"\x04FULL\x10\x01\x12\r\n" +
|
||||
"\tTHUMBNAIL\x10\x022\x80\x02\n" +
|
||||
"\tmerchUuid\x18\x02 \x01(\tR\tmerchUuid2\xb5\x01\n" +
|
||||
"\fImageStorage\x12\\\n" +
|
||||
"\vUploadImage\x12%.imageStorage.UploadMerchImageRequest\x1a&.imageStorage.UploadMerchImageResponse\x12I\n" +
|
||||
"\bGetImage\x12\x1d.imageStorage.GetImageRequest\x1a\x1e.imageStorage.GetImageResponse\x12G\n" +
|
||||
"\vDeleteImage\x12 .imageStorage.DeleteImageRequest\x1a\x16.google.protobuf.EmptyB\x0fZ\rimageStorage/b\x06proto3"
|
||||
"\vUploadImage\x12%.imageStorage.UploadMerchImageRequest\x1a&.imageStorage.UploadMerchImageResponse\x12G\n" +
|
||||
"\vDeleteImage\x12 .imageStorage.DeleteImageRequest\x1a\x16.google.protobuf.EmptyB%Z#imageStorage/pkg/proto/imageStorageb\x06proto3"
|
||||
|
||||
var (
|
||||
file_imageStorage_proto_rawDescOnce sync.Once
|
||||
|
|
@ -390,30 +217,23 @@ func file_imageStorage_proto_rawDescGZIP() []byte {
|
|||
return file_imageStorage_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_imageStorage_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
||||
var file_imageStorage_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
|
||||
var file_imageStorage_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
|
||||
var file_imageStorage_proto_goTypes = []any{
|
||||
(ImageType)(0), // 0: imageStorage.ImageType
|
||||
(*UploadMerchImageRequest)(nil), // 1: imageStorage.UploadMerchImageRequest
|
||||
(*UploadMerchImageResponse)(nil), // 2: imageStorage.UploadMerchImageResponse
|
||||
(*GetImageRequest)(nil), // 3: imageStorage.GetImageRequest
|
||||
(*GetImageResponse)(nil), // 4: imageStorage.GetImageResponse
|
||||
(*DeleteImageRequest)(nil), // 5: imageStorage.DeleteImageRequest
|
||||
(*emptypb.Empty)(nil), // 6: google.protobuf.Empty
|
||||
(*UploadMerchImageRequest)(nil), // 0: imageStorage.UploadMerchImageRequest
|
||||
(*UploadMerchImageResponse)(nil), // 1: imageStorage.UploadMerchImageResponse
|
||||
(*DeleteImageRequest)(nil), // 2: imageStorage.DeleteImageRequest
|
||||
(*emptypb.Empty)(nil), // 3: google.protobuf.Empty
|
||||
}
|
||||
var file_imageStorage_proto_depIdxs = []int32{
|
||||
0, // 0: imageStorage.GetImageRequest.imgType:type_name -> imageStorage.ImageType
|
||||
1, // 1: imageStorage.ImageStorage.UploadImage:input_type -> imageStorage.UploadMerchImageRequest
|
||||
3, // 2: imageStorage.ImageStorage.GetImage:input_type -> imageStorage.GetImageRequest
|
||||
5, // 3: imageStorage.ImageStorage.DeleteImage:input_type -> imageStorage.DeleteImageRequest
|
||||
2, // 4: imageStorage.ImageStorage.UploadImage:output_type -> imageStorage.UploadMerchImageResponse
|
||||
4, // 5: imageStorage.ImageStorage.GetImage:output_type -> imageStorage.GetImageResponse
|
||||
6, // 6: imageStorage.ImageStorage.DeleteImage:output_type -> google.protobuf.Empty
|
||||
4, // [4:7] is the sub-list for method output_type
|
||||
1, // [1:4] is the sub-list for method input_type
|
||||
1, // [1:1] is the sub-list for extension type_name
|
||||
1, // [1:1] is the sub-list for extension extendee
|
||||
0, // [0:1] is the sub-list for field type_name
|
||||
0, // 0: imageStorage.ImageStorage.UploadImage:input_type -> imageStorage.UploadMerchImageRequest
|
||||
2, // 1: imageStorage.ImageStorage.DeleteImage:input_type -> imageStorage.DeleteImageRequest
|
||||
1, // 2: imageStorage.ImageStorage.UploadImage:output_type -> imageStorage.UploadMerchImageResponse
|
||||
3, // 3: imageStorage.ImageStorage.DeleteImage:output_type -> google.protobuf.Empty
|
||||
2, // [2:4] is the sub-list for method output_type
|
||||
0, // [0:2] is the sub-list for method input_type
|
||||
0, // [0:0] is the sub-list for extension type_name
|
||||
0, // [0:0] is the sub-list for extension extendee
|
||||
0, // [0:0] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_imageStorage_proto_init() }
|
||||
|
|
@ -426,14 +246,13 @@ func file_imageStorage_proto_init() {
|
|||
File: protoimpl.DescBuilder{
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: unsafe.Slice(unsafe.StringData(file_imageStorage_proto_rawDesc), len(file_imageStorage_proto_rawDesc)),
|
||||
NumEnums: 1,
|
||||
NumMessages: 5,
|
||||
NumEnums: 0,
|
||||
NumMessages: 3,
|
||||
NumExtensions: 0,
|
||||
NumServices: 1,
|
||||
},
|
||||
GoTypes: file_imageStorage_proto_goTypes,
|
||||
DependencyIndexes: file_imageStorage_proto_depIdxs,
|
||||
EnumInfos: file_imageStorage_proto_enumTypes,
|
||||
MessageInfos: file_imageStorage_proto_msgTypes,
|
||||
}.Build()
|
||||
File_imageStorage_proto = out.File
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ const _ = grpc.SupportPackageIsVersion9
|
|||
|
||||
const (
|
||||
ImageStorage_UploadImage_FullMethodName = "/imageStorage.ImageStorage/UploadImage"
|
||||
ImageStorage_GetImage_FullMethodName = "/imageStorage.ImageStorage/GetImage"
|
||||
ImageStorage_DeleteImage_FullMethodName = "/imageStorage.ImageStorage/DeleteImage"
|
||||
)
|
||||
|
||||
|
|
@ -30,7 +29,6 @@ const (
|
|||
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
|
||||
type ImageStorageClient interface {
|
||||
UploadImage(ctx context.Context, in *UploadMerchImageRequest, opts ...grpc.CallOption) (*UploadMerchImageResponse, error)
|
||||
GetImage(ctx context.Context, in *GetImageRequest, opts ...grpc.CallOption) (*GetImageResponse, error)
|
||||
DeleteImage(ctx context.Context, in *DeleteImageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
|
||||
}
|
||||
|
||||
|
|
@ -52,16 +50,6 @@ func (c *imageStorageClient) UploadImage(ctx context.Context, in *UploadMerchIma
|
|||
return out, nil
|
||||
}
|
||||
|
||||
func (c *imageStorageClient) GetImage(ctx context.Context, in *GetImageRequest, opts ...grpc.CallOption) (*GetImageResponse, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(GetImageResponse)
|
||||
err := c.cc.Invoke(ctx, ImageStorage_GetImage_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *imageStorageClient) DeleteImage(ctx context.Context, in *DeleteImageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(emptypb.Empty)
|
||||
|
|
@ -77,7 +65,6 @@ func (c *imageStorageClient) DeleteImage(ctx context.Context, in *DeleteImageReq
|
|||
// for forward compatibility.
|
||||
type ImageStorageServer interface {
|
||||
UploadImage(context.Context, *UploadMerchImageRequest) (*UploadMerchImageResponse, error)
|
||||
GetImage(context.Context, *GetImageRequest) (*GetImageResponse, error)
|
||||
DeleteImage(context.Context, *DeleteImageRequest) (*emptypb.Empty, error)
|
||||
mustEmbedUnimplementedImageStorageServer()
|
||||
}
|
||||
|
|
@ -92,9 +79,6 @@ type UnimplementedImageStorageServer struct{}
|
|||
func (UnimplementedImageStorageServer) UploadImage(context.Context, *UploadMerchImageRequest) (*UploadMerchImageResponse, error) {
|
||||
return nil, status.Errorf(codes.Unimplemented, "method UploadImage not implemented")
|
||||
}
|
||||
func (UnimplementedImageStorageServer) GetImage(context.Context, *GetImageRequest) (*GetImageResponse, error) {
|
||||
return nil, status.Errorf(codes.Unimplemented, "method GetImage not implemented")
|
||||
}
|
||||
func (UnimplementedImageStorageServer) DeleteImage(context.Context, *DeleteImageRequest) (*emptypb.Empty, error) {
|
||||
return nil, status.Errorf(codes.Unimplemented, "method DeleteImage not implemented")
|
||||
}
|
||||
|
|
@ -137,24 +121,6 @@ func _ImageStorage_UploadImage_Handler(srv interface{}, ctx context.Context, dec
|
|||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _ImageStorage_GetImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(GetImageRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(ImageStorageServer).GetImage(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: ImageStorage_GetImage_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(ImageStorageServer).GetImage(ctx, req.(*GetImageRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _ImageStorage_DeleteImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(DeleteImageRequest)
|
||||
if err := dec(in); err != nil {
|
||||
|
|
@ -184,10 +150,6 @@ var ImageStorage_ServiceDesc = grpc.ServiceDesc{
|
|||
MethodName: "UploadImage",
|
||||
Handler: _ImageStorage_UploadImage_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "GetImage",
|
||||
Handler: _ImageStorage_GetImage_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "DeleteImage",
|
||||
Handler: _ImageStorage_DeleteImage_Handler,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue