From 52a397f1d695f6ada38e1cc84eb698a95c421e45 Mon Sep 17 00:00:00 2001 From: nquidox Date: Wed, 22 Oct 2025 21:33:17 +0300 Subject: [PATCH 1/4] update --- go.mod | 2 ++ go.sum | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 95 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index c8eebea..fb4d993 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,14 @@ module imageStorage go 1.25.3 require ( + github.com/davidbyttow/govips/v2 v2.16.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 golang.org/x/net v0.46.0 // indirect golang.org/x/sys v0.37.0 // indirect golang.org/x/text v0.30.0 // indirect diff --git a/go.sum b/go.sum index f9709ea..e5bdf40 100644 --- a/go.sum +++ b/go.sum @@ -1,37 +1,119 @@ 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/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/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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= 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/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/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= -golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= -golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= +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= +go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= +go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= +go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= +go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= +go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc= +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= +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/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= +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/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= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +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/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= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= -golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +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.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= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= -golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b h1:zPKJod4w6F1+nRGDI9ubnXYhU9NSWoFAijkHkUXeTK8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +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/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/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.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= -google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= 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= From 45f6986e9320ba83a9f9c783a4e4f117b244eed4 Mon Sep 17 00:00:00 2001 From: nquidox Date: Wed, 22 Oct 2025 21:33:29 +0300 Subject: [PATCH 2/4] update --- pkg/proto/imageStorage/imageStorage.pb.go | 236 ++++++++---------- .../imageStorage/imageStorage_grpc.pb.go | 29 +-- 2 files changed, 115 insertions(+), 150 deletions(-) diff --git a/pkg/proto/imageStorage/imageStorage.pb.go b/pkg/proto/imageStorage/imageStorage.pb.go index 7112074..8be0eb8 100644 --- a/pkg/proto/imageStorage/imageStorage.pb.go +++ b/pkg/proto/imageStorage/imageStorage.pb.go @@ -2,13 +2,14 @@ // versions: // protoc-gen-go v1.36.8 // protoc v6.32.1 -// source: pkg/proto/imageStorage.proto +// source: imageStorage.proto package imageStorage import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" unsafe "unsafe" @@ -54,11 +55,11 @@ func (x ImageType) String() string { } func (ImageType) Descriptor() protoreflect.EnumDescriptor { - return file_pkg_proto_imageStorage_proto_enumTypes[0].Descriptor() + return file_imageStorage_proto_enumTypes[0].Descriptor() } func (ImageType) Type() protoreflect.EnumType { - return &file_pkg_proto_imageStorage_proto_enumTypes[0] + return &file_imageStorage_proto_enumTypes[0] } func (x ImageType) Number() protoreflect.EnumNumber { @@ -67,31 +68,33 @@ func (x ImageType) Number() protoreflect.EnumNumber { // Deprecated: Use ImageType.Descriptor instead. func (ImageType) EnumDescriptor() ([]byte, []int) { - return file_pkg_proto_imageStorage_proto_rawDescGZIP(), []int{0} + return file_imageStorage_proto_rawDescGZIP(), []int{0} } -type UploadImageRequest struct { +type UploadMerchImageRequest struct { state protoimpl.MessageState `protogen:"open.v1"` ImageData []byte `protobuf:"bytes,1,opt,name=imageData,proto3" json:"imageData,omitempty"` + UserUuid string `protobuf:"bytes,2,opt,name=userUuid,proto3" json:"userUuid,omitempty"` + MerchUuid string `protobuf:"bytes,3,opt,name=merchUuid,proto3" json:"merchUuid,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *UploadImageRequest) Reset() { - *x = UploadImageRequest{} - mi := &file_pkg_proto_imageStorage_proto_msgTypes[0] +func (x *UploadMerchImageRequest) Reset() { + *x = UploadMerchImageRequest{} + mi := &file_imageStorage_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *UploadImageRequest) String() string { +func (x *UploadMerchImageRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*UploadImageRequest) ProtoMessage() {} +func (*UploadMerchImageRequest) ProtoMessage() {} -func (x *UploadImageRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_proto_imageStorage_proto_msgTypes[0] +func (x *UploadMerchImageRequest) ProtoReflect() protoreflect.Message { + mi := &file_imageStorage_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -102,19 +105,33 @@ func (x *UploadImageRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use UploadImageRequest.ProtoReflect.Descriptor instead. -func (*UploadImageRequest) Descriptor() ([]byte, []int) { - return file_pkg_proto_imageStorage_proto_rawDescGZIP(), []int{0} +// Deprecated: Use UploadMerchImageRequest.ProtoReflect.Descriptor instead. +func (*UploadMerchImageRequest) Descriptor() ([]byte, []int) { + return file_imageStorage_proto_rawDescGZIP(), []int{0} } -func (x *UploadImageRequest) GetImageData() []byte { +func (x *UploadMerchImageRequest) GetImageData() []byte { if x != nil { return x.ImageData } return nil } -type UploadImageResponse struct { +func (x *UploadMerchImageRequest) GetUserUuid() string { + if x != nil { + return x.UserUuid + } + return "" +} + +func (x *UploadMerchImageRequest) GetMerchUuid() string { + if x != nil { + return x.MerchUuid + } + return "" +} + +type UploadMerchImageResponse struct { state protoimpl.MessageState `protogen:"open.v1"` FullImage string `protobuf:"bytes,1,opt,name=fullImage,proto3" json:"fullImage,omitempty"` Thumbnail string `protobuf:"bytes,2,opt,name=thumbnail,proto3" json:"thumbnail,omitempty"` @@ -122,21 +139,21 @@ type UploadImageResponse struct { sizeCache protoimpl.SizeCache } -func (x *UploadImageResponse) Reset() { - *x = UploadImageResponse{} - mi := &file_pkg_proto_imageStorage_proto_msgTypes[1] +func (x *UploadMerchImageResponse) Reset() { + *x = UploadMerchImageResponse{} + mi := &file_imageStorage_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *UploadImageResponse) String() string { +func (x *UploadMerchImageResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*UploadImageResponse) ProtoMessage() {} +func (*UploadMerchImageResponse) ProtoMessage() {} -func (x *UploadImageResponse) ProtoReflect() protoreflect.Message { - mi := &file_pkg_proto_imageStorage_proto_msgTypes[1] +func (x *UploadMerchImageResponse) ProtoReflect() protoreflect.Message { + mi := &file_imageStorage_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -147,19 +164,19 @@ func (x *UploadImageResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use UploadImageResponse.ProtoReflect.Descriptor instead. -func (*UploadImageResponse) Descriptor() ([]byte, []int) { - return file_pkg_proto_imageStorage_proto_rawDescGZIP(), []int{1} +// Deprecated: Use UploadMerchImageResponse.ProtoReflect.Descriptor instead. +func (*UploadMerchImageResponse) Descriptor() ([]byte, []int) { + return file_imageStorage_proto_rawDescGZIP(), []int{1} } -func (x *UploadImageResponse) GetFullImage() string { +func (x *UploadMerchImageResponse) GetFullImage() string { if x != nil { return x.FullImage } return "" } -func (x *UploadImageResponse) GetThumbnail() string { +func (x *UploadMerchImageResponse) GetThumbnail() string { if x != nil { return x.Thumbnail } @@ -177,7 +194,7 @@ type GetImageRequest struct { func (x *GetImageRequest) Reset() { *x = GetImageRequest{} - mi := &file_pkg_proto_imageStorage_proto_msgTypes[2] + mi := &file_imageStorage_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -189,7 +206,7 @@ func (x *GetImageRequest) String() string { func (*GetImageRequest) ProtoMessage() {} func (x *GetImageRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_proto_imageStorage_proto_msgTypes[2] + mi := &file_imageStorage_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -202,7 +219,7 @@ func (x *GetImageRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetImageRequest.ProtoReflect.Descriptor instead. func (*GetImageRequest) Descriptor() ([]byte, []int) { - return file_pkg_proto_imageStorage_proto_rawDescGZIP(), []int{2} + return file_imageStorage_proto_rawDescGZIP(), []int{2} } func (x *GetImageRequest) GetUserUuid() string { @@ -236,7 +253,7 @@ type GetImageResponse struct { func (x *GetImageResponse) Reset() { *x = GetImageResponse{} - mi := &file_pkg_proto_imageStorage_proto_msgTypes[3] + mi := &file_imageStorage_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -248,7 +265,7 @@ func (x *GetImageResponse) String() string { func (*GetImageResponse) ProtoMessage() {} func (x *GetImageResponse) ProtoReflect() protoreflect.Message { - mi := &file_pkg_proto_imageStorage_proto_msgTypes[3] + mi := &file_imageStorage_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -261,7 +278,7 @@ func (x *GetImageResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetImageResponse.ProtoReflect.Descriptor instead. func (*GetImageResponse) Descriptor() ([]byte, []int) { - return file_pkg_proto_imageStorage_proto_rawDescGZIP(), []int{3} + return file_imageStorage_proto_rawDescGZIP(), []int{3} } func (x *GetImageResponse) GetUrl() string { @@ -288,7 +305,7 @@ type DeleteImageRequest struct { func (x *DeleteImageRequest) Reset() { *x = DeleteImageRequest{} - mi := &file_pkg_proto_imageStorage_proto_msgTypes[4] + mi := &file_imageStorage_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -300,7 +317,7 @@ func (x *DeleteImageRequest) String() string { func (*DeleteImageRequest) ProtoMessage() {} func (x *DeleteImageRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_proto_imageStorage_proto_msgTypes[4] + mi := &file_imageStorage_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -313,7 +330,7 @@ func (x *DeleteImageRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteImageRequest.ProtoReflect.Descriptor instead. func (*DeleteImageRequest) Descriptor() ([]byte, []int) { - return file_pkg_proto_imageStorage_proto_rawDescGZIP(), []int{4} + return file_imageStorage_proto_rawDescGZIP(), []int{4} } func (x *DeleteImageRequest) GetUserUuid() string { @@ -330,66 +347,16 @@ func (x *DeleteImageRequest) GetMerchUuid() string { return "" } -type DeleteImageResponse 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"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} +var File_imageStorage_proto protoreflect.FileDescriptor -func (x *DeleteImageResponse) Reset() { - *x = DeleteImageResponse{} - mi := &file_pkg_proto_imageStorage_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *DeleteImageResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DeleteImageResponse) ProtoMessage() {} - -func (x *DeleteImageResponse) ProtoReflect() protoreflect.Message { - mi := &file_pkg_proto_imageStorage_proto_msgTypes[5] - 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 DeleteImageResponse.ProtoReflect.Descriptor instead. -func (*DeleteImageResponse) Descriptor() ([]byte, []int) { - return file_pkg_proto_imageStorage_proto_rawDescGZIP(), []int{5} -} - -func (x *DeleteImageResponse) GetUserUuid() string { - if x != nil { - return x.UserUuid - } - return "" -} - -func (x *DeleteImageResponse) GetMerchUuid() string { - if x != nil { - return x.MerchUuid - } - return "" -} - -var File_pkg_proto_imageStorage_proto protoreflect.FileDescriptor - -const file_pkg_proto_imageStorage_proto_rawDesc = "" + +const file_imageStorage_proto_rawDesc = "" + "\n" + - "\x1cpkg/proto/imageStorage.proto\x12\fimageStorage\"2\n" + - "\x12UploadImageRequest\x12\x1c\n" + - "\timageData\x18\x01 \x01(\fR\timageData\"Q\n" + - "\x13UploadImageResponse\x12\x1c\n" + + "\x12imageStorage.proto\x12\fimageStorage\x1a\x1bgoogle/protobuf/empty.proto\"q\n" + + "\x17UploadMerchImageRequest\x12\x1c\n" + + "\timageData\x18\x01 \x01(\fR\timageData\x12\x1a\n" + + "\buserUuid\x18\x02 \x01(\tR\buserUuid\x12\x1c\n" + + "\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" + @@ -401,50 +368,47 @@ const file_pkg_proto_imageStorage_proto_rawDesc = "" + "\x04etag\x18\x02 \x01(\tR\x04etag\"N\n" + "\x12DeleteImageRequest\x12\x1a\n" + "\buserUuid\x18\x01 \x01(\tR\buserUuid\x12\x1c\n" + - "\tmerchUuid\x18\x02 \x01(\tR\tmerchUuid\"O\n" + - "\x13DeleteImageResponse\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\xfe\x01\n" + - "\fImageStorage\x12R\n" + - "\vUploadImage\x12 .imageStorage.UploadImageRequest\x1a!.imageStorage.UploadImageResponse\x12I\n" + - "\bGetImage\x12\x1d.imageStorage.GetImageRequest\x1a\x1e.imageStorage.GetImageResponse\x12O\n" + - "\vDeleteImage\x12 .imageStorage.DeleteImageRequest\x1a\x1e.imageStorage.GetImageResponseB\x10Z\x0e./imageStorageb\x06proto3" + "\tTHUMBNAIL\x10\x022\x80\x02\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" var ( - file_pkg_proto_imageStorage_proto_rawDescOnce sync.Once - file_pkg_proto_imageStorage_proto_rawDescData []byte + file_imageStorage_proto_rawDescOnce sync.Once + file_imageStorage_proto_rawDescData []byte ) -func file_pkg_proto_imageStorage_proto_rawDescGZIP() []byte { - file_pkg_proto_imageStorage_proto_rawDescOnce.Do(func() { - file_pkg_proto_imageStorage_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_pkg_proto_imageStorage_proto_rawDesc), len(file_pkg_proto_imageStorage_proto_rawDesc))) +func file_imageStorage_proto_rawDescGZIP() []byte { + file_imageStorage_proto_rawDescOnce.Do(func() { + file_imageStorage_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_imageStorage_proto_rawDesc), len(file_imageStorage_proto_rawDesc))) }) - return file_pkg_proto_imageStorage_proto_rawDescData + return file_imageStorage_proto_rawDescData } -var file_pkg_proto_imageStorage_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_pkg_proto_imageStorage_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_pkg_proto_imageStorage_proto_goTypes = []any{ - (ImageType)(0), // 0: imageStorage.ImageType - (*UploadImageRequest)(nil), // 1: imageStorage.UploadImageRequest - (*UploadImageResponse)(nil), // 2: imageStorage.UploadImageResponse - (*GetImageRequest)(nil), // 3: imageStorage.GetImageRequest - (*GetImageResponse)(nil), // 4: imageStorage.GetImageResponse - (*DeleteImageRequest)(nil), // 5: imageStorage.DeleteImageRequest - (*DeleteImageResponse)(nil), // 6: imageStorage.DeleteImageResponse +var file_imageStorage_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_imageStorage_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +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 } -var file_pkg_proto_imageStorage_proto_depIdxs = []int32{ +var file_imageStorage_proto_depIdxs = []int32{ 0, // 0: imageStorage.GetImageRequest.imgType:type_name -> imageStorage.ImageType - 1, // 1: imageStorage.ImageStorage.UploadImage:input_type -> imageStorage.UploadImageRequest + 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.UploadImageResponse + 2, // 4: imageStorage.ImageStorage.UploadImage:output_type -> imageStorage.UploadMerchImageResponse 4, // 5: imageStorage.ImageStorage.GetImage:output_type -> imageStorage.GetImageResponse - 4, // 6: imageStorage.ImageStorage.DeleteImage: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 @@ -452,27 +416,27 @@ var file_pkg_proto_imageStorage_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_pkg_proto_imageStorage_proto_init() } -func file_pkg_proto_imageStorage_proto_init() { - if File_pkg_proto_imageStorage_proto != nil { +func init() { file_imageStorage_proto_init() } +func file_imageStorage_proto_init() { + if File_imageStorage_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_pkg_proto_imageStorage_proto_rawDesc), len(file_pkg_proto_imageStorage_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_imageStorage_proto_rawDesc), len(file_imageStorage_proto_rawDesc)), NumEnums: 1, - NumMessages: 6, + NumMessages: 5, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_pkg_proto_imageStorage_proto_goTypes, - DependencyIndexes: file_pkg_proto_imageStorage_proto_depIdxs, - EnumInfos: file_pkg_proto_imageStorage_proto_enumTypes, - MessageInfos: file_pkg_proto_imageStorage_proto_msgTypes, + GoTypes: file_imageStorage_proto_goTypes, + DependencyIndexes: file_imageStorage_proto_depIdxs, + EnumInfos: file_imageStorage_proto_enumTypes, + MessageInfos: file_imageStorage_proto_msgTypes, }.Build() - File_pkg_proto_imageStorage_proto = out.File - file_pkg_proto_imageStorage_proto_goTypes = nil - file_pkg_proto_imageStorage_proto_depIdxs = nil + File_imageStorage_proto = out.File + file_imageStorage_proto_goTypes = nil + file_imageStorage_proto_depIdxs = nil } diff --git a/pkg/proto/imageStorage/imageStorage_grpc.pb.go b/pkg/proto/imageStorage/imageStorage_grpc.pb.go index af6ee91..4c18f13 100644 --- a/pkg/proto/imageStorage/imageStorage_grpc.pb.go +++ b/pkg/proto/imageStorage/imageStorage_grpc.pb.go @@ -2,7 +2,7 @@ // versions: // - protoc-gen-go-grpc v1.5.1 // - protoc v6.32.1 -// source: pkg/proto/imageStorage.proto +// source: imageStorage.proto package imageStorage @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -28,9 +29,9 @@ 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 *UploadImageRequest, opts ...grpc.CallOption) (*UploadImageResponse, error) + 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) (*GetImageResponse, error) + DeleteImage(ctx context.Context, in *DeleteImageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type imageStorageClient struct { @@ -41,9 +42,9 @@ func NewImageStorageClient(cc grpc.ClientConnInterface) ImageStorageClient { return &imageStorageClient{cc} } -func (c *imageStorageClient) UploadImage(ctx context.Context, in *UploadImageRequest, opts ...grpc.CallOption) (*UploadImageResponse, error) { +func (c *imageStorageClient) UploadImage(ctx context.Context, in *UploadMerchImageRequest, opts ...grpc.CallOption) (*UploadMerchImageResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(UploadImageResponse) + out := new(UploadMerchImageResponse) err := c.cc.Invoke(ctx, ImageStorage_UploadImage_FullMethodName, in, out, cOpts...) if err != nil { return nil, err @@ -61,9 +62,9 @@ func (c *imageStorageClient) GetImage(ctx context.Context, in *GetImageRequest, return out, nil } -func (c *imageStorageClient) DeleteImage(ctx context.Context, in *DeleteImageRequest, opts ...grpc.CallOption) (*GetImageResponse, error) { +func (c *imageStorageClient) DeleteImage(ctx context.Context, in *DeleteImageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(GetImageResponse) + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, ImageStorage_DeleteImage_FullMethodName, in, out, cOpts...) if err != nil { return nil, err @@ -75,9 +76,9 @@ func (c *imageStorageClient) DeleteImage(ctx context.Context, in *DeleteImageReq // All implementations must embed UnimplementedImageStorageServer // for forward compatibility. type ImageStorageServer interface { - UploadImage(context.Context, *UploadImageRequest) (*UploadImageResponse, error) + UploadImage(context.Context, *UploadMerchImageRequest) (*UploadMerchImageResponse, error) GetImage(context.Context, *GetImageRequest) (*GetImageResponse, error) - DeleteImage(context.Context, *DeleteImageRequest) (*GetImageResponse, error) + DeleteImage(context.Context, *DeleteImageRequest) (*emptypb.Empty, error) mustEmbedUnimplementedImageStorageServer() } @@ -88,13 +89,13 @@ type ImageStorageServer interface { // pointer dereference when methods are called. type UnimplementedImageStorageServer struct{} -func (UnimplementedImageStorageServer) UploadImage(context.Context, *UploadImageRequest) (*UploadImageResponse, error) { +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) (*GetImageResponse, error) { +func (UnimplementedImageStorageServer) DeleteImage(context.Context, *DeleteImageRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteImage not implemented") } func (UnimplementedImageStorageServer) mustEmbedUnimplementedImageStorageServer() {} @@ -119,7 +120,7 @@ func RegisterImageStorageServer(s grpc.ServiceRegistrar, srv ImageStorageServer) } func _ImageStorage_UploadImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UploadImageRequest) + in := new(UploadMerchImageRequest) if err := dec(in); err != nil { return nil, err } @@ -131,7 +132,7 @@ func _ImageStorage_UploadImage_Handler(srv interface{}, ctx context.Context, dec FullMethod: ImageStorage_UploadImage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ImageStorageServer).UploadImage(ctx, req.(*UploadImageRequest)) + return srv.(ImageStorageServer).UploadImage(ctx, req.(*UploadMerchImageRequest)) } return interceptor(ctx, in, info, handler) } @@ -193,5 +194,5 @@ var ImageStorage_ServiceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "pkg/proto/imageStorage.proto", + Metadata: "imageStorage.proto", } From 78cb709bd748488cfbac33804987af1e3058b976 Mon Sep 17 00:00:00 2001 From: nquidox Date: Wed, 22 Oct 2025 21:33:46 +0300 Subject: [PATCH 3/4] some fixes --- pkg/proto/imageStorage.proto | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkg/proto/imageStorage.proto b/pkg/proto/imageStorage.proto index fb1a95b..c1d43c6 100644 --- a/pkg/proto/imageStorage.proto +++ b/pkg/proto/imageStorage.proto @@ -1,13 +1,17 @@ syntax="proto3"; -package imageStorage; -option go_package = "./imageStorage"; +import "google/protobuf/empty.proto"; -message UploadImageRequest{ +package imageStorage; +option go_package = "imageStorage/"; + +message UploadMerchImageRequest{ bytes imageData = 1; + string userUuid = 2; + string merchUuid = 3; } -message UploadImageResponse { +message UploadMerchImageResponse { string fullImage = 1; string thumbnail = 2; } @@ -34,13 +38,8 @@ message DeleteImageRequest { string merchUuid = 2; } -message DeleteImageResponse { - string userUuid = 1; - string merchUuid = 2; -} - service ImageStorage { - rpc UploadImage(UploadImageRequest) returns (UploadImageResponse); + rpc UploadImage(UploadMerchImageRequest) returns (UploadMerchImageResponse); rpc GetImage(GetImageRequest) returns (GetImageResponse); - rpc DeleteImage(DeleteImageRequest) returns (GetImageResponse); + rpc DeleteImage(DeleteImageRequest) returns (google.protobuf.Empty); } \ No newline at end of file From 8bc961e1be07de2f54eddd8fd7feaf867f7f7200 Mon Sep 17 00:00:00 2001 From: nquidox Date: Wed, 22 Oct 2025 21:34:17 +0300 Subject: [PATCH 4/4] crud implemented --- cmd/main.go | 10 +++- config.env | 1 + config/config.go | 2 + config/devConfig.go | 1 + internal/convert/service.go | 41 ++++++++++++-- internal/interfaces/convert.go | 5 +- internal/mainHandler/handler.go | 6 +++ internal/mainHandler/service.go | 96 +++++++++++++++++++++++++++++++-- 8 files changed, 149 insertions(+), 13 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 0145c7b..a2c3cfc 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -2,6 +2,7 @@ package main import ( "context" + "github.com/davidbyttow/govips/v2/vips" log "github.com/sirupsen/logrus" "imageStorage/config" "imageStorage/internal/app" @@ -13,11 +14,16 @@ import ( ) 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) + vips.Startup(&vips.Config{ + MaxCacheMem: 100 << 20, + }) + defer vips.Shutdown() + ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) defer cancel() diff --git a/config.env b/config.env index c56fe47..29b52e7 100644 --- a/config.env +++ b/config.env @@ -2,4 +2,5 @@ HOST= HTTP_PORT= GRPC_PORT= DOMAIN= +VOLUME= LOG_LEVEL=Info \ No newline at end of file diff --git a/config/config.go b/config/config.go index 6c5b2e9..1d02a23 100644 --- a/config/config.go +++ b/config/config.go @@ -9,6 +9,7 @@ type AppConfig struct { HttpPort string GrpcPort string Domain string + Volume string LogLevel string } @@ -19,6 +20,7 @@ func NewConfig() *Config { HttpPort: getEnv("HTTP_PORT", ""), GrpcPort: getEnv("GRPC_PORT", ""), Domain: getEnv("DOMAIN", ""), + Volume: getEnv("VOLUME", ""), LogLevel: getEnv("LOG_LEVEL", ""), }, } diff --git a/config/devConfig.go b/config/devConfig.go index c6b142f..5c591ff 100644 --- a/config/devConfig.go +++ b/config/devConfig.go @@ -7,6 +7,7 @@ func DevConfig() *Config { HttpPort: getEnv("HTTP_PORT", "9280"), GrpcPort: getEnv("GRPC_PORT", "9200"), Domain: getEnv("DOMAIN", "http://localhost:9280"), + Volume: getEnv("VOLUME", ""), LogLevel: getEnv("LOG_LEVEL", "Debug"), }, } diff --git a/internal/convert/service.go b/internal/convert/service.go index 82c3ec9..66265a7 100644 --- a/internal/convert/service.go +++ b/internal/convert/service.go @@ -1,15 +1,48 @@ package convert +import ( + "github.com/davidbyttow/govips/v2/vips" + "io" +) + type service struct{} func newService() *service { return &service{} } -func (s *service) ConvertToJpeg() error { - return nil -} +func (s *service) ConvertAndSave(imageData []byte, fullWriter, thumbWriter io.Writer) error { + img, err := vips.NewImageFromBuffer(imageData) + if err != nil { + return err + } + defer img.Close() + + //force convert even it is already a jpeg image + converted, _, err := img.ExportJpeg(&vips.JpegExportParams{ + StripMetadata: true, + Quality: 90, + }) + + if _, err = fullWriter.Write(converted); err != nil { + return err + } + + if err = img.Thumbnail(300, 300, vips.InterestingNone); err != nil { + return err + } + + thumbnail, _, err := img.ExportJpeg(&vips.JpegExportParams{ + StripMetadata: true, + Quality: 80, + }) + if err != nil { + return err + } + + if _, err = thumbWriter.Write(thumbnail); err != nil { + return err + } -func (s *service) MakeThumbnail() error { return nil } diff --git a/internal/interfaces/convert.go b/internal/interfaces/convert.go index d4a75a3..122990d 100644 --- a/internal/interfaces/convert.go +++ b/internal/interfaces/convert.go @@ -1,6 +1,7 @@ package interfaces +import "io" + type Converter interface { - MakeThumbnail() error - ConvertToJpeg() error + ConvertAndSave(imageData []byte, fullWriter, thumbWriter io.Writer) error } diff --git a/internal/mainHandler/handler.go b/internal/mainHandler/handler.go index 5bba8ad..478e09b 100644 --- a/internal/mainHandler/handler.go +++ b/internal/mainHandler/handler.go @@ -9,16 +9,22 @@ import ( type ImageHandler struct { pb.UnimplementedImageStorageServer converter interfaces.Converter + domain string + volume string } type Deps struct { Converter interfaces.Converter + Domain string + Volume string } func NewHandler(deps Deps) *grpc.Server { srv := grpc.NewServer() imgSrv := ImageHandler{ converter: deps.Converter, + domain: deps.Domain, + volume: deps.Volume, } pb.RegisterImageStorageServer(srv, &imgSrv) diff --git a/internal/mainHandler/service.go b/internal/mainHandler/service.go index 215dada..14d2bd1 100644 --- a/internal/mainHandler/service.go +++ b/internal/mainHandler/service.go @@ -2,17 +2,103 @@ 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.UploadImageRequest) (*pb.UploadImageResponse, error) { - return nil, nil +func (i *ImageHandler) UploadImage(ctx context.Context, req *pb.UploadMerchImageRequest) (*pb.UploadMerchImageResponse, error) { + if len(req.ImageData) == 0 { + return nil, status.Errorf(codes.InvalidArgument, "image data is empty") + } + + path := i._makeMerchImagePath(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) + if err != nil { + return nil, err + } + defer fullFile.Close() + + thumbnailFile, err := os.Create(thumbnail) + if err != nil { + return nil, err + } + defer thumbnailFile.Close() + + if err = i.converter.ConvertAndSave(req.ImageData, fullFile, thumbnailFile); err != nil { + return nil, err + } + + response := &pb.UploadMerchImageResponse{ + FullImage: i._makeMerchImageURL(req.UserUuid, req.MerchUuid, full), + Thumbnail: i._makeMerchImageURL(req.UserUuid, req.MerchUuid, thumbnail), + } + + return response, nil } func (i *ImageHandler) GetImage(ctx context.Context, req *pb.GetImageRequest) (*pb.GetImageResponse, error) { - return nil, nil + 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) (*pb.GetImageResponse, error) { - return nil, nil +func (i *ImageHandler) DeleteImage(ctx context.Context, req *pb.DeleteImageRequest) (*emptypb.Empty, error) { + path := i._makeMerchImagePath(req.UserUuid, req.MerchUuid) + + entries, err := os.ReadDir(path) + if err != nil { + if os.IsNotExist(err) { + return &emptypb.Empty{}, nil + } + return nil, err + } + + for _, entry := range entries { + if !entry.IsDir() { + filePath := filepath.Join(path, entry.Name()) + if err := os.Remove(filePath); err != nil { + return nil, err + } + } + } + + 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) }