From 7c5c2251490ff4c184b0c160d3f2910c8eb04555 Mon Sep 17 00:00:00 2001 From: asim Date: Wed, 29 Jan 2025 20:58:05 +0000 Subject: [PATCH] remove vanity imports --- address/Makefile | 4 +- address/handler/address.go | 6 +- address/handler/postcoder.go | 6 +- address/main.go | 6 +- address/proto/address.pb.micro.go | 4 +- ai/Makefile | 4 +- ai/handler/ai.go | 6 +- ai/main.go | 4 +- ai/proto/ai.pb.micro.go | 4 +- avatar/Makefile | 4 +- avatar/handler/avatar.go | 2 +- avatar/main.go | 4 +- avatar/proto/avatar.pb.micro.go | 4 +- bitcoin/Makefile | 4 +- bitcoin/handler/bitcoin.go | 4 +- bitcoin/main.go | 4 +- bitcoin/proto/bitcoin.pb.micro.go | 4 +- cache/Makefile | 4 +- cache/handler/cache.go | 4 +- cache/main.go | 4 +- cache/proto/cache.pb.micro.go | 4 +- carbon/Makefile | 4 +- carbon/handler/carbon.go | 6 +- carbon/main.go | 4 +- carbon/proto/carbon.pb.micro.go | 4 +- chat/Makefile | 2 +- chat/handler/handler.go | 8 +- chat/main.go | 4 +- chat/proto/chat.pb.micro.go | 4 +- comments/Makefile | 4 +- comments/handler/comments.go | 8 +- comments/main.go | 4 +- comments/proto/comments.pb.micro.go | 4 +- contact/Makefile | 4 +- contact/domain/contact.go | 2 +- contact/handler/contact.go | 4 +- contact/main.go | 6 +- contact/proto/contact.pb.micro.go | 4 +- cron/Makefile | 4 +- cron/handler/cron.go | 6 +- cron/main.go | 4 +- cron/proto/cron.pb.micro.go | 4 +- crypto/Makefile | 4 +- crypto/handler/crypto.go | 6 +- crypto/main.go | 4 +- crypto/proto/crypto.pb.micro.go | 4 +- currency/Makefile | 4 +- currency/handler/currency.go | 4 +- currency/main.go | 6 +- currency/proto/currency.pb.micro.go | 4 +- db/Makefile | 2 +- db/handler/db.go | 4 +- db/handler/integration_test.go | 2 +- db/main.go | 6 +- db/proto/db.pb.micro.go | 4 +- dns/Makefile | 4 +- dns/handler/dns.go | 2 +- dns/main.go | 4 +- dns/proto/dns.pb.micro.go | 4 +- email/Makefile | 2 +- email/handler/email.go | 12 +- email/main.go | 4 +- email/proto/email.pb.micro.go | 4 +- ethereum/Makefile | 4 +- ethereum/handler/etherscan.go | 6 +- ethereum/main.go | 4 +- ethereum/proto/ethereum.pb.micro.go | 4 +- evchargers/Makefile | 4 +- evchargers/handler/data.go | 2 +- evchargers/handler/evchargers.go | 6 +- evchargers/main.go | 4 +- evchargers/proto/evchargers.pb.micro.go | 4 +- event/Makefile | 4 +- event/handler/event.go | 6 +- event/main.go | 4 +- event/proto/event.pb.micro.go | 4 +- file/Makefile | 4 +- file/handler/files.go | 8 +- file/main.go | 4 +- file/proto/file.pb.micro.go | 4 +- forex/Makefile | 4 +- forex/handler/forex.go | 6 +- forex/main.go | 4 +- forex/proto/forex.pb.micro.go | 4 +- geocoding/Makefile | 4 +- geocoding/handler/handler.go | 4 +- geocoding/main.go | 6 +- geocoding/proto/geocoding.pb.micro.go | 4 +- gifs/Makefile | 4 +- gifs/handler/gifs.go | 6 +- gifs/main.go | 4 +- gifs/proto/gifs.pb.micro.go | 4 +- go.mod | 24 +++- go.sum | 161 ++++++++-------------- google/Makefile | 4 +- google/handler/google.go | 4 +- google/main.go | 6 +- google/proto/google.pb.micro.go | 4 +- helloworld/handler/helloworld.go | 2 +- helloworld/main.go | 4 +- helloworld/proto/helloworld.pb.micro.go | 4 +- holidays/Makefile | 4 +- holidays/handler/holidays.go | 10 +- holidays/main.go | 4 +- holidays/proto/holidays.pb.micro.go | 4 +- id/Makefile | 4 +- id/handler/id.go | 4 +- id/main.go | 4 +- id/proto/id.pb.micro.go | 4 +- image/Makefile | 4 +- image/handler/image.go | 8 +- image/main.go | 4 +- image/proto/image.pb.micro.go | 4 +- ip/Makefile | 4 +- ip/handler/ip.go | 4 +- ip/main.go | 8 +- ip/proto/ip.pb.micro.go | 4 +- lists/Makefile | 4 +- lists/handler/lists.go | 8 +- lists/main.go | 4 +- lists/proto/lists.pb.micro.go | 4 +- location/Makefile | 4 +- location/domain/domain.go | 2 +- location/handler/handler.go | 6 +- location/main.go | 2 +- location/proto/location.pb.micro.go | 4 +- memegen/Makefile | 4 +- memegen/handler/memegen.go | 6 +- memegen/main.go | 4 +- memegen/proto/memegen.pb.micro.go | 4 +- minecraft/Makefile | 4 +- minecraft/handler/minecraft.go | 2 +- minecraft/main.go | 4 +- minecraft/proto/minecraft.pb.micro.go | 4 +- movie/Makefile | 4 +- movie/handler/movie.go | 6 +- movie/main.go | 4 +- movie/proto/movie.pb.micro.go | 4 +- mq/Makefile | 4 +- mq/handler/mq.go | 4 +- mq/main.go | 4 +- mq/proto/mq.pb.micro.go | 4 +- news/Makefile | 4 +- news/handler/news.go | 2 +- news/main.go | 6 +- news/proto/news.pb.micro.go | 4 +- nft/Makefile | 4 +- nft/handler/opensea.go | 6 +- nft/main.go | 4 +- nft/proto/nft.pb.micro.go | 4 +- notes/Makefile | 4 +- notes/handler/notes.go | 8 +- notes/main.go | 4 +- notes/proto/notes.pb.micro.go | 4 +- otp/Makefile | 4 +- otp/handler/otp.go | 4 +- otp/main.go | 4 +- otp/proto/otp.pb.micro.go | 4 +- password/Makefile | 4 +- password/main.go | 4 +- password/proto/password.pb.micro.go | 4 +- ping/Makefile | 4 +- ping/handler/ping.go | 4 +- ping/main.go | 4 +- ping/proto/ping.pb.micro.go | 4 +- pkg/auth/auth.go | 4 +- pkg/cache/cache.go | 4 +- pkg/git/git.go | 2 +- pkg/git/git_test.go | 2 +- pkg/gorm/wrapper.go | 2 +- pkg/model/model.go | 2 +- pkg/redis/redis.go | 4 +- pkg/service/proto/admin.pb.micro.go | 6 +- pkg/tenant/tenant.go | 2 +- place/Makefile | 4 +- place/handler/google.go | 6 +- place/main.go | 4 +- place/proto/place.pb.micro.go | 4 +- postcode/Makefile | 4 +- postcode/handler/postcode.go | 4 +- postcode/main.go | 4 +- postcode/proto/postcode.pb.micro.go | 4 +- prayer/Makefile | 4 +- prayer/handler/prayer.go | 4 +- prayer/main.go | 4 +- prayer/proto/prayer.pb.micro.go | 4 +- price/Makefile | 4 +- price/crawler/crawler.go | 6 +- price/handler/price.go | 8 +- price/main.go | 4 +- price/proto/price.pb.micro.go | 4 +- qr/Makefile | 4 +- qr/handler/qr.go | 8 +- qr/main.go | 4 +- qr/proto/qr.pb.micro.go | 4 +- quran/Makefile | 4 +- quran/handler/quran.go | 4 +- quran/main.go | 4 +- quran/proto/quran.pb.micro.go | 4 +- routing/Makefile | 4 +- routing/handler/google.go | 4 +- routing/handler/osrm.go | 2 +- routing/main.go | 6 +- routing/proto/routing.pb.micro.go | 4 +- rss/Makefile | 2 +- rss/handler/crawl.go | 4 +- rss/handler/rss.go | 6 +- rss/main.go | 6 +- rss/proto/rss.pb.micro.go | 4 +- search/Makefile | 4 +- search/handler/search.go | 8 +- search/main.go | 4 +- search/proto/search.pb.micro.go | 4 +- secret/Makefile | 4 +- secret/handler/secret.go | 8 +- secret/main.go | 4 +- secret/proto/secret.pb.micro.go | 4 +- sentiment/Makefile | 2 +- sentiment/handler/sentiment.go | 2 +- sentiment/main.go | 4 +- sentiment/model/model.go | 2 +- sentiment/proto/sentiment.pb.micro.go | 4 +- sms/Makefile | 4 +- sms/handler/sms.go | 10 +- sms/main.go | 4 +- sms/proto/sms.pb.micro.go | 4 +- space/Makefile | 6 +- space/handler/space.go | 10 +- space/handler/space_test.go | 8 +- space/main.go | 4 +- space/proto/space.pb.micro.go | 4 +- spam/Makefile | 4 +- spam/handler/spam.go | 6 +- spam/main.go | 4 +- spam/proto/spam.pb.micro.go | 4 +- stock/Makefile | 4 +- stock/handler/stock.go | 4 +- stock/main.go | 6 +- stock/proto/stock.pb.micro.go | 4 +- stream/Makefile | 4 +- stream/handler/stream.go | 2 +- stream/main.go | 4 +- stream/proto/stream.pb.micro.go | 4 +- sunnah/Makefile | 4 +- sunnah/handler/sunnah.go | 4 +- sunnah/main.go | 6 +- sunnah/proto/sunnah.pb.micro.go | 4 +- test/blob-store/main.go | 6 +- test/chat/Makefile | 2 +- test/chat/client/main.go | 6 +- test/chat/handler/handler.go | 10 +- test/chat/main.go | 4 +- test/chat/proto/chat.pb.micro.go | 6 +- test/conf/main.go | 4 +- test/events/main.go | 8 +- test/kv/handler/handler.go | 4 +- test/kv/main.go | 2 +- test/kv/proto/example.pb.micro.go | 6 +- test/logger/main.go | 4 +- test/pubsub/main.go | 4 +- test/routes/proto/stream.pb.micro.go | 6 +- test/routes/routes-client/main.go | 4 +- test/routes/routes-server/main.go | 4 +- test/template/cmd/template/main.go | 4 +- test/template/handler/idiomatic.go | 2 +- test/template/proto/idiomatic.pb.micro.go | 6 +- thumbnail/Makefile | 2 +- thumbnail/handler/thumbnail.go | 6 +- thumbnail/main.go | 4 +- thumbnail/proto/thumbnail.pb.micro.go | 4 +- time/Makefile | 4 +- time/handler/time.go | 6 +- time/main.go | 4 +- time/proto/time.pb.micro.go | 4 +- translate/Makefile | 4 +- translate/handler/translate.go | 6 +- translate/main.go | 4 +- translate/proto/translate.pb.micro.go | 4 +- tunnel/Makefile | 4 +- tunnel/handler/ip.go | 2 +- tunnel/handler/tunnel.go | 8 +- tunnel/main.go | 4 +- tunnel/proto/tunnel.pb.micro.go | 4 +- twitter/Makefile | 4 +- twitter/handler/twitter.go | 6 +- twitter/main.go | 4 +- twitter/proto/twitter.pb.micro.go | 4 +- url/Makefile | 4 +- url/handler/url.go | 12 +- url/main.go | 4 +- url/proto/url.pb.micro.go | 4 +- user/Makefile | 4 +- user/domain/domain.go | 8 +- user/handler/handler.go | 6 +- user/main.go | 6 +- user/proto/user.pb.micro.go | 4 +- vehicle/Makefile | 4 +- vehicle/handler/vehicle.go | 6 +- vehicle/main.go | 6 +- vehicle/proto/admin.pb.micro.go | 6 +- vehicle/proto/vehicle.pb.micro.go | 4 +- wallet/Makefile | 2 +- wallet/handler/wallet.go | 8 +- wallet/main.go | 4 +- wallet/proto/wallet.pb.micro.go | 4 +- weather/Makefile | 4 +- weather/handler/weather.go | 6 +- weather/main.go | 4 +- weather/proto/weather.pb.micro.go | 4 +- youtube/Makefile | 4 +- youtube/handler/youtube.go | 4 +- youtube/main.go | 6 +- youtube/proto/youtube.pb.micro.go | 4 +- 313 files changed, 771 insertions(+), 800 deletions(-) diff --git a/address/Makefile b/address/Makefile index ed28b3dd01..bbc896cc33 100644 --- a/address/Makefile +++ b/address/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/address/handler/address.go b/address/handler/address.go index 5f7229838a..edc80262e7 100644 --- a/address/handler/address.go +++ b/address/handler/address.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/address/proto" "github.com/micro/services/pkg/api" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) var ( diff --git a/address/handler/postcoder.go b/address/handler/postcoder.go index ef74910cd0..6d44bed11b 100644 --- a/address/handler/postcoder.go +++ b/address/handler/postcoder.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/address/proto" "github.com/micro/services/pkg/api" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) var ( diff --git a/address/main.go b/address/main.go index 49adc56eca..f938728795 100644 --- a/address/main.go +++ b/address/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/address/handler" pb "github.com/micro/services/address/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) func main() { diff --git a/address/proto/address.pb.micro.go b/address/proto/address.pb.micro.go index 8d93150917..d4eb298546 100644 --- a/address/proto/address.pb.micro.go +++ b/address/proto/address.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/ai/Makefile b/ai/Makefile index 2da1687bba..44f7c5b3e3 100644 --- a/ai/Makefile +++ b/ai/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/ai/handler/ai.go b/ai/handler/ai.go index db309e7b71..63cfe2573b 100644 --- a/ai/handler/ai.go +++ b/ai/handler/ai.go @@ -4,12 +4,12 @@ import ( "context" "time" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/ai/proto" "github.com/micro/services/pkg/api" "github.com/micro/services/pkg/tenant" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" ) type Ai struct{} diff --git a/ai/main.go b/ai/main.go index cbda3aea33..ac6258a3e1 100644 --- a/ai/main.go +++ b/ai/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/ai/handler" pb "github.com/micro/services/ai/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/ai/proto/ai.pb.micro.go b/ai/proto/ai.pb.micro.go index 3afc751952..ca9492bfeb 100644 --- a/ai/proto/ai.pb.micro.go +++ b/ai/proto/ai.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/avatar/Makefile b/avatar/Makefile index 221d1b5f43..1d5d4038a5 100644 --- a/avatar/Makefile +++ b/avatar/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/avatar/handler/avatar.go b/avatar/handler/avatar.go index 5471da04f2..80d3fca1f5 100644 --- a/avatar/handler/avatar.go +++ b/avatar/handler/avatar.go @@ -10,8 +10,8 @@ import ( "image/png" "github.com/google/uuid" + "github.com/micro/micro/v5/service/errors" "github.com/o1egl/govatar" - "micro.dev/v4/service/errors" pb "github.com/micro/services/avatar/proto" imagePb "github.com/micro/services/image/proto" diff --git a/avatar/main.go b/avatar/main.go index ae7be1a7ab..627bac3ed8 100644 --- a/avatar/main.go +++ b/avatar/main.go @@ -5,8 +5,8 @@ import ( pb "github.com/micro/services/avatar/proto" imagePb "github.com/micro/services/image/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/avatar/proto/avatar.pb.micro.go b/avatar/proto/avatar.pb.micro.go index 02f9b4035e..bf4782d162 100644 --- a/avatar/proto/avatar.pb.micro.go +++ b/avatar/proto/avatar.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/bitcoin/Makefile b/bitcoin/Makefile index 0f353d4d18..2c4f088111 100644 --- a/bitcoin/Makefile +++ b/bitcoin/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install github.com/golang/protobuf/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/bitcoin/handler/bitcoin.go b/bitcoin/handler/bitcoin.go index aefd149066..b7e6867a2b 100644 --- a/bitcoin/handler/bitcoin.go +++ b/bitcoin/handler/bitcoin.go @@ -6,11 +6,11 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/bitcoin/proto" "github.com/micro/services/pkg/api" "github.com/patrickmn/go-cache" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Bitcoin struct { diff --git a/bitcoin/main.go b/bitcoin/main.go index 924bbb650f..eca48c10f7 100644 --- a/bitcoin/main.go +++ b/bitcoin/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/bitcoin/handler" pb "github.com/micro/services/bitcoin/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/bitcoin/proto/bitcoin.pb.micro.go b/bitcoin/proto/bitcoin.pb.micro.go index c796a81816..d27701562b 100644 --- a/bitcoin/proto/bitcoin.pb.micro.go +++ b/bitcoin/proto/bitcoin.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cache/Makefile b/cache/Makefile index 5617e01a86..e30ec3d9fb 100644 --- a/cache/Makefile +++ b/cache/Makefile @@ -9,8 +9,8 @@ api: init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: diff --git a/cache/handler/cache.go b/cache/handler/cache.go index 1697f541fd..f854c52cde 100644 --- a/cache/handler/cache.go +++ b/cache/handler/cache.go @@ -6,13 +6,13 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/cache/proto" pauth "github.com/micro/services/pkg/auth" "github.com/micro/services/pkg/cache" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" ) type Cache struct{} diff --git a/cache/main.go b/cache/main.go index be79920029..ae5abfb3b1 100644 --- a/cache/main.go +++ b/cache/main.go @@ -5,8 +5,8 @@ import ( pb "github.com/micro/services/cache/proto" adminpb "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/cache/proto/cache.pb.micro.go b/cache/proto/cache.pb.micro.go index 98fa06ec54..d1806ba942 100644 --- a/cache/proto/cache.pb.micro.go +++ b/cache/proto/cache.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/carbon/Makefile b/carbon/Makefile index fe890f7aa1..d5d30e46bf 100644 --- a/carbon/Makefile +++ b/carbon/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/carbon/handler/carbon.go b/carbon/handler/carbon.go index cf1fb08711..d81bada877 100644 --- a/carbon/handler/carbon.go +++ b/carbon/handler/carbon.go @@ -3,11 +3,11 @@ package handler import ( "context" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/carbon/domain" "github.com/micro/services/pkg/api" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" pb "github.com/micro/services/carbon/proto" ) diff --git a/carbon/main.go b/carbon/main.go index ec836a4251..795d80b794 100644 --- a/carbon/main.go +++ b/carbon/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/carbon/handler" pb "github.com/micro/services/carbon/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/carbon/proto/carbon.pb.micro.go b/carbon/proto/carbon.pb.micro.go index 078365f985..b23743171f 100644 --- a/carbon/proto/carbon.pb.micro.go +++ b/carbon/proto/carbon.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/chat/Makefile b/chat/Makefile index 7eafb0b6e5..4208318ce4 100644 --- a/chat/Makefile +++ b/chat/Makefile @@ -4,7 +4,7 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-micro .PHONY: api api: diff --git a/chat/handler/handler.go b/chat/handler/handler.go index 87840d5202..59121a28fd 100644 --- a/chat/handler/handler.go +++ b/chat/handler/handler.go @@ -6,12 +6,12 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/events" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/chat/proto" "github.com/micro/services/pkg/tenant" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/events" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const ( diff --git a/chat/main.go b/chat/main.go index 7a80a36d84..72796dc9dc 100644 --- a/chat/main.go +++ b/chat/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/chat/handler" pb "github.com/micro/services/chat/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/chat/proto/chat.pb.micro.go b/chat/proto/chat.pb.micro.go index f36ea6ea9b..d784f9158e 100644 --- a/chat/proto/chat.pb.micro.go +++ b/chat/proto/chat.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/comments/Makefile b/comments/Makefile index 5b232b0636..b89e620208 100644 --- a/comments/Makefile +++ b/comments/Makefile @@ -9,8 +9,8 @@ api: init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: diff --git a/comments/handler/comments.go b/comments/handler/comments.go index 2cc82c1ed6..e551ea7034 100644 --- a/comments/handler/comments.go +++ b/comments/handler/comments.go @@ -7,16 +7,16 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service/client" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/comments/proto" streamPb "github.com/micro/services/mq/proto" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" "google.golang.org/protobuf/types/known/structpb" - "micro.dev/v4/service/client" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) // New returns an initialized Comments diff --git a/comments/main.go b/comments/main.go index 14a0ea20c0..7ae369dc94 100644 --- a/comments/main.go +++ b/comments/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + log "github.com/micro/micro/v5/service/logger" "github.com/micro/services/comments/handler" pb "github.com/micro/services/comments/proto" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - log "micro.dev/v4/service/logger" ) func main() { diff --git a/comments/proto/comments.pb.micro.go b/comments/proto/comments.pb.micro.go index 197f90eb58..b8467a1c9d 100644 --- a/comments/proto/comments.pb.micro.go +++ b/comments/proto/comments.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/contact/Makefile b/contact/Makefile index 98a33afecf..a4700c3653 100644 --- a/contact/Makefile +++ b/contact/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/contact/domain/contact.go b/contact/domain/contact.go index dbfcad826d..df72c89d7d 100644 --- a/contact/domain/contact.go +++ b/contact/domain/contact.go @@ -6,8 +6,8 @@ import ( "fmt" "time" + "github.com/micro/micro/v5/service/store" "github.com/pkg/errors" - "micro.dev/v4/service/store" pb "github.com/micro/services/contact/proto" "github.com/micro/services/pkg/tenant" diff --git a/contact/handler/contact.go b/contact/handler/contact.go index b39dd5d59b..1b45ce6760 100644 --- a/contact/handler/contact.go +++ b/contact/handler/contact.go @@ -5,11 +5,11 @@ import ( "strings" "github.com/google/uuid" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" "github.com/micro/services/contact/domain" pb "github.com/micro/services/contact/proto" diff --git a/contact/main.go b/contact/main.go index 2b94a9d6fe..6787b2f39f 100644 --- a/contact/main.go +++ b/contact/main.go @@ -1,15 +1,15 @@ package main import ( + "github.com/micro/micro/v5/service/store" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service/store" "github.com/micro/services/contact/domain" "github.com/micro/services/contact/handler" pb "github.com/micro/services/contact/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/contact/proto/contact.pb.micro.go b/contact/proto/contact.pb.micro.go index a17275742d..8c4dee5c16 100644 --- a/contact/proto/contact.pb.micro.go +++ b/contact/proto/contact.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cron/Makefile b/cron/Makefile index 9af5211a96..32dd38f461 100644 --- a/cron/Makefile +++ b/cron/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/cron/handler/cron.go b/cron/handler/cron.go index 3409ab21f7..28780e2fd6 100644 --- a/cron/handler/cron.go +++ b/cron/handler/cron.go @@ -8,12 +8,12 @@ import ( "sync" "github.com/google/uuid" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/cron/proto" "github.com/micro/services/pkg/tenant" "github.com/robfig/cron/v3" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) type Cron struct { diff --git a/cron/main.go b/cron/main.go index cb6126094c..0dabae4351 100644 --- a/cron/main.go +++ b/cron/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/cron/handler" pb "github.com/micro/services/cron/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/cron/proto/cron.pb.micro.go b/cron/proto/cron.pb.micro.go index 2f6467ab81..5dbe98a77d 100644 --- a/cron/proto/cron.pb.micro.go +++ b/cron/proto/cron.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/crypto/Makefile b/crypto/Makefile index bb6f63344c..93d1ba0936 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/crypto/handler/crypto.go b/crypto/handler/crypto.go index c7017d43b9..74d1b6e365 100644 --- a/crypto/handler/crypto.go +++ b/crypto/handler/crypto.go @@ -9,11 +9,11 @@ import ( "regexp" "time" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/crypto/proto" "github.com/patrickmn/go-cache" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) var ( diff --git a/crypto/main.go b/crypto/main.go index 87327143c7..524245dbce 100644 --- a/crypto/main.go +++ b/crypto/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/crypto/handler" pb "github.com/micro/services/crypto/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/crypto/proto/crypto.pb.micro.go b/crypto/proto/crypto.pb.micro.go index ec7a41f9ac..9eefc013ba 100644 --- a/crypto/proto/crypto.pb.micro.go +++ b/crypto/proto/crypto.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/currency/Makefile b/currency/Makefile index b560bbec06..5337409d56 100644 --- a/currency/Makefile +++ b/currency/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/currency/handler/currency.go b/currency/handler/currency.go index a7612e1fe3..925c9dc2ac 100644 --- a/currency/handler/currency.go +++ b/currency/handler/currency.go @@ -10,10 +10,10 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/currency/proto" "github.com/patrickmn/go-cache" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) var ( diff --git a/currency/main.go b/currency/main.go index c6143dfb75..4baf75b0a8 100644 --- a/currency/main.go +++ b/currency/main.go @@ -3,12 +3,12 @@ package main import ( "time" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/currency/handler" pb "github.com/micro/services/currency/proto" "github.com/patrickmn/go-cache" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) func main() { diff --git a/currency/proto/currency.pb.micro.go b/currency/proto/currency.pb.micro.go index 901c0c2cca..de83ff2727 100644 --- a/currency/proto/currency.pb.micro.go +++ b/currency/proto/currency.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/db/Makefile b/db/Makefile index 618778db49..58b6b9bf2b 100644 --- a/db/Makefile +++ b/db/Makefile @@ -4,7 +4,7 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-micro .PHONY: api api: diff --git a/db/handler/db.go b/db/handler/db.go index 849a12951c..3c20c971e8 100644 --- a/db/handler/db.go +++ b/db/handler/db.go @@ -9,6 +9,8 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" db "github.com/micro/services/db/proto" pauth "github.com/micro/services/pkg/auth" gorm2 "github.com/micro/services/pkg/gorm" @@ -18,8 +20,6 @@ import ( "google.golang.org/protobuf/types/known/structpb" "gorm.io/datatypes" "gorm.io/gorm" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) const idKey = "id" diff --git a/db/handler/integration_test.go b/db/handler/integration_test.go index dd9fcc4bb8..7ec449c109 100644 --- a/db/handler/integration_test.go +++ b/db/handler/integration_test.go @@ -7,9 +7,9 @@ import ( "database/sql" + "github.com/micro/micro/v5/service/auth" db "github.com/micro/services/db/proto" "google.golang.org/protobuf/types/known/structpb" - "micro.dev/v4/service/auth" ) const dbAddr = "postgresql://postgres:postgres@postgres:5432/postgres?sslmode=disable" diff --git a/db/main.go b/db/main.go index 962c5d414b..b6d61e5db7 100644 --- a/db/main.go +++ b/db/main.go @@ -4,12 +4,12 @@ import ( "database/sql" _ "github.com/jackc/pgx/v4/stdlib" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/db/handler" pb "github.com/micro/services/db/proto" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) var dbAddress = "postgresql://postgres:postgres@localhost:5432/db?sslmode=disable" diff --git a/db/proto/db.pb.micro.go b/db/proto/db.pb.micro.go index c71be5f3f5..d43216aa56 100644 --- a/db/proto/db.pb.micro.go +++ b/db/proto/db.pb.micro.go @@ -12,8 +12,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/dns/Makefile b/dns/Makefile index b3b1ee8820..e5fbb0d39d 100644 --- a/dns/Makefile +++ b/dns/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install github.com/golang/protobuf/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/dns/handler/dns.go b/dns/handler/dns.go index 2ed5f83581..6b54ff0ade 100644 --- a/dns/handler/dns.go +++ b/dns/handler/dns.go @@ -7,8 +7,8 @@ import ( "github.com/likexian/doh-go/dns" "github.com/likexian/whois" "github.com/likexian/whois-parser" + "github.com/micro/micro/v5/service/errors" pb "github.com/micro/services/dns/proto" - "micro.dev/v4/service/errors" ) type Dns struct{} diff --git a/dns/main.go b/dns/main.go index 6f0dd9d4cd..7a2f7700f1 100644 --- a/dns/main.go +++ b/dns/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/dns/handler" pb "github.com/micro/services/dns/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/dns/proto/dns.pb.micro.go b/dns/proto/dns.pb.micro.go index 8efceb6b99..b7d5b5f048 100644 --- a/dns/proto/dns.pb.micro.go +++ b/dns/proto/dns.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/email/Makefile b/email/Makefile index 5e498c6a68..596bd962d1 100644 --- a/email/Makefile +++ b/email/Makefile @@ -4,7 +4,7 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-micro .PHONY: api api: protoc --openapi_out=. --proto_path=. proto/email.proto diff --git a/email/handler/email.go b/email/handler/email.go index 7e111771fa..46cd63ef1e 100644 --- a/email/handler/email.go +++ b/email/handler/email.go @@ -10,15 +10,15 @@ import ( "net/mail" "regexp" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/client" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/email/proto" "github.com/micro/services/pkg/tenant" spampb "github.com/micro/services/spam/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/client" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const ( diff --git a/email/main.go b/email/main.go index 42ed78bd94..2333fadff7 100644 --- a/email/main.go +++ b/email/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/email/handler" pb "github.com/micro/services/email/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/email/proto/email.pb.micro.go b/email/proto/email.pb.micro.go index 6d5cd27d8d..6a7e9346d5 100644 --- a/email/proto/email.pb.micro.go +++ b/email/proto/email.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/ethereum/Makefile b/ethereum/Makefile index 7c37afaae9..eab98e018c 100644 --- a/ethereum/Makefile +++ b/ethereum/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/ethereum/handler/etherscan.go b/ethereum/handler/etherscan.go index 41313ba4fe..c02269f777 100644 --- a/ethereum/handler/etherscan.go +++ b/ethereum/handler/etherscan.go @@ -6,11 +6,11 @@ import ( "strconv" "time" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/ethereum/proto" "github.com/micro/services/pkg/api" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) // Etherscan handler diff --git a/ethereum/main.go b/ethereum/main.go index c64c3e3ce6..28fae6ca30 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/ethereum/handler" pb "github.com/micro/services/ethereum/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/ethereum/proto/ethereum.pb.micro.go b/ethereum/proto/ethereum.pb.micro.go index c836eaeb7f..f9f4b4757a 100644 --- a/ethereum/proto/ethereum.pb.micro.go +++ b/ethereum/proto/ethereum.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/evchargers/Makefile b/evchargers/Makefile index 3e9ca83d81..4ec6747719 100644 --- a/evchargers/Makefile +++ b/evchargers/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/evchargers/handler/data.go b/evchargers/handler/data.go index 83809a8621..6de880d073 100644 --- a/evchargers/handler/data.go +++ b/evchargers/handler/data.go @@ -8,9 +8,9 @@ import ( "net/http" "time" + "github.com/micro/micro/v5/service/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo/options" - "micro.dev/v4/service/logger" ) func (e *Evchargers) loadPOIData(r io.Reader) (int, error) { diff --git a/evchargers/handler/evchargers.go b/evchargers/handler/evchargers.go index daafe2e831..d8ce17b7f6 100644 --- a/evchargers/handler/evchargers.go +++ b/evchargers/handler/evchargers.go @@ -8,15 +8,15 @@ import ( "strconv" "time" + "github.com/micro/micro/v5/service/errors" "github.com/robfig/cron/v3" - "micro.dev/v4/service/errors" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - "micro.dev/v4/service/config" - log "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service/config" + log "github.com/micro/micro/v5/service/logger" evchargers "github.com/micro/services/evchargers/proto" ) diff --git a/evchargers/main.go b/evchargers/main.go index 7d5293104b..9d9a5e81bb 100644 --- a/evchargers/main.go +++ b/evchargers/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/evchargers/handler" pb "github.com/micro/services/evchargers/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/evchargers/proto/evchargers.pb.micro.go b/evchargers/proto/evchargers.pb.micro.go index 7b2fda6fac..a9bf364592 100644 --- a/evchargers/proto/evchargers.pb.micro.go +++ b/evchargers/proto/evchargers.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/event/Makefile b/event/Makefile index 52372db1ab..6254f51551 100644 --- a/event/Makefile +++ b/event/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/event/handler/event.go b/event/handler/event.go index a84377ff0a..4ba664b36d 100644 --- a/event/handler/event.go +++ b/event/handler/event.go @@ -6,12 +6,12 @@ import ( "path" "time" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/events" + log "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/event/proto" "github.com/micro/services/pkg/tenant" "google.golang.org/protobuf/types/known/structpb" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/events" - log "micro.dev/v4/service/logger" ) type Event struct{} diff --git a/event/main.go b/event/main.go index 65b0860fef..372a70d816 100644 --- a/event/main.go +++ b/event/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/event/handler" pb "github.com/micro/services/event/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/event/proto/event.pb.micro.go b/event/proto/event.pb.micro.go index 7acba3a4a8..37635d4678 100644 --- a/event/proto/event.pb.micro.go +++ b/event/proto/event.pb.micro.go @@ -12,8 +12,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/file/Makefile b/file/Makefile index 9d602bdf6c..7b6b1e5284 100644 --- a/file/Makefile +++ b/file/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: protoc --proto_path=. --micro_out=. --go_out=:. proto/file.proto diff --git a/file/handler/files.go b/file/handler/files.go index 0a4effba73..38e89daeae 100644 --- a/file/handler/files.go +++ b/file/handler/files.go @@ -8,14 +8,14 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" file "github.com/micro/services/file/proto" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const pathPrefix = "files" diff --git a/file/main.go b/file/main.go index 0f69b6a98a..4192f8e85d 100644 --- a/file/main.go +++ b/file/main.go @@ -5,8 +5,8 @@ import ( pb "github.com/micro/services/file/proto" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/file/proto/file.pb.micro.go b/file/proto/file.pb.micro.go index fe1a3f3399..02e25ffd08 100644 --- a/file/proto/file.pb.micro.go +++ b/file/proto/file.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/forex/Makefile b/forex/Makefile index 26ee9cce38..7556c74fdb 100644 --- a/forex/Makefile +++ b/forex/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/forex/handler/forex.go b/forex/handler/forex.go index d6b45aa760..b8bc6f2821 100644 --- a/forex/handler/forex.go +++ b/forex/handler/forex.go @@ -9,11 +9,11 @@ import ( "regexp" "time" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/forex/proto" "github.com/patrickmn/go-cache" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) var ( diff --git a/forex/main.go b/forex/main.go index 94897a5185..b1cb173896 100644 --- a/forex/main.go +++ b/forex/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/forex/handler" pb "github.com/micro/services/forex/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/forex/proto/forex.pb.micro.go b/forex/proto/forex.pb.micro.go index 219bf8c87d..16cde630f3 100644 --- a/forex/proto/forex.pb.micro.go +++ b/forex/proto/forex.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/geocoding/Makefile b/geocoding/Makefile index c79be6a637..e165936824 100644 --- a/geocoding/Makefile +++ b/geocoding/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: protoc --openapi_out=. --proto_path=. --micro_out=. --go_out=:. proto/geocoding.proto diff --git a/geocoding/handler/handler.go b/geocoding/handler/handler.go index 181aa7fbd8..27e323c58c 100644 --- a/geocoding/handler/handler.go +++ b/geocoding/handler/handler.go @@ -4,9 +4,9 @@ import ( "context" "strings" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" "googlemaps.github.io/maps" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" pb "github.com/micro/services/geocoding/proto" ) diff --git a/geocoding/main.go b/geocoding/main.go index fd0f22b1e0..7556e6662a 100644 --- a/geocoding/main.go +++ b/geocoding/main.go @@ -4,10 +4,10 @@ import ( "github.com/micro/services/geocoding/handler" pb "github.com/micro/services/geocoding/proto" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "googlemaps.github.io/maps" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) func main() { diff --git a/geocoding/proto/geocoding.pb.micro.go b/geocoding/proto/geocoding.pb.micro.go index 5b0552ad78..078ceda2b2 100644 --- a/geocoding/proto/geocoding.pb.micro.go +++ b/geocoding/proto/geocoding.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/gifs/Makefile b/gifs/Makefile index e8f8e266a6..19a5af0d2e 100644 --- a/gifs/Makefile +++ b/gifs/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/gifs/handler/gifs.go b/gifs/handler/gifs.go index 6175b3c1c4..eab0fb35c3 100644 --- a/gifs/handler/gifs.go +++ b/gifs/handler/gifs.go @@ -8,10 +8,10 @@ import ( "net/http" "strconv" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" gifs "github.com/micro/services/gifs/proto" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) const ( diff --git a/gifs/main.go b/gifs/main.go index 1a103dfc5d..bc41c02243 100644 --- a/gifs/main.go +++ b/gifs/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/gifs/handler" pb "github.com/micro/services/gifs/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/gifs/proto/gifs.pb.micro.go b/gifs/proto/gifs.pb.micro.go index a10f53227f..69620cfd78 100644 --- a/gifs/proto/gifs.pb.micro.go +++ b/gifs/proto/gifs.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go.mod b/go.mod index cfb1dc15fc..c1ce3d6f43 100644 --- a/go.mod +++ b/go.mod @@ -31,6 +31,7 @@ require ( github.com/likexian/whois-parser v1.24.2 github.com/matoous/go-nanoid/v2 v2.0.0 github.com/mattheath/kala v0.0.0-20171219141654-d6276794bf0e + github.com/micro/micro/v5 v5.0.0 github.com/minio/minio-go/v7 v7.0.16 github.com/o1egl/govatar v0.3.0 github.com/oklog/ulid v1.3.1 @@ -52,9 +53,9 @@ require ( github.com/tkuchiki/go-timezone v0.2.2 github.com/xanzy/go-gitlab v0.35.1 go.mongodb.org/mongo-driver v1.7.2 - golang.org/x/crypto v0.22.0 + golang.org/x/crypto v0.31.0 golang.org/x/oauth2 v0.17.0 - golang.org/x/text v0.14.0 + golang.org/x/text v0.21.0 google.golang.org/api v0.162.0 google.golang.org/protobuf v1.33.0 googlemaps.github.io/maps v1.3.1 @@ -62,7 +63,6 @@ require ( gorm.io/datatypes v1.0.1 gorm.io/driver/postgres v1.5.7 gorm.io/gorm v1.25.9 - micro.dev/v4 v4.6.0 ) require ( @@ -80,12 +80,16 @@ require ( github.com/dghubble/sling v1.3.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-stack/stack v1.8.0 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-querystring v1.0.0 // indirect + github.com/google/s2a-go v0.1.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/websocket v1.5.1 // indirect @@ -100,6 +104,8 @@ require ( github.com/jackc/pgproto3/v2 v2.3.3 // indirect github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect github.com/jackc/pgtype v1.14.3 // indirect + github.com/jackc/pgx/v5 v5.5.5 // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect @@ -119,7 +125,6 @@ require ( github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sendgrid/rest v2.6.4+incompatible // indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/teamwork/test v0.0.0-20200108114543-02621bae84ad // indirect github.com/teamwork/utils v0.0.0-20211103135549-f7e7a68ba696 // indirect @@ -130,16 +135,21 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.0.2 // indirect github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect go.etcd.io/bbolt v1.3.9 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect + go.opentelemetry.io/otel v1.22.0 // indirect + go.opentelemetry.io/otel/metric v1.22.0 // indirect + go.opentelemetry.io/otel/trace v1.22.0 // indirect golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect golang.org/x/net v0.24.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.19.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect google.golang.org/grpc v1.63.2 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/fsnotify.v1 v1.4.7 // indirect diff --git a/go.sum b/go.sum index 26407855a9..be91376f11 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,10 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= -cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY= -cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= -cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg= -cloud.google.com/go/translate v1.6.0 h1:oBW4KVgcUq4OAXGdKEdyV7lqWiA3keQ3+8FKreAQv4g= -cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= cloud.google.com/go/translate v1.10.1 h1:upovZ0wRMdzZvXnu+RPam41B0mRJ+coRXFP2cYFJ7ew= cloud.google.com/go/translate v1.10.1/go.mod h1:adGZcQNom/3ogU65N9UXHOnnSvjPwA/jKQUMnsYXOyk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -34,10 +26,8 @@ github.com/aws/aws-sdk-go v1.42.17 h1:NEMRZcLd+YhXhUqdjwqNGtEYthiUZ+3BudGmK4/0ya github.com/aws/aws-sdk-go v1.42.17/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 h1:OYA+5W64v3OgClL+IrOD63t4i/RW7RqrAVl9LTZ9UqQ= github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394/go.mod h1:Q8n74mJTIgjX4RBBcHnJ05h//6/k6foqmgE45jTQtxg= -github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= -github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/bitly/go-simplejson v0.5.1 h1:xgwPbetQScXt1gh9BmoJ6j9JMr3TElvuIyjR8pgdoow= github.com/bitly/go-simplejson v0.5.1/go.mod h1:YOPVLzCfwK14b4Sff3oP1AmGhI9T9Vsg84etUnlyp+Q= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/cdipaolo/goml v0.0.0-20190412180403-e1f51f713598 h1:j2XRGH5Y5uWtBYXGwmrjKeM/kfu/jh7ZcnrGvyN5Ttk= @@ -55,9 +45,7 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/crufter/lexer v0.0.0-20120907053443-23fe8c7add01 h1:3BwOWuIBrZtUqFUnGKHXhyBxF8l1BKX+5N7V5TgDLhU= @@ -80,15 +68,19 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch/v5 v5.5.0 h1:bAmFiUJ+o0o2B4OiTFeE3MqCOtyo+jjPP9iZ0VRxYUc= -github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= +github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/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-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4= github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= @@ -127,8 +119,7 @@ github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPh github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gojuno/go.osrm v0.1.1-0.20200217151037-435fc3e1d3d4 h1:ZhyiVDRMAdbMPFmzJMAK3GVbUG5abPRUMC9jySXcfCU= github.com/gojuno/go.osrm v0.1.1-0.20200217151037-435fc3e1d3d4/go.mod h1:XPCHB/Ir2/vHnqhKlfUxIiUGHFtTzgrRxD89JdkJhrs= -github.com/golang-jwt/jwt v0.0.0-20210529014511-0f726ea0e725 h1:fMKUGzqjXWLpddTodG8KO9moexa9bZMFQSkJRDefXpI= -github.com/golang-jwt/jwt v0.0.0-20210529014511-0f726ea0e725/go.mod h1:aHjnehRD4y8BHKf+z8wAPIRTd/3cm+FrvC6kQIDhV3o= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= @@ -150,12 +141,10 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -167,8 +156,6 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= @@ -176,24 +163,21 @@ github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +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/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= -github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/hablullah/go-juliandays v1.0.0 h1:A8YM7wIj16SzlKT0SRJc9CD29iiaUzpBLzh5hr0/5p0= github.com/hablullah/go-juliandays v1.0.0/go.mod h1:0JOYq4oFOuDja+oospuc61YoX+uNEn7Z6uHYTbBzdGc= @@ -227,8 +211,6 @@ github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpT github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.13.0 h1:3L1XMNV2Zvca/8BYhzcRFS70Lr0WlDg16Di6SFGAbys= -github.com/jackc/pgconn v1.13.0/go.mod h1:AnowpAqO4CMIIJNZl2VJp+KrkAZciAkhEl0W0JIobpI= github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w= github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= @@ -247,14 +229,12 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1: github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.3.1 h1:nwj7qwf0S+Q7ISFfBndqeLwSwxs+4DPsbRFjECT1Y4Y= -github.com/jackc/pgproto3/v2 v2.3.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA= github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= @@ -264,8 +244,6 @@ github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkAL github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w= -github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgtype v1.14.3 h1:h6W9cPuHsRWQFTWUZMAKMgG5jSwQI0Zurzdvlx3Plus= github.com/jackc/pgtype v1.14.3/go.mod h1:aKeozOde08iifGosdJpz9MBZonJOUJxqNpPBcMJTlVA= @@ -277,23 +255,23 @@ github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6 github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.17.2 h1:0Ut0rpeKwvIVbMQ1KbMBU4h6wxehBI535LK6Flheh8E= -github.com/jackc/pgx/v4 v4.17.2/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw= github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= +github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw= +github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -363,9 +341,10 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= -github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= -github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/micro/micro/v5 v5.0.0 h1:42Ou08wlcSfEYJGmL6J+YOnvm179zMvWUUpwTytqSJA= +github.com/micro/micro/v5 v5.0.0/go.mod h1:shxmlx2KX4QgbMlowcNaE2NiJHVxeUnWFtfaPxt0W1o= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= github.com/minio/minio-go/v7 v7.0.16 h1:GspaSBS8lOuEUCAqMe0W3UxSoyOA4b4F8PTspRVI+k4= github.com/minio/minio-go/v7 v7.0.16/go.mod h1:pUV0Pc+hPd1nccgmzQF/EXh48l/Z/yps6QPF1aaie4g= @@ -425,8 +404,7 @@ github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c= @@ -441,8 +419,6 @@ github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9Nz github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -457,8 +433,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -468,16 +444,15 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ 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 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/teamwork/test v0.0.0-20190410143529-8897d82f8d46/go.mod h1:TIbx7tx6WHBjQeLRM4eWQZBL7kmBZ7/KI4x4v7Y5YmA= github.com/teamwork/test v0.0.0-20200108114543-02621bae84ad h1:25sEr0awm0ZPancg5W5H5VvN7PWsJloUBpii10a9isw= github.com/teamwork/test v0.0.0-20200108114543-02621bae84ad/go.mod h1:TIbx7tx6WHBjQeLRM4eWQZBL7kmBZ7/KI4x4v7Y5YmA= github.com/teamwork/utils v0.0.0-20211103135549-f7e7a68ba696 h1:G6Hc6/KxUmHxZsCgkXOyxp6UzBrkSA/zQjZWNBWzL3A= github.com/teamwork/utils v0.0.0-20211103135549-f7e7a68ba696/go.mod h1:3Fn0qxFeRNpvsg/9T1+btOOOKkd1qG2nPYKKcOmNpcs= -github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf h1:Z2X3Os7oRzpdJ75iPqWZc0HeJWFYNCvKsfpQwFpRNTA= -github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0= +github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 h1:xzABM9let0HLLqFypcxvLmlvEciCHL7+Lv+4vwZqecI= github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569/go.mod h1:2Ly+NIftZN4de9zRmENdYbvPQeaVIYKWpLFStLFEBgI= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= @@ -489,8 +464,7 @@ github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2/go.mod h1:4kyMkleCi github.com/ttacon/libphonenumber v1.2.1 h1:fzOfY5zUADkCkbIafAed11gL1sW+bJ26p6zWLBMElR4= github.com/ttacon/libphonenumber v1.2.1/go.mod h1:E0TpmdVMq5dyVlQ7oenAkhsLu86OkUl+yR4OAxyEg/M= github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= -github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/xanzy/go-gitlab v0.35.1 h1:jJSgT0NxjCvrSZf7Gvn2NxxV9xAYkTjYrKW8XwWhrfY= github.com/xanzy/go-gitlab v0.35.1/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= @@ -500,18 +474,28 @@ github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= +github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= go.mongodb.org/mongo-driver v1.7.2 h1:pFttQyIiJUHEn50YfZgC9ECjITMT44oiN36uArf/OFg= go.mongodb.org/mongo-driver v1.7.2/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= +go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= +go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -541,12 +525,10 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= -golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -565,7 +547,6 @@ golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191116160921-f9c825593386/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -575,17 +556,14 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -596,9 +574,9 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/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 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -614,7 +592,6 @@ golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -626,10 +603,10 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/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.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= @@ -645,11 +622,11 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= @@ -672,39 +649,35 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= 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.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.110.0 h1:l+rh0KYUooe9JGbGVx71tbFo4SMbMTXK3I3ia2QSEeU= -google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.162.0 h1:Vhs54HkaEpkMBdgGdOT2P6F0csGG/vxDS0hWHJzmmps= google.golang.org/api v0.162.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYlAHs0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.54.1 h1:zQZQNqQZU9cHv2vLdDhB2mFeDZ2hGpgYM1A0PKjFsSM= -google.golang.org/grpc v1.54.1/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -717,8 +690,7 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= googlemaps.github.io/maps v1.3.1 h1:VYFiLFgZyDVFYjPKLedOWxjmrwuaJFAc4EhqGNZfX40= googlemaps.github.io/maps v1.3.1/go.mod h1:cCq0JKYAnnCRSdiaBi7Ex9CW15uxIAk7oPi8V/xEh6s= @@ -738,7 +710,6 @@ gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -750,12 +721,10 @@ gorm.io/datatypes v1.0.1/go.mod h1:HEHoUU3/PO5ZXfAJcVWl11+zWlE16+O0X2DgJEb4Ixs= gorm.io/driver/mysql v1.0.5 h1:WAAmvLK2rG0tCOqrf5XcLi2QUwugd4rcVJ/W3aoon9o= gorm.io/driver/mysql v1.0.5/go.mod h1:N1OIhHAIhx5SunkMGqWbGFVeh4yTNWKmMo1GOAsohLI= gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg= -gorm.io/driver/postgres v1.4.5 h1:mTeXTTtHAgnS9PgmhN2YeUbazYpLhUI1doLnw42XUZc= -gorm.io/driver/postgres v1.4.5/go.mod h1:GKNQYSJ14qvWkvPwXljMGehpKrhlDNsqYRr5HnYGncg= +gorm.io/driver/postgres v1.5.7 h1:8ptbNJTDbEmhdr62uReG5BGkdQyeasu/FZHxI0IMGnM= gorm.io/driver/postgres v1.5.7/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA= gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= -gorm.io/driver/sqlite v1.4.3 h1:HBBcZSDnWi5BW3B3rwvVTc510KGkBkexlOg0QrmLUuU= -gorm.io/driver/sqlite v1.4.3/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI= +gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E= gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE= gorm.io/driver/sqlserver v1.0.7 h1:uwUtb0kdFwW5PkRbd2KJ2h4wlsqvLSjox1XVg/RnzRE= gorm.io/driver/sqlserver v1.0.7/go.mod h1:ng66aHI47ZIKz/vvnxzDoonzmTS8HXP+JYlgg67wOog= @@ -764,16 +733,8 @@ gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v1.21.3/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v1.21.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v1.21.6/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= -gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA= -gorm.io/gorm v1.24.1-0.20221019064659-5dd2bb482755 h1:7AdrbfcvKnzejfqP5g37fdSZOXH/JvaPIzBIHTOqXKk= -gorm.io/gorm v1.24.1-0.20221019064659-5dd2bb482755/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA= +gorm.io/gorm v1.25.9 h1:wct0gxZIELDk8+ZqF/MVnHLkA1rvYlBWUMv2EdsK1g8= gorm.io/gorm v1.25.9/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -micro.dev/v4 v4.3.0 h1:yQCmNve2PZCg88zkwfzsDewSGZYJ66rmqst0LKfImGA= -micro.dev/v4 v4.3.0/go.mod h1:or6kPbX/anUDJMISOr8EY+vRJqiGhR6B699W5r3ZBnU= -micro.dev/v4 v4.5.0 h1:zzsbaHUH3D2Cs10QVyWDyJhDXCZaKw3DJaWE3ZAKb5A= -micro.dev/v4 v4.5.0/go.mod h1:6iY6rAbtAgT4HcsOhyQvqa2Dp74rmvZRQENHJ0hYU1M= -micro.dev/v4 v4.6.0 h1:Kqn3Bsr2r1mSBrlx9a7Na9QJRqxg7sKArHxpC5XbPK4= -micro.dev/v4 v4.6.0/go.mod h1:6iY6rAbtAgT4HcsOhyQvqa2Dp74rmvZRQENHJ0hYU1M= diff --git a/google/Makefile b/google/Makefile index 86ed9be5a7..e9c34fbcdc 100644 --- a/google/Makefile +++ b/google/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/google/handler/google.go b/google/handler/google.go index 6a3a35f974..1296b3a20c 100644 --- a/google/handler/google.go +++ b/google/handler/google.go @@ -4,11 +4,11 @@ import ( "context" "strings" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/google/proto" "google.golang.org/api/customsearch/v1" "google.golang.org/api/option" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Google struct { diff --git a/google/main.go b/google/main.go index e21965f3b0..42d27032d2 100644 --- a/google/main.go +++ b/google/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/google/handler" pb "github.com/micro/services/google/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) func main() { diff --git a/google/proto/google.pb.micro.go b/google/proto/google.pb.micro.go index 83bbbc3947..d3869f9256 100644 --- a/google/proto/google.pb.micro.go +++ b/google/proto/google.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/helloworld/handler/helloworld.go b/helloworld/handler/helloworld.go index fb5865fc5a..2924d87466 100644 --- a/helloworld/handler/helloworld.go +++ b/helloworld/handler/helloworld.go @@ -3,8 +3,8 @@ package handler import ( "context" + "github.com/micro/micro/v5/service/logger" helloworld "github.com/micro/services/helloworld/proto" - "micro.dev/v4/service/logger" ) type Helloworld struct{} diff --git a/helloworld/main.go b/helloworld/main.go index 1adc97db9d..d4256e1d2e 100644 --- a/helloworld/main.go +++ b/helloworld/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/helloworld/handler" pb "github.com/micro/services/helloworld/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/helloworld/proto/helloworld.pb.micro.go b/helloworld/proto/helloworld.pb.micro.go index 3fe2967ebf..24bab683a8 100644 --- a/helloworld/proto/helloworld.pb.micro.go +++ b/helloworld/proto/helloworld.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/holidays/Makefile b/holidays/Makefile index 996aaeba46..1bbf1ab15b 100644 --- a/holidays/Makefile +++ b/holidays/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/holidays/handler/holidays.go b/holidays/handler/holidays.go index 9e58a3018c..3a016e74cb 100644 --- a/holidays/handler/holidays.go +++ b/holidays/handler/holidays.go @@ -7,11 +7,11 @@ import ( "io/ioutil" "net/http" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/holidays/proto" ) diff --git a/holidays/main.go b/holidays/main.go index c1fec71b04..b072945691 100644 --- a/holidays/main.go +++ b/holidays/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/holidays/handler" pb "github.com/micro/services/holidays/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/holidays/proto/holidays.pb.micro.go b/holidays/proto/holidays.pb.micro.go index ed34e89205..de5e0680b0 100644 --- a/holidays/proto/holidays.pb.micro.go +++ b/holidays/proto/holidays.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/id/Makefile b/id/Makefile index 5cab0b4c51..4689d666b0 100644 --- a/id/Makefile +++ b/id/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/id/handler/id.go b/id/handler/id.go index 91bf5fc884..70dbd23cdb 100644 --- a/id/handler/id.go +++ b/id/handler/id.go @@ -7,14 +7,14 @@ import ( gonanoid "github.com/matoous/go-nanoid/v2" "github.com/mattheath/kala/bigflake" "github.com/mattheath/kala/snowflake" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/id/proto" "github.com/oklog/ulid" "github.com/rs/xid" "github.com/segmentio/ksuid" "github.com/teris-io/shortid" "math/rand" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" "time" ) diff --git a/id/main.go b/id/main.go index cf6282ee00..2b63fd6280 100644 --- a/id/main.go +++ b/id/main.go @@ -4,10 +4,10 @@ import ( "math/rand" "time" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/id/handler" pb "github.com/micro/services/id/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func init() { diff --git a/id/proto/id.pb.micro.go b/id/proto/id.pb.micro.go index 0b8ec80d89..5a6d9cafad 100644 --- a/id/proto/id.pb.micro.go +++ b/id/proto/id.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/image/Makefile b/image/Makefile index c5fe6d5577..102fb6cb0e 100644 --- a/image/Makefile +++ b/image/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: protoc --openapi_out=. --proto_path=. --micro_out=. --go_out=. proto/image.proto diff --git a/image/handler/image.go b/image/handler/image.go index 8118c51a91..f7acdacc82 100644 --- a/image/handler/image.go +++ b/image/handler/image.go @@ -16,14 +16,14 @@ import ( "strings" "github.com/disintegration/imaging" + "github.com/micro/micro/v5/service/config" + merrors "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" img "github.com/micro/services/image/proto" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" - "micro.dev/v4/service/config" - merrors "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const pathPrefix = "images" diff --git a/image/main.go b/image/main.go index 5fa518c52a..f5324f453c 100644 --- a/image/main.go +++ b/image/main.go @@ -5,8 +5,8 @@ import ( pb "github.com/micro/services/image/proto" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/image/proto/image.pb.micro.go b/image/proto/image.pb.micro.go index 9790572a3e..bd49a8a062 100644 --- a/image/proto/image.pb.micro.go +++ b/image/proto/image.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/ip/Makefile b/ip/Makefile index c6b313d778..a019689ad7 100644 --- a/ip/Makefile +++ b/ip/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/ip/handler/ip.go b/ip/handler/ip.go index 67bc743dbd..37ab640e0d 100644 --- a/ip/handler/ip.go +++ b/ip/handler/ip.go @@ -4,10 +4,10 @@ import ( "context" "net" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/ip/proto" geoip2 "github.com/oschwald/geoip2-golang" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Ip struct { diff --git a/ip/main.go b/ip/main.go index 22c02359d9..c397a83609 100644 --- a/ip/main.go +++ b/ip/main.go @@ -9,11 +9,11 @@ import ( "github.com/micro/services/ip/handler" pb "github.com/micro/services/ip/proto" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/oschwald/geoip2-golang" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) // loadFile from the blob store diff --git a/ip/proto/ip.pb.micro.go b/ip/proto/ip.pb.micro.go index aaafb6ed1a..d85dd1bcf4 100644 --- a/ip/proto/ip.pb.micro.go +++ b/ip/proto/ip.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/lists/Makefile b/lists/Makefile index 9eb884dfa0..48fb1557f5 100644 --- a/lists/Makefile +++ b/lists/Makefile @@ -9,8 +9,8 @@ api: init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: diff --git a/lists/handler/lists.go b/lists/handler/lists.go index b66fb29375..f91dffe022 100644 --- a/lists/handler/lists.go +++ b/lists/handler/lists.go @@ -7,16 +7,16 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service/client" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/lists/proto" streamPb "github.com/micro/services/mq/proto" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" "google.golang.org/protobuf/types/known/structpb" - "micro.dev/v4/service/client" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) // New returns an initialized Lists diff --git a/lists/main.go b/lists/main.go index f4b1361e59..9be34b88fa 100644 --- a/lists/main.go +++ b/lists/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + log "github.com/micro/micro/v5/service/logger" "github.com/micro/services/lists/handler" pb "github.com/micro/services/lists/proto" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - log "micro.dev/v4/service/logger" ) func main() { diff --git a/lists/proto/lists.pb.micro.go b/lists/proto/lists.pb.micro.go index 3776db2072..7ea726458b 100644 --- a/lists/proto/lists.pb.micro.go +++ b/lists/proto/lists.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/location/Makefile b/location/Makefile index 2b6db3cc86..a952af3fa2 100644 --- a/location/Makefile +++ b/location/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: protoc --openapi_out=. --proto_path=. --micro_out=. --go_out=:. proto/location.proto diff --git a/location/domain/domain.go b/location/domain/domain.go index c1a8471677..44d5fc91bb 100644 --- a/location/domain/domain.go +++ b/location/domain/domain.go @@ -5,9 +5,9 @@ import ( "sync" geo "github.com/hailocab/go-geoindex" + "github.com/micro/micro/v5/service/errors" common "github.com/micro/services/location/proto" "github.com/micro/services/pkg/tenant" - "micro.dev/v4/service/errors" ) var ( diff --git a/location/handler/handler.go b/location/handler/handler.go index cfddddbae6..e7ceadd60e 100644 --- a/location/handler/handler.go +++ b/location/handler/handler.go @@ -4,14 +4,14 @@ import ( "context" "log" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/location/domain" loc "github.com/micro/services/location/proto" "github.com/micro/services/location/subscriber" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Location struct{} diff --git a/location/main.go b/location/main.go index 64f8b982c2..b564d8b715 100644 --- a/location/main.go +++ b/location/main.go @@ -3,10 +3,10 @@ package main import ( "log" + "github.com/micro/micro/v5/service" "github.com/micro/services/location/handler" pb "github.com/micro/services/location/proto" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" ) func main() { diff --git a/location/proto/location.pb.micro.go b/location/proto/location.pb.micro.go index ec8cb7b0de..34704fb5d6 100644 --- a/location/proto/location.pb.micro.go +++ b/location/proto/location.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/memegen/Makefile b/memegen/Makefile index 340fc107e0..0e7fdba5d4 100644 --- a/memegen/Makefile +++ b/memegen/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install github.com/golang/protobuf/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/memegen/handler/memegen.go b/memegen/handler/memegen.go index 4540c83252..696b5a3369 100644 --- a/memegen/handler/memegen.go +++ b/memegen/handler/memegen.go @@ -7,11 +7,11 @@ import ( "net/http" "net/url" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/memegen/proto" "github.com/micro/services/pkg/api" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Memegen struct { diff --git a/memegen/main.go b/memegen/main.go index 6125b6a044..54bbe64a47 100644 --- a/memegen/main.go +++ b/memegen/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/memegen/handler" pb "github.com/micro/services/memegen/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/memegen/proto/memegen.pb.micro.go b/memegen/proto/memegen.pb.micro.go index f0a54a02af..bfdb451187 100644 --- a/memegen/proto/memegen.pb.micro.go +++ b/memegen/proto/memegen.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/minecraft/Makefile b/minecraft/Makefile index 951146f6a3..0b4d7f5af4 100644 --- a/minecraft/Makefile +++ b/minecraft/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/minecraft/handler/minecraft.go b/minecraft/handler/minecraft.go index 13b27d62a8..edb4a7dd2d 100644 --- a/minecraft/handler/minecraft.go +++ b/minecraft/handler/minecraft.go @@ -4,8 +4,8 @@ import ( "context" "github.com/iverly/go-mcping/mcping" + "github.com/micro/micro/v5/service/errors" pb "github.com/micro/services/minecraft/proto" - "micro.dev/v4/service/errors" ) type Minecraft struct{} diff --git a/minecraft/main.go b/minecraft/main.go index c5152da1be..70dba183ab 100644 --- a/minecraft/main.go +++ b/minecraft/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/minecraft/handler" pb "github.com/micro/services/minecraft/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/minecraft/proto/minecraft.pb.micro.go b/minecraft/proto/minecraft.pb.micro.go index 7594b2c839..f09f921be8 100644 --- a/minecraft/proto/minecraft.pb.micro.go +++ b/minecraft/proto/minecraft.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/movie/Makefile b/movie/Makefile index 0ca8e9f8dc..5653774455 100644 --- a/movie/Makefile +++ b/movie/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/movie/handler/movie.go b/movie/handler/movie.go index 485d5ff064..a3c7c2a53e 100644 --- a/movie/handler/movie.go +++ b/movie/handler/movie.go @@ -8,9 +8,9 @@ import ( "net/http" "net/url" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/movie/proto" ) diff --git a/movie/main.go b/movie/main.go index 48139c895a..443b1a8465 100644 --- a/movie/main.go +++ b/movie/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/movie/handler" pb "github.com/micro/services/movie/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/movie/proto/movie.pb.micro.go b/movie/proto/movie.pb.micro.go index 71dfd99d00..d28ace8694 100644 --- a/movie/proto/movie.pb.micro.go +++ b/movie/proto/movie.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/mq/Makefile b/mq/Makefile index 970b3984ff..6b9af2da20 100644 --- a/mq/Makefile +++ b/mq/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/mq/handler/mq.go b/mq/handler/mq.go index cef05a6b82..bb24554520 100644 --- a/mq/handler/mq.go +++ b/mq/handler/mq.go @@ -7,11 +7,11 @@ import ( "path" "github.com/asim/mq/broker" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/mq/proto" "github.com/micro/services/pkg/tenant" "google.golang.org/protobuf/types/known/structpb" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" ) type Mq struct{} diff --git a/mq/main.go b/mq/main.go index 6ed1be4f31..091f9910bb 100644 --- a/mq/main.go +++ b/mq/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/mq/handler" pb "github.com/micro/services/mq/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/mq/proto/mq.pb.micro.go b/mq/proto/mq.pb.micro.go index 067a6e120a..e2f261db56 100644 --- a/mq/proto/mq.pb.micro.go +++ b/mq/proto/mq.pb.micro.go @@ -12,8 +12,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/news/Makefile b/news/Makefile index 7d88bd9135..b35f1770e0 100644 --- a/news/Makefile +++ b/news/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/news/handler/news.go b/news/handler/news.go index 2c5c1322cd..898b80d92c 100644 --- a/news/handler/news.go +++ b/news/handler/news.go @@ -6,9 +6,9 @@ import ( "net/url" "time" + "github.com/micro/micro/v5/service/errors" pb "github.com/micro/services/news/proto" "github.com/micro/services/pkg/api" - "micro.dev/v4/service/errors" ) type News struct { diff --git a/news/main.go b/news/main.go index 32211b0421..4b3f24d842 100644 --- a/news/main.go +++ b/news/main.go @@ -4,9 +4,9 @@ import ( "github.com/micro/services/news/handler" pb "github.com/micro/services/news/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/news/proto/news.pb.micro.go b/news/proto/news.pb.micro.go index 24b07b0fa1..5fdfacfddf 100644 --- a/news/proto/news.pb.micro.go +++ b/news/proto/news.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/nft/Makefile b/nft/Makefile index 9e189b88d0..eb28768c14 100644 --- a/nft/Makefile +++ b/nft/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/nft/handler/opensea.go b/nft/handler/opensea.go index 8d5a7c7639..34464c49cc 100644 --- a/nft/handler/opensea.go +++ b/nft/handler/opensea.go @@ -5,13 +5,13 @@ import ( "fmt" "time" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/nft/domain" pb "github.com/micro/services/nft/proto" "github.com/micro/services/pkg/api" "google.golang.org/protobuf/types/known/structpb" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) // OpenSea handler diff --git a/nft/main.go b/nft/main.go index 86c28c99c6..b84df96367 100644 --- a/nft/main.go +++ b/nft/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/nft/handler" pb "github.com/micro/services/nft/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/nft/proto/nft.pb.micro.go b/nft/proto/nft.pb.micro.go index 6bc285012b..89c358a3fe 100644 --- a/nft/proto/nft.pb.micro.go +++ b/nft/proto/nft.pb.micro.go @@ -12,8 +12,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/notes/Makefile b/notes/Makefile index 05160f273a..cb06b8446d 100644 --- a/notes/Makefile +++ b/notes/Makefile @@ -9,8 +9,8 @@ api: init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: diff --git a/notes/handler/notes.go b/notes/handler/notes.go index d6e2718dfd..07bd58775c 100644 --- a/notes/handler/notes.go +++ b/notes/handler/notes.go @@ -7,16 +7,16 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service/client" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" streamPb "github.com/micro/services/mq/proto" pb "github.com/micro/services/notes/proto" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" "google.golang.org/protobuf/types/known/structpb" - "micro.dev/v4/service/client" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) // New returns an initialized Notes diff --git a/notes/main.go b/notes/main.go index 321a0ff951..362675892d 100644 --- a/notes/main.go +++ b/notes/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + log "github.com/micro/micro/v5/service/logger" "github.com/micro/services/notes/handler" pb "github.com/micro/services/notes/proto" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - log "micro.dev/v4/service/logger" ) func main() { diff --git a/notes/proto/notes.pb.micro.go b/notes/proto/notes.pb.micro.go index 6388cb5917..fd80b5e2fd 100644 --- a/notes/proto/notes.pb.micro.go +++ b/notes/proto/notes.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/otp/Makefile b/otp/Makefile index 0f52614078..665e32331e 100644 --- a/otp/Makefile +++ b/otp/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: protoc --openapi_out=. --proto_path=. --micro_out=. --go_out=. proto/otp.proto diff --git a/otp/handler/otp.go b/otp/handler/otp.go index 50b64c94e1..e2f8ad6002 100644 --- a/otp/handler/otp.go +++ b/otp/handler/otp.go @@ -5,13 +5,13 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/otp/proto" pauth "github.com/micro/services/pkg/auth" "github.com/micro/services/pkg/cache" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" "github.com/pquerna/otp" "github.com/pquerna/otp/totp" diff --git a/otp/main.go b/otp/main.go index 6fb471d020..df5f3a882a 100644 --- a/otp/main.go +++ b/otp/main.go @@ -5,8 +5,8 @@ import ( pb "github.com/micro/services/otp/proto" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/otp/proto/otp.pb.micro.go b/otp/proto/otp.pb.micro.go index 96ff138ce5..4bbc1b671b 100644 --- a/otp/proto/otp.pb.micro.go +++ b/otp/proto/otp.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/password/Makefile b/password/Makefile index 4e0fec1936..754bd90491 100644 --- a/password/Makefile +++ b/password/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install github.com/golang/protobuf/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/password/main.go b/password/main.go index f49b7a3e1c..4564cdad20 100644 --- a/password/main.go +++ b/password/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/password/handler" pb "github.com/micro/services/password/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/password/proto/password.pb.micro.go b/password/proto/password.pb.micro.go index 0f1285a492..0f8b78a968 100644 --- a/password/proto/password.pb.micro.go +++ b/password/proto/password.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/ping/Makefile b/ping/Makefile index 5df2f4c7b7..b9c7f35eb6 100644 --- a/ping/Makefile +++ b/ping/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/ping/handler/ping.go b/ping/handler/ping.go index e394bd7231..6044f94a0c 100644 --- a/ping/handler/ping.go +++ b/ping/handler/ping.go @@ -10,9 +10,9 @@ import ( "net/url" "github.com/go-ping/ping" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/ping/proto" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Ping struct{} diff --git a/ping/main.go b/ping/main.go index fb9cff0919..bb9af394ca 100644 --- a/ping/main.go +++ b/ping/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/ping/handler" pb "github.com/micro/services/ping/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/ping/proto/ping.pb.micro.go b/ping/proto/ping.pb.micro.go index add3147a4c..5a459f5b20 100644 --- a/ping/proto/ping.pb.micro.go +++ b/ping/proto/ping.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 6e9798bc83..22281b695a 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -3,8 +3,8 @@ package auth import ( "context" - "micro.dev/v4/service/auth" - "micro.dev/v4/service/errors" + "github.com/micro/micro/v5/service/auth" + "github.com/micro/micro/v5/service/errors" ) func VerifyMicroAdmin(ctx context.Context, method string) (*auth.Account, error) { diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go index 5ee4aff988..08be19df61 100644 --- a/pkg/cache/cache.go +++ b/pkg/cache/cache.go @@ -12,10 +12,10 @@ import ( "time" "github.com/hashicorp/golang-lru" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/pkg/tenant" "github.com/peterbourgon/diskv/v3" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) type Cache interface { diff --git a/pkg/git/git.go b/pkg/git/git.go index e029a8ad23..90570464f1 100644 --- a/pkg/git/git.go +++ b/pkg/git/git.go @@ -29,9 +29,9 @@ import ( "regexp" "strings" + log "github.com/micro/micro/v5/service/logger" "github.com/teris-io/shortid" "github.com/xanzy/go-gitlab" - log "micro.dev/v4/service/logger" ) const CredentialsKey = "GIT_CREDENTIALS" diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go index bc4001bf33..da37ea9090 100644 --- a/pkg/git/git_test.go +++ b/pkg/git/git_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "micro.dev/v4/test/fakes" + "github.com/micro/micro/v5/test/fakes" "github.com/onsi/gomega/types" diff --git a/pkg/gorm/wrapper.go b/pkg/gorm/wrapper.go index a4f3718e15..ac927fbbb4 100644 --- a/pkg/gorm/wrapper.go +++ b/pkg/gorm/wrapper.go @@ -8,12 +8,12 @@ import ( "strings" "sync" + "github.com/micro/micro/v5/service/auth" "gorm.io/driver/postgres" "gorm.io/gorm" "gorm.io/gorm/clause" "gorm.io/gorm/migrator" "gorm.io/gorm/schema" - "micro.dev/v4/service/auth" ) type Helper struct { diff --git a/pkg/model/model.go b/pkg/model/model.go index c24c628336..6ed084981d 100644 --- a/pkg/model/model.go +++ b/pkg/model/model.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - "micro.dev/v4/service/store" + "github.com/micro/micro/v5/service/store" ) var ( diff --git a/pkg/redis/redis.go b/pkg/redis/redis.go index 8f49cdffe3..6ec81ca2ed 100644 --- a/pkg/redis/redis.go +++ b/pkg/redis/redis.go @@ -8,8 +8,8 @@ import ( "sync" "github.com/go-redis/redis/v8" - "micro.dev/v4/service/config" - log "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service/config" + log "github.com/micro/micro/v5/service/logger" ) type Counter struct { diff --git a/pkg/service/proto/admin.pb.micro.go b/pkg/service/proto/admin.pb.micro.go index 3cd6553c54..0f41648020 100644 --- a/pkg/service/proto/admin.pb.micro.go +++ b/pkg/service/proto/admin.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "micro.dev/v4/service/api" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + api "github.com/micro/micro/v5/service/api" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/tenant/tenant.go b/pkg/tenant/tenant.go index e4a830d0f2..9bdf967c9d 100644 --- a/pkg/tenant/tenant.go +++ b/pkg/tenant/tenant.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "micro.dev/v4/service/auth" + "github.com/micro/micro/v5/service/auth" ) const ( diff --git a/place/Makefile b/place/Makefile index b4624cbf43..643588e3c5 100644 --- a/place/Makefile +++ b/place/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/place/handler/google.go b/place/handler/google.go index 8478f76da5..767a41124c 100644 --- a/place/handler/google.go +++ b/place/handler/google.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" "googlemaps.github.io/maps" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" pb "github.com/micro/services/place/proto" ) diff --git a/place/main.go b/place/main.go index 7e19e8140a..8056d23533 100644 --- a/place/main.go +++ b/place/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/place/handler" pb "github.com/micro/services/place/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/place/proto/place.pb.micro.go b/place/proto/place.pb.micro.go index 656dd9ca09..e7d38e5a98 100644 --- a/place/proto/place.pb.micro.go +++ b/place/proto/place.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/postcode/Makefile b/postcode/Makefile index 1a4bde7679..2810c301ae 100644 --- a/postcode/Makefile +++ b/postcode/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/postcode/handler/postcode.go b/postcode/handler/postcode.go index ab3022a91b..7a83fd514f 100644 --- a/postcode/handler/postcode.go +++ b/postcode/handler/postcode.go @@ -6,9 +6,9 @@ import ( "io/ioutil" "net/http" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/postcode/proto" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) var ( diff --git a/postcode/main.go b/postcode/main.go index 6a0f5271b4..001db4ecda 100644 --- a/postcode/main.go +++ b/postcode/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/postcode/handler" pb "github.com/micro/services/postcode/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/postcode/proto/postcode.pb.micro.go b/postcode/proto/postcode.pb.micro.go index e4226eefa9..efb35b9336 100644 --- a/postcode/proto/postcode.pb.micro.go +++ b/postcode/proto/postcode.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/prayer/Makefile b/prayer/Makefile index ec30176e9a..42e9c336c5 100644 --- a/prayer/Makefile +++ b/prayer/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/prayer/handler/prayer.go b/prayer/handler/prayer.go index 27c6a190ad..877b8f057e 100644 --- a/prayer/handler/prayer.go +++ b/prayer/handler/prayer.go @@ -6,11 +6,11 @@ import ( "time" "github.com/hablullah/go-prayer" + "github.com/micro/micro/v5/service/client" + "github.com/micro/micro/v5/service/errors" geocode "github.com/micro/services/geocoding/proto" pb "github.com/micro/services/prayer/proto" timepb "github.com/micro/services/time/proto" - "micro.dev/v4/service/client" - "micro.dev/v4/service/errors" ) type Prayer struct { diff --git a/prayer/main.go b/prayer/main.go index 52d9c9c1cd..12c229f9dd 100644 --- a/prayer/main.go +++ b/prayer/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/prayer/handler" pb "github.com/micro/services/prayer/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/prayer/proto/prayer.pb.micro.go b/prayer/proto/prayer.pb.micro.go index 91aad797dd..7667b3eec0 100644 --- a/prayer/proto/prayer.pb.micro.go +++ b/prayer/proto/prayer.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/price/Makefile b/price/Makefile index 17297a6871..e81a0c1af6 100644 --- a/price/Makefile +++ b/price/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install github.com/golang/protobuf/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/price/crawler/crawler.go b/price/crawler/crawler.go index 0506e6a9b1..d2687f56bb 100644 --- a/price/crawler/crawler.go +++ b/price/crawler/crawler.go @@ -7,11 +7,11 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/pkg/api" pb "github.com/micro/services/price/proto" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) type Crawler struct { diff --git a/price/handler/price.go b/price/handler/price.go index 64aa3d3481..8e3da2ecd3 100644 --- a/price/handler/price.go +++ b/price/handler/price.go @@ -8,13 +8,13 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/pkg/tenant" "github.com/micro/services/price/crawler" pb "github.com/micro/services/price/proto" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) type Price struct { diff --git a/price/main.go b/price/main.go index fa9cb4d648..f9a4903eb6 100644 --- a/price/main.go +++ b/price/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/price/handler" pb "github.com/micro/services/price/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/price/proto/price.pb.micro.go b/price/proto/price.pb.micro.go index d2f2c7f295..b72c2aada7 100644 --- a/price/proto/price.pb.micro.go +++ b/price/proto/price.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/qr/Makefile b/qr/Makefile index 1ee716d9c8..1a92bc95fd 100644 --- a/qr/Makefile +++ b/qr/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/qr/handler/qr.go b/qr/handler/qr.go index 523b35b046..b3cab3c766 100644 --- a/qr/handler/qr.go +++ b/qr/handler/qr.go @@ -9,15 +9,15 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" qr "github.com/micro/services/qr/proto" "github.com/skip2/go-qrcode" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const ( diff --git a/qr/main.go b/qr/main.go index 2432ca4896..f3702a5dac 100644 --- a/qr/main.go +++ b/qr/main.go @@ -5,8 +5,8 @@ import ( "github.com/micro/services/qr/handler" pb "github.com/micro/services/qr/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/qr/proto/qr.pb.micro.go b/qr/proto/qr.pb.micro.go index a9bcaf3473..6f1672033f 100644 --- a/qr/proto/qr.pb.micro.go +++ b/qr/proto/qr.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/quran/Makefile b/quran/Makefile index d5663a2964..980854df5a 100644 --- a/quran/Makefile +++ b/quran/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/quran/handler/quran.go b/quran/handler/quran.go index 98a24ef168..ff3ff99fa2 100644 --- a/quran/handler/quran.go +++ b/quran/handler/quran.go @@ -5,11 +5,11 @@ import ( "fmt" "net/url" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/pkg/api" "github.com/micro/services/quran/domain" pb "github.com/micro/services/quran/proto" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) const ( diff --git a/quran/main.go b/quran/main.go index 6283dafb79..d8824efb92 100644 --- a/quran/main.go +++ b/quran/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/quran/handler" pb "github.com/micro/services/quran/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/quran/proto/quran.pb.micro.go b/quran/proto/quran.pb.micro.go index 7af510abaf..dc8b47b8a6 100644 --- a/quran/proto/quran.pb.micro.go +++ b/quran/proto/quran.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/routing/Makefile b/routing/Makefile index b9aa4bffe9..c6c6df5fa8 100644 --- a/routing/Makefile +++ b/routing/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: protoc --proto_path=. --micro_out=. --go_out=:. proto/routing.proto diff --git a/routing/handler/google.go b/routing/handler/google.go index 29e2f8b64e..114d1c33f2 100644 --- a/routing/handler/google.go +++ b/routing/handler/google.go @@ -7,9 +7,9 @@ import ( "googlemaps.github.io/maps" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/routing/proto" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) var ( diff --git a/routing/handler/osrm.go b/routing/handler/osrm.go index 735b2eff40..72b2c948df 100644 --- a/routing/handler/osrm.go +++ b/routing/handler/osrm.go @@ -6,9 +6,9 @@ import ( "time" "github.com/gojuno/go.osrm" + "github.com/micro/micro/v5/service/errors" pb "github.com/micro/services/routing/proto" "github.com/paulmach/go.geo" - "micro.dev/v4/service/errors" ) type OSRM struct { diff --git a/routing/main.go b/routing/main.go index 265019eb20..bb96b8b50f 100644 --- a/routing/main.go +++ b/routing/main.go @@ -4,10 +4,10 @@ import ( "github.com/micro/services/routing/handler" pb "github.com/micro/services/routing/proto" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "googlemaps.github.io/maps" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) func main() { diff --git a/routing/proto/routing.pb.micro.go b/routing/proto/routing.pb.micro.go index 63ec5f3553..61b0545bed 100644 --- a/routing/proto/routing.pb.micro.go +++ b/routing/proto/routing.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/rss/Makefile b/rss/Makefile index d1e7db9c38..7cf1fe7e5f 100644 --- a/rss/Makefile +++ b/rss/Makefile @@ -4,7 +4,7 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-micro .PHONY: proto proto: protoc --proto_path=. --micro_out=. --go_out=:. proto/rss.proto diff --git a/rss/handler/crawl.go b/rss/handler/crawl.go index bc14897bc1..5d548ff3ea 100644 --- a/rss/handler/crawl.go +++ b/rss/handler/crawl.go @@ -8,8 +8,8 @@ import ( "time" "github.com/SlyMarbo/rss" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/rss/parser" pb "github.com/micro/services/rss/proto" diff --git a/rss/handler/rss.go b/rss/handler/rss.go index 9cc1f0a196..376ddc10c5 100644 --- a/rss/handler/rss.go +++ b/rss/handler/rss.go @@ -7,11 +7,11 @@ import ( "hash/fnv" "strings" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" "github.com/micro/services/pkg/tenant" pb "github.com/micro/services/rss/proto" diff --git a/rss/main.go b/rss/main.go index e8efaf014a..1f5d181857 100644 --- a/rss/main.go +++ b/rss/main.go @@ -3,10 +3,10 @@ package main import ( "time" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" admin "github.com/micro/services/pkg/service/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" "github.com/micro/services/rss/handler" pb "github.com/micro/services/rss/proto" diff --git a/rss/proto/rss.pb.micro.go b/rss/proto/rss.pb.micro.go index d884a048be..17631c3af3 100644 --- a/rss/proto/rss.pb.micro.go +++ b/rss/proto/rss.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/search/Makefile b/search/Makefile index b54283ca81..311c7b5f03 100644 --- a/search/Makefile +++ b/search/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/search/handler/search.go b/search/handler/search.go index d274c8f9b0..a913066091 100644 --- a/search/handler/search.go +++ b/search/handler/search.go @@ -12,6 +12,10 @@ import ( "strings" "github.com/google/uuid" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" @@ -19,10 +23,6 @@ import ( open "github.com/opensearch-project/opensearch-go" openapi "github.com/opensearch-project/opensearch-go/opensearchapi" "google.golang.org/protobuf/types/known/structpb" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" ) var ( diff --git a/search/main.go b/search/main.go index 99a6ab0d38..9d55bef8cb 100644 --- a/search/main.go +++ b/search/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" admin "github.com/micro/services/pkg/service/proto" "github.com/micro/services/search/handler" pb "github.com/micro/services/search/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/search/proto/search.pb.micro.go b/search/proto/search.pb.micro.go index c4195de332..cdf16b4b98 100644 --- a/search/proto/search.pb.micro.go +++ b/search/proto/search.pb.micro.go @@ -12,8 +12,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/secret/Makefile b/secret/Makefile index 6db3c25928..b52808dbd2 100644 --- a/secret/Makefile +++ b/secret/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/secret/handler/secret.go b/secret/handler/secret.go index ec68a6179c..4917c5ae08 100644 --- a/secret/handler/secret.go +++ b/secret/handler/secret.go @@ -8,12 +8,12 @@ import ( "sync" "time" + "github.com/micro/micro/v5/service/config" + merrors "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/pkg/tenant" pb "github.com/micro/services/secret/proto" - "micro.dev/v4/service/config" - merrors "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const ( diff --git a/secret/main.go b/secret/main.go index 4f87135d41..45086e21f2 100644 --- a/secret/main.go +++ b/secret/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/secret/handler" pb "github.com/micro/services/secret/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/secret/proto/secret.pb.micro.go b/secret/proto/secret.pb.micro.go index c75283bb68..5f0b07d8d7 100644 --- a/secret/proto/secret.pb.micro.go +++ b/secret/proto/secret.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/sentiment/Makefile b/sentiment/Makefile index 8ebc7801eb..96e292c481 100644 --- a/sentiment/Makefile +++ b/sentiment/Makefile @@ -4,7 +4,7 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-micro .PHONY: proto proto: protoc --openapi_out=. --proto_path=. --micro_out=. --go_out=:. proto/sentiment.proto diff --git a/sentiment/handler/sentiment.go b/sentiment/handler/sentiment.go index 272a4f6895..1faca363dc 100644 --- a/sentiment/handler/sentiment.go +++ b/sentiment/handler/sentiment.go @@ -3,9 +3,9 @@ package handler import ( "context" + "github.com/micro/micro/v5/service/errors" "github.com/micro/services/sentiment/model" pb "github.com/micro/services/sentiment/proto" - "micro.dev/v4/service/errors" ) type Sentiment struct{} diff --git a/sentiment/main.go b/sentiment/main.go index 87af054168..3274a8f103 100644 --- a/sentiment/main.go +++ b/sentiment/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/sentiment/handler" pb "github.com/micro/services/sentiment/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/sentiment/model/model.go b/sentiment/model/model.go index 388da8b018..4c1d0eb4f2 100644 --- a/sentiment/model/model.go +++ b/sentiment/model/model.go @@ -2,7 +2,7 @@ package model import ( "github.com/cdipaolo/sentiment" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service/logger" ) var ( diff --git a/sentiment/proto/sentiment.pb.micro.go b/sentiment/proto/sentiment.pb.micro.go index 0cdeb984f8..128d035cbc 100644 --- a/sentiment/proto/sentiment.pb.micro.go +++ b/sentiment/proto/sentiment.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/sms/Makefile b/sms/Makefile index c14cf5bb23..6aa1a91be1 100644 --- a/sms/Makefile +++ b/sms/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/sms/handler/sms.go b/sms/handler/sms.go index 935a5352f5..1422dae536 100644 --- a/sms/handler/sms.go +++ b/sms/handler/sms.go @@ -10,13 +10,13 @@ import ( "time" "github.com/kevinburke/twilio-go" + "github.com/micro/micro/v5/service/auth" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/pkg/tenant" pb "github.com/micro/services/sms/proto" - "micro.dev/v4/service/auth" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const ( diff --git a/sms/main.go b/sms/main.go index a45a7c50da..ec6eb4859a 100644 --- a/sms/main.go +++ b/sms/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/sms/handler" pb "github.com/micro/services/sms/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/sms/proto/sms.pb.micro.go b/sms/proto/sms.pb.micro.go index aa0c025e94..5075015a4c 100644 --- a/sms/proto/sms.pb.micro.go +++ b/sms/proto/sms.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/space/Makefile b/space/Makefile index 383bb15b6a..f6354a4ccd 100644 --- a/space/Makefile +++ b/space/Makefile @@ -1,13 +1,13 @@ GOPATH:=$(shell go env GOPATH) -MODIFY=Mproto/imports/api.proto=micro.dev/v4/proto/api +MODIFY=Mproto/imports/api.proto=github.com/micro/micro/v5/proto/api .PHONY: init init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/space/handler/space.go b/space/handler/space.go index d21f5e0c0d..9cf68da3a5 100644 --- a/space/handler/space.go +++ b/space/handler/space.go @@ -9,16 +9,16 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" pb "github.com/micro/services/space/proto" "github.com/minio/minio-go/v7/pkg/s3utils" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" diff --git a/space/handler/space_test.go b/space/handler/space_test.go index f062b8a4ad..bbd2ff0206 100644 --- a/space/handler/space_test.go +++ b/space/handler/space_test.go @@ -9,11 +9,11 @@ import ( "github.com/aws/aws-sdk-go/aws" sthree "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3iface" + "github.com/micro/micro/v5/service/auth" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/store" + "github.com/micro/micro/v5/service/store/memory" pb "github.com/micro/services/space/proto" - "micro.dev/v4/service/auth" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/store" - "micro.dev/v4/service/store/memory" . "github.com/onsi/gomega" ) diff --git a/space/main.go b/space/main.go index 4c881424fd..55563849f6 100644 --- a/space/main.go +++ b/space/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" admin "github.com/micro/services/pkg/service/proto" "github.com/micro/services/space/handler" pb "github.com/micro/services/space/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/space/proto/space.pb.micro.go b/space/proto/space.pb.micro.go index 3babaa6363..b146a82ebe 100644 --- a/space/proto/space.pb.micro.go +++ b/space/proto/space.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/spam/Makefile b/spam/Makefile index c965adc5bb..b14e9a9001 100644 --- a/spam/Makefile +++ b/spam/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/spam/handler/spam.go b/spam/handler/spam.go index 0a0f5c5489..ebb1f7d3e5 100644 --- a/spam/handler/spam.go +++ b/spam/handler/spam.go @@ -7,11 +7,11 @@ import ( "time" "github.com/Teamwork/spamc" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" spam "github.com/micro/services/spam/proto" "gopkg.in/gomail.v2" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" ) type conf struct { diff --git a/spam/main.go b/spam/main.go index ba3a758715..6256747eb5 100644 --- a/spam/main.go +++ b/spam/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/spam/handler" pb "github.com/micro/services/spam/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/spam/proto/spam.pb.micro.go b/spam/proto/spam.pb.micro.go index a096ee9300..5c4613ebb2 100644 --- a/spam/proto/spam.pb.micro.go +++ b/spam/proto/spam.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/stock/Makefile b/stock/Makefile index 810edd0689..d7a97a42fe 100644 --- a/stock/Makefile +++ b/stock/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/stock/handler/stock.go b/stock/handler/stock.go index dcd0427cc8..0a2117ce75 100644 --- a/stock/handler/stock.go +++ b/stock/handler/stock.go @@ -9,10 +9,10 @@ import ( "regexp" "time" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/stock/proto" "github.com/patrickmn/go-cache" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) var ( diff --git a/stock/main.go b/stock/main.go index 519a5d4579..dd90c1bdf9 100644 --- a/stock/main.go +++ b/stock/main.go @@ -6,10 +6,10 @@ import ( "github.com/micro/services/stock/handler" pb "github.com/micro/services/stock/proto" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "github.com/patrickmn/go-cache" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) func main() { diff --git a/stock/proto/stock.pb.micro.go b/stock/proto/stock.pb.micro.go index a5b5f5f542..31f5ba8c14 100644 --- a/stock/proto/stock.pb.micro.go +++ b/stock/proto/stock.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/stream/Makefile b/stream/Makefile index e3a47701ca..7a3eb43cf9 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/stream/handler/stream.go b/stream/handler/stream.go index 133460c7ba..d44534ce13 100644 --- a/stream/handler/stream.go +++ b/stream/handler/stream.go @@ -6,10 +6,10 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service/errors" "github.com/micro/services/pkg/tenant" "github.com/micro/services/stream/domain" pb "github.com/micro/services/stream/proto" - "micro.dev/v4/service/errors" ) type Stream struct{} diff --git a/stream/main.go b/stream/main.go index 2540f0b280..f049f6da59 100644 --- a/stream/main.go +++ b/stream/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/stream/handler" pb "github.com/micro/services/stream/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/stream/proto/stream.pb.micro.go b/stream/proto/stream.pb.micro.go index c548c547a7..41b1065734 100644 --- a/stream/proto/stream.pb.micro.go +++ b/stream/proto/stream.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/sunnah/Makefile b/sunnah/Makefile index a5aba23b3e..3c83c2424b 100644 --- a/sunnah/Makefile +++ b/sunnah/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/sunnah/handler/sunnah.go b/sunnah/handler/sunnah.go index 2e6d2cbfa7..7ed4bf01c2 100644 --- a/sunnah/handler/sunnah.go +++ b/sunnah/handler/sunnah.go @@ -6,11 +6,11 @@ import ( "strconv" "strings" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/pkg/api" "github.com/micro/services/sunnah/domain" pb "github.com/micro/services/sunnah/proto" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) var ( diff --git a/sunnah/main.go b/sunnah/main.go index a6c2aadb1a..5282066b5d 100644 --- a/sunnah/main.go +++ b/sunnah/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/sunnah/handler" pb "github.com/micro/services/sunnah/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) func main() { diff --git a/sunnah/proto/sunnah.pb.micro.go b/sunnah/proto/sunnah.pb.micro.go index 4fcb663a8f..cf94a402ff 100644 --- a/sunnah/proto/sunnah.pb.micro.go +++ b/sunnah/proto/sunnah.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/test/blob-store/main.go b/test/blob-store/main.go index 72a9ae5d06..49dc32e4b5 100644 --- a/test/blob-store/main.go +++ b/test/blob-store/main.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "github.com/google/uuid" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" ) func main() { diff --git a/test/chat/Makefile b/test/chat/Makefile index c855b2ca8d..b4faa005fb 100644 --- a/test/chat/Makefile +++ b/test/chat/Makefile @@ -4,7 +4,7 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-micro .PHONY: proto proto: protoc --openapi_out=. --proto_path=. --micro_out=. --go_out=:. proto/chat.proto diff --git a/test/chat/client/main.go b/test/chat/client/main.go index e2f2610738..3393cde5f3 100644 --- a/test/chat/client/main.go +++ b/test/chat/client/main.go @@ -10,11 +10,11 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service" + metadata "github.com/micro/micro/v5/service/context" + "github.com/micro/micro/v5/service/logger" chat "github.com/micro/services/test/chat/proto" "google.golang.org/protobuf/types/known/timestamppb" - "micro.dev/v4/service" - metadata "micro.dev/v4/service/context" - "micro.dev/v4/service/logger" ) var ( diff --git a/test/chat/handler/handler.go b/test/chat/handler/handler.go index 14d0fa2cd1..fa5875b071 100644 --- a/test/chat/handler/handler.go +++ b/test/chat/handler/handler.go @@ -7,12 +7,12 @@ import ( "time" "github.com/google/uuid" + metadata "github.com/micro/micro/v5/service/context" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/events" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "google.golang.org/protobuf/types/known/timestamppb" - metadata "micro.dev/v4/service/context" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/events" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" // it's standard to import the services own proto under the alias pb pb "github.com/micro/services/test/chat/proto" diff --git a/test/chat/main.go b/test/chat/main.go index d5c5e32f46..5410cacf62 100644 --- a/test/chat/main.go +++ b/test/chat/main.go @@ -1,8 +1,8 @@ package main import ( - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/test/chat/handler" pb "github.com/micro/services/test/chat/proto" diff --git a/test/chat/proto/chat.pb.micro.go b/test/chat/proto/chat.pb.micro.go index 906e969d50..07669a0efa 100644 --- a/test/chat/proto/chat.pb.micro.go +++ b/test/chat/proto/chat.pb.micro.go @@ -12,9 +12,9 @@ import ( import ( context "context" - api "micro.dev/v4/service/api" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + api "github.com/micro/micro/v5/service/api" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/test/conf/main.go b/test/conf/main.go index e71fa3ba82..049485b03a 100644 --- a/test/conf/main.go +++ b/test/conf/main.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "micro.dev/v4/service" - "micro.dev/v4/service/config" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" ) type keyConfig struct { diff --git a/test/events/main.go b/test/events/main.go index 1811d514a9..4ad5568c77 100644 --- a/test/events/main.go +++ b/test/events/main.go @@ -4,10 +4,10 @@ import ( "sync" "time" - "micro.dev/v4/service" - "micro.dev/v4/service/events" - goevents "micro.dev/v4/service/events" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/events" + goevents "github.com/micro/micro/v5/service/events" + "github.com/micro/micro/v5/service/logger" ) type testPayload struct { diff --git a/test/kv/handler/handler.go b/test/kv/handler/handler.go index 733840bb2e..31d452afd7 100644 --- a/test/kv/handler/handler.go +++ b/test/kv/handler/handler.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - log "micro.dev/v4/service/logger" - store "micro.dev/v4/service/store" + log "github.com/micro/micro/v5/service/logger" + store "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/test/kv/proto" ) diff --git a/test/kv/main.go b/test/kv/main.go index 55ad1a05ce..fcf2fcd2fb 100644 --- a/test/kv/main.go +++ b/test/kv/main.go @@ -3,7 +3,7 @@ package main import ( "github.com/micro/services/test/kv/handler" - "micro.dev/v4/service" + "github.com/micro/micro/v5/service" ) func main() { diff --git a/test/kv/proto/example.pb.micro.go b/test/kv/proto/example.pb.micro.go index fe52cfb6e0..16c191b84f 100644 --- a/test/kv/proto/example.pb.micro.go +++ b/test/kv/proto/example.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "micro.dev/v4/service/api" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + api "github.com/micro/micro/v5/service/api" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/test/logger/main.go b/test/logger/main.go index bc14b1a755..9b206bb6fc 100644 --- a/test/logger/main.go +++ b/test/logger/main.go @@ -3,8 +3,8 @@ package main import ( "time" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/test/pubsub/main.go b/test/pubsub/main.go index 69b8f1b8c7..d4fad3a65f 100644 --- a/test/pubsub/main.go +++ b/test/pubsub/main.go @@ -5,9 +5,9 @@ import ( "fmt" "time" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/test/pubsub/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) // Pub will publish messages every second diff --git a/test/routes/proto/stream.pb.micro.go b/test/routes/proto/stream.pb.micro.go index 04011f0498..7e372ca3ab 100644 --- a/test/routes/proto/stream.pb.micro.go +++ b/test/routes/proto/stream.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "micro.dev/v4/service/api" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + api "github.com/micro/micro/v5/service/api" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/test/routes/routes-client/main.go b/test/routes/routes-client/main.go index 8a75e02ab5..3ff3b8c47d 100644 --- a/test/routes/routes-client/main.go +++ b/test/routes/routes-client/main.go @@ -6,9 +6,9 @@ import ( "math/rand" "time" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/test/routes/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/test/routes/routes-server/main.go b/test/routes/routes-server/main.go index c9d9d75e59..7b2f2cbf68 100644 --- a/test/routes/routes-server/main.go +++ b/test/routes/routes-server/main.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/test/routes/proto" "github.com/micro/services/test/routes/routes-server/handler" diff --git a/test/template/cmd/template/main.go b/test/template/cmd/template/main.go index d732da33b8..5131adbbbd 100644 --- a/test/template/cmd/template/main.go +++ b/test/template/cmd/template/main.go @@ -3,8 +3,8 @@ package main import ( "github.com/micro/services/test/template/handler" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/test/template/handler/idiomatic.go b/test/template/handler/idiomatic.go index f10481c945..e8512187a5 100644 --- a/test/template/handler/idiomatic.go +++ b/test/template/handler/idiomatic.go @@ -3,7 +3,7 @@ package handler import ( "context" - log "micro.dev/v4/service/logger" + log "github.com/micro/micro/v5/service/logger" idiomatic "github.com/micro/services/test/template/proto" ) diff --git a/test/template/proto/idiomatic.pb.micro.go b/test/template/proto/idiomatic.pb.micro.go index fd7dbbd0d4..a86d9acceb 100644 --- a/test/template/proto/idiomatic.pb.micro.go +++ b/test/template/proto/idiomatic.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "micro.dev/v4/service/api" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + api "github.com/micro/micro/v5/service/api" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/thumbnail/Makefile b/thumbnail/Makefile index 0927eb813d..28e31779d2 100644 --- a/thumbnail/Makefile +++ b/thumbnail/Makefile @@ -4,7 +4,7 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-micro .PHONY: api api: diff --git a/thumbnail/handler/thumbnail.go b/thumbnail/handler/thumbnail.go index 0882352927..05096ede26 100644 --- a/thumbnail/handler/thumbnail.go +++ b/thumbnail/handler/thumbnail.go @@ -11,11 +11,11 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service/client" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" iproto "github.com/micro/services/image/proto" thumbnail "github.com/micro/services/thumbnail/proto" - "micro.dev/v4/service/client" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) const screenshotPath = "/usr/src/app" diff --git a/thumbnail/main.go b/thumbnail/main.go index db6ebb7082..be58011669 100644 --- a/thumbnail/main.go +++ b/thumbnail/main.go @@ -5,8 +5,8 @@ import ( "github.com/micro/services/thumbnail/handler" pb "github.com/micro/services/thumbnail/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/thumbnail/proto/thumbnail.pb.micro.go b/thumbnail/proto/thumbnail.pb.micro.go index cf537a7751..d12263704f 100644 --- a/thumbnail/proto/thumbnail.pb.micro.go +++ b/thumbnail/proto/thumbnail.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/time/Makefile b/time/Makefile index 5b5d94ec50..f7d07cdbe0 100644 --- a/time/Makefile +++ b/time/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/time/handler/time.go b/time/handler/time.go index 855d4c5c05..ef809dccb0 100644 --- a/time/handler/time.go +++ b/time/handler/time.go @@ -8,11 +8,11 @@ import ( "net/url" "time" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/time/proto" "github.com/tkuchiki/go-timezone" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Time struct { diff --git a/time/main.go b/time/main.go index ce607baf7c..6782514654 100644 --- a/time/main.go +++ b/time/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/time/handler" pb "github.com/micro/services/time/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/time/proto/time.pb.micro.go b/time/proto/time.pb.micro.go index 7622b786b9..e00767fa28 100644 --- a/time/proto/time.pb.micro.go +++ b/time/proto/time.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/translate/Makefile b/translate/Makefile index f7c5fdff67..c35c45561f 100644 --- a/translate/Makefile +++ b/translate/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/translate/handler/translate.go b/translate/handler/translate.go index 24c7cd3a2c..a210007b59 100644 --- a/translate/handler/translate.go +++ b/translate/handler/translate.go @@ -3,12 +3,12 @@ package handler import ( "context" + "github.com/micro/micro/v5/service/config" + me "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" "github.com/pkg/errors" "golang.org/x/text/language" "google.golang.org/api/option" - "micro.dev/v4/service/config" - me "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" pb "github.com/micro/services/translate/proto" diff --git a/translate/main.go b/translate/main.go index 2b3ef68613..20d9d869ad 100644 --- a/translate/main.go +++ b/translate/main.go @@ -4,8 +4,8 @@ import ( "github.com/micro/services/translate/handler" pb "github.com/micro/services/translate/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/translate/proto/translate.pb.micro.go b/translate/proto/translate.pb.micro.go index 96c11e6360..327093a41b 100644 --- a/translate/proto/translate.pb.micro.go +++ b/translate/proto/translate.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/tunnel/Makefile b/tunnel/Makefile index 8138494e9b..ebe2d3ad61 100644 --- a/tunnel/Makefile +++ b/tunnel/Makefile @@ -3,8 +3,8 @@ GOPATH:=$(shell go env GOPATH) .PHONY: init init: go install github.com/golang/protobuf/protoc-gen-go@latest - go install micro.dev/v4/cmd/protoc-gen-micro@latest - go install micro.dev/v4/cmd/protoc-gen-openapi@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-micro@latest + go install github.com/micro/micro/v5/cmd/protoc-gen-openapi@latest .PHONY: api api: diff --git a/tunnel/handler/ip.go b/tunnel/handler/ip.go index d5158ab0c1..29c84f3ad4 100644 --- a/tunnel/handler/ip.go +++ b/tunnel/handler/ip.go @@ -3,7 +3,7 @@ package handler import ( "net" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service/logger" ) var ( diff --git a/tunnel/handler/tunnel.go b/tunnel/handler/tunnel.go index a50722faa1..243bf57cca 100644 --- a/tunnel/handler/tunnel.go +++ b/tunnel/handler/tunnel.go @@ -12,11 +12,11 @@ import ( "path" "strings" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pb "github.com/micro/services/tunnel/proto" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) type Tunnel struct { diff --git a/tunnel/main.go b/tunnel/main.go index b092dc6af5..94a6cac1f2 100644 --- a/tunnel/main.go +++ b/tunnel/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/tunnel/handler" pb "github.com/micro/services/tunnel/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/tunnel/proto/tunnel.pb.micro.go b/tunnel/proto/tunnel.pb.micro.go index 5cbd001986..6e33934a16 100644 --- a/tunnel/proto/tunnel.pb.micro.go +++ b/tunnel/proto/tunnel.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/twitter/Makefile b/twitter/Makefile index c8e83d691f..bc43732206 100644 --- a/twitter/Makefile +++ b/twitter/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/twitter/handler/twitter.go b/twitter/handler/twitter.go index 90f5a39518..eb86fdc066 100644 --- a/twitter/handler/twitter.go +++ b/twitter/handler/twitter.go @@ -4,12 +4,12 @@ import ( "context" "github.com/dghubble/go-twitter/twitter" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/twitter/proto" "golang.org/x/oauth2" "golang.org/x/oauth2/clientcredentials" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Twitter struct { diff --git a/twitter/main.go b/twitter/main.go index 5ad94c2822..07ddc13e2a 100644 --- a/twitter/main.go +++ b/twitter/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/twitter/handler" pb "github.com/micro/services/twitter/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/twitter/proto/twitter.pb.micro.go b/twitter/proto/twitter.pb.micro.go index 9c82c894fc..6bcb37c63b 100644 --- a/twitter/proto/twitter.pb.micro.go +++ b/twitter/proto/twitter.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/url/Makefile b/url/Makefile index 513dc56457..0ccae8db39 100644 --- a/url/Makefile +++ b/url/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: protoc --proto_path=. --micro_out=. --go_out=:. proto/url.proto diff --git a/url/handler/url.go b/url/handler/url.go index 56914903f3..96dd603ee1 100644 --- a/url/handler/url.go +++ b/url/handler/url.go @@ -9,18 +9,18 @@ import ( "strings" "time" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/client" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" cachepb "github.com/micro/services/cache/proto" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" url "github.com/micro/services/url/proto" "github.com/teris-io/shortid" - "micro.dev/v4/service" - "micro.dev/v4/service/client" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const hostPrefix = "https://m3o.one/u/" diff --git a/url/main.go b/url/main.go index 4f7d8fd2bd..12d0b4a70a 100644 --- a/url/main.go +++ b/url/main.go @@ -5,8 +5,8 @@ import ( "github.com/micro/services/url/handler" pb "github.com/micro/services/url/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/url/proto/url.pb.micro.go b/url/proto/url.pb.micro.go index 13f50f24d5..91013efe67 100644 --- a/url/proto/url.pb.micro.go +++ b/url/proto/url.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/user/Makefile b/user/Makefile index 1318568766..87f61ff401 100644 --- a/user/Makefile +++ b/user/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: proto proto: protoc --proto_path=. --micro_out=. --go_out=:. proto/user.proto diff --git a/user/domain/domain.go b/user/domain/domain.go index 84d957c78b..af8e9c09a6 100644 --- a/user/domain/domain.go +++ b/user/domain/domain.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "micro.dev/v4/service/config" - microerr "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" + "github.com/micro/micro/v5/service/config" + microerr "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/pkg/cache" user "github.com/micro/services/user/proto" diff --git a/user/handler/handler.go b/user/handler/handler.go index 91ba159544..31440dca23 100644 --- a/user/handler/handler.go +++ b/user/handler/handler.go @@ -10,13 +10,13 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" pauth "github.com/micro/services/pkg/auth" adminpb "github.com/micro/services/pkg/service/proto" "github.com/micro/services/pkg/tenant" "golang.org/x/crypto/bcrypt" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" otp "github.com/micro/services/otp/proto" "github.com/micro/services/user/domain" diff --git a/user/main.go b/user/main.go index ade71210ce..7c0b9bb862 100644 --- a/user/main.go +++ b/user/main.go @@ -1,9 +1,9 @@ package main import ( - "micro.dev/v4/service" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" otp "github.com/micro/services/otp/proto" adminpb "github.com/micro/services/pkg/service/proto" diff --git a/user/proto/user.pb.micro.go b/user/proto/user.pb.micro.go index f5837824d3..dfd3cb4114 100644 --- a/user/proto/user.pb.micro.go +++ b/user/proto/user.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vehicle/Makefile b/vehicle/Makefile index 67145ca042..8efcf8a483 100644 --- a/vehicle/Makefile +++ b/vehicle/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/vehicle/handler/vehicle.go b/vehicle/handler/vehicle.go index cab417b65f..c3e4dbc156 100644 --- a/vehicle/handler/vehicle.go +++ b/vehicle/handler/vehicle.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/pkg/api" "github.com/micro/services/pkg/auth" pb "github.com/micro/services/vehicle/proto" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) var ( diff --git a/vehicle/main.go b/vehicle/main.go index 656540570a..86086b10cd 100644 --- a/vehicle/main.go +++ b/vehicle/main.go @@ -4,9 +4,9 @@ import ( "github.com/micro/services/vehicle/handler" pb "github.com/micro/services/vehicle/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" ) func main() { diff --git a/vehicle/proto/admin.pb.micro.go b/vehicle/proto/admin.pb.micro.go index 6925e0c503..2540d5be80 100644 --- a/vehicle/proto/admin.pb.micro.go +++ b/vehicle/proto/admin.pb.micro.go @@ -11,9 +11,9 @@ import ( import ( context "context" - api "micro.dev/v4/service/api" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + api "github.com/micro/micro/v5/service/api" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vehicle/proto/vehicle.pb.micro.go b/vehicle/proto/vehicle.pb.micro.go index 461dcdde96..7eac9c306f 100644 --- a/vehicle/proto/vehicle.pb.micro.go +++ b/vehicle/proto/vehicle.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/wallet/Makefile b/wallet/Makefile index 1899e0bd14..23d5001297 100644 --- a/wallet/Makefile +++ b/wallet/Makefile @@ -4,7 +4,7 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-micro .PHONY: api api: diff --git a/wallet/handler/wallet.go b/wallet/handler/wallet.go index c0c19275d6..5fdec126e8 100644 --- a/wallet/handler/wallet.go +++ b/wallet/handler/wallet.go @@ -9,13 +9,13 @@ import ( "time" "github.com/google/uuid" + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/errors" + log "github.com/micro/micro/v5/service/logger" + "github.com/micro/micro/v5/service/store" "github.com/micro/services/pkg/redis" "github.com/micro/services/pkg/tenant" pb "github.com/micro/services/wallet/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/errors" - log "micro.dev/v4/service/logger" - "micro.dev/v4/service/store" ) const ( diff --git a/wallet/main.go b/wallet/main.go index f84489dd50..aec2e3f66a 100644 --- a/wallet/main.go +++ b/wallet/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/wallet/handler" pb "github.com/micro/services/wallet/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/wallet/proto/wallet.pb.micro.go b/wallet/proto/wallet.pb.micro.go index 6d5101e3f3..f158c51f23 100644 --- a/wallet/proto/wallet.pb.micro.go +++ b/wallet/proto/wallet.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/weather/Makefile b/weather/Makefile index 72c504b9a5..da3e4a21ce 100644 --- a/weather/Makefile +++ b/weather/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/weather/handler/weather.go b/weather/handler/weather.go index b126770c54..9903c293a0 100644 --- a/weather/handler/weather.go +++ b/weather/handler/weather.go @@ -9,10 +9,10 @@ import ( "net/url" "strconv" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/weather/proto" - "micro.dev/v4/service/config" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Weather struct { diff --git a/weather/main.go b/weather/main.go index 8d8d4ea671..6786b247e8 100644 --- a/weather/main.go +++ b/weather/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/weather/handler" pb "github.com/micro/services/weather/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/logger" ) func main() { diff --git a/weather/proto/weather.pb.micro.go b/weather/proto/weather.pb.micro.go index 3c7f451165..fc96813b00 100644 --- a/weather/proto/weather.pb.micro.go +++ b/weather/proto/weather.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/youtube/Makefile b/youtube/Makefile index d1d21c88a9..b49323ac0a 100644 --- a/youtube/Makefile +++ b/youtube/Makefile @@ -4,8 +4,8 @@ GOPATH:=$(shell go env GOPATH) init: go get -u github.com/golang/protobuf/proto go get -u github.com/golang/protobuf/protoc-gen-go - go get micro.dev/v4/cmd/protoc-gen-micro - go get micro.dev/v4/cmd/protoc-gen-openapi + go get github.com/micro/micro/v5/cmd/protoc-gen-micro + go get github.com/micro/micro/v5/cmd/protoc-gen-openapi .PHONY: api api: diff --git a/youtube/handler/youtube.go b/youtube/handler/youtube.go index 8b30a5629a..626be0ae26 100644 --- a/youtube/handler/youtube.go +++ b/youtube/handler/youtube.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" + "github.com/micro/micro/v5/service/errors" + "github.com/micro/micro/v5/service/logger" pb "github.com/micro/services/youtube/proto" "google.golang.org/api/option" "google.golang.org/api/youtube/v3" - "micro.dev/v4/service/errors" - "micro.dev/v4/service/logger" ) type Youtube struct { diff --git a/youtube/main.go b/youtube/main.go index a3eeb93878..13ddb17af1 100644 --- a/youtube/main.go +++ b/youtube/main.go @@ -1,11 +1,11 @@ package main import ( + "github.com/micro/micro/v5/service" + "github.com/micro/micro/v5/service/config" + "github.com/micro/micro/v5/service/logger" "github.com/micro/services/youtube/handler" pb "github.com/micro/services/youtube/proto" - "micro.dev/v4/service" - "micro.dev/v4/service/config" - "micro.dev/v4/service/logger" ) func main() { diff --git a/youtube/proto/youtube.pb.micro.go b/youtube/proto/youtube.pb.micro.go index 28c15eb5e2..094e169f09 100644 --- a/youtube/proto/youtube.pb.micro.go +++ b/youtube/proto/youtube.pb.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "micro.dev/v4/service/client" - server "micro.dev/v4/service/server" + client "github.com/micro/micro/v5/service/client" + server "github.com/micro/micro/v5/service/server" ) // Reference imports to suppress errors if they are not otherwise used.