diff --git a/api/api.go b/api/api.go index 62d6c688..9b7624bd 100644 --- a/api/api.go +++ b/api/api.go @@ -1,13 +1,13 @@ -package api +package api // import "go.unistack.org/micro/v3/api" import ( "errors" "regexp" "strings" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/server" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/server" ) // nolint: revive diff --git a/api/handler/handler.go b/api/handler/handler.go index ece71b57..ce3b72ed 100644 --- a/api/handler/handler.go +++ b/api/handler/handler.go @@ -1,5 +1,5 @@ // Package handler provides http handlers -package handler +package handler // import "go.unistack.org/micro/v3/api/handler" import ( "net/http" diff --git a/api/handler/options.go b/api/handler/options.go index aea0b02a..6745a4a7 100644 --- a/api/handler/options.go +++ b/api/handler/options.go @@ -1,9 +1,9 @@ package handler import ( - "github.com/unistack-org/micro/v3/api/router" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/logger" + "go.unistack.org/micro/v3/api/router" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/logger" ) // DefaultMaxRecvSize specifies max recv size for handler diff --git a/api/resolver/grpc/grpc.go b/api/resolver/grpc/grpc.go index 1bcb5a02..8627a792 100644 --- a/api/resolver/grpc/grpc.go +++ b/api/resolver/grpc/grpc.go @@ -1,12 +1,12 @@ // Package grpc resolves a grpc service like /greeter.Say/Hello to greeter service -package grpc +package grpc // import "go.unistack.org/micro/v3/api/resolver/grpc" import ( "errors" "net/http" "strings" - "github.com/unistack-org/micro/v3/api/resolver" + "go.unistack.org/micro/v3/api/resolver" ) // Resolver struct diff --git a/api/resolver/host/host.go b/api/resolver/host/host.go index fafcde80..17763e1f 100644 --- a/api/resolver/host/host.go +++ b/api/resolver/host/host.go @@ -1,10 +1,10 @@ // Package host resolves using http host -package host +package host // import "go.unistack.org/micro/v3/api/resolver/host" import ( "net/http" - "github.com/unistack-org/micro/v3/api/resolver" + "go.unistack.org/micro/v3/api/resolver" ) type hostResolver struct { diff --git a/api/resolver/options.go b/api/resolver/options.go index db1dc017..6a7d8fbf 100644 --- a/api/resolver/options.go +++ b/api/resolver/options.go @@ -3,7 +3,7 @@ package resolver import ( "context" - "github.com/unistack-org/micro/v3/register" + "go.unistack.org/micro/v3/register" ) // Options struct diff --git a/api/resolver/path/path.go b/api/resolver/path/path.go index b206155d..c7b68efe 100644 --- a/api/resolver/path/path.go +++ b/api/resolver/path/path.go @@ -1,11 +1,11 @@ // Package path resolves using http path -package path +package path // import "go.unistack.org/micro/v3/api/resolver/path" import ( "net/http" "strings" - "github.com/unistack-org/micro/v3/api/resolver" + "go.unistack.org/micro/v3/api/resolver" ) // Resolver the path resolver diff --git a/api/resolver/resolver.go b/api/resolver/resolver.go index 67143e2f..a2cbdfcc 100644 --- a/api/resolver/resolver.go +++ b/api/resolver/resolver.go @@ -1,5 +1,5 @@ // Package resolver resolves a http request to an endpoint -package resolver +package resolver // import "go.unistack.org/micro/v3/api/resolver" import ( "errors" diff --git a/api/resolver/subdomain/subdomain.go b/api/resolver/subdomain/subdomain.go index 7cd540e1..010d43af 100644 --- a/api/resolver/subdomain/subdomain.go +++ b/api/resolver/subdomain/subdomain.go @@ -1,14 +1,14 @@ // Package subdomain is a resolver which uses the subdomain to determine the domain to route to. It // offloads the endpoint resolution to a child resolver which is provided in New. -package subdomain +package subdomain // import "go.unistack.org/micro/v3/api/resolver/subdomain" import ( "net" "net/http" "strings" - "github.com/unistack-org/micro/v3/api/resolver" - "github.com/unistack-org/micro/v3/logger" + "go.unistack.org/micro/v3/api/resolver" + "go.unistack.org/micro/v3/logger" "golang.org/x/net/publicsuffix" ) diff --git a/api/resolver/subdomain/subdomain_test.go b/api/resolver/subdomain/subdomain_test.go index cb817efd..7ed5e01a 100644 --- a/api/resolver/subdomain/subdomain_test.go +++ b/api/resolver/subdomain/subdomain_test.go @@ -5,7 +5,7 @@ import ( "net/url" "testing" - "github.com/unistack-org/micro/v3/api/resolver/vpath" + "go.unistack.org/micro/v3/api/resolver/vpath" ) func TestResolve(t *testing.T) { diff --git a/api/resolver/vpath/vpath.go b/api/resolver/vpath/vpath.go index d2b76ce8..0d845b17 100644 --- a/api/resolver/vpath/vpath.go +++ b/api/resolver/vpath/vpath.go @@ -1,5 +1,5 @@ // Package vpath resolves using http path and recognised versioned urls -package vpath +package vpath // import "go.unistack.org/micro/v3/api/resolver/vpath" import ( "errors" @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/unistack-org/micro/v3/api/resolver" + "go.unistack.org/micro/v3/api/resolver" ) // NewResolver creates new vpath api resolver diff --git a/api/router/options.go b/api/router/options.go index b5d5eec6..f6e393fa 100644 --- a/api/router/options.go +++ b/api/router/options.go @@ -3,10 +3,10 @@ package router import ( "context" - "github.com/unistack-org/micro/v3/api/resolver" - "github.com/unistack-org/micro/v3/api/resolver/vpath" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/register" + "go.unistack.org/micro/v3/api/resolver" + "go.unistack.org/micro/v3/api/resolver/vpath" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/register" ) // Options holds the options for api router diff --git a/api/router/router.go b/api/router/router.go index 7a417408..addf6909 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -1,10 +1,10 @@ // Package router provides api service routing -package router +package router // import "go.unistack.org/micro/v3/api/router" import ( "net/http" - "github.com/unistack-org/micro/v3/api" + "go.unistack.org/micro/v3/api" ) // DefaultRouter contains default router implementation diff --git a/auth/auth.go b/auth/auth.go index c66e080c..87716480 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -1,12 +1,12 @@ // Package auth provides authentication and authorization capability -package auth +package auth // import "go.unistack.org/micro/v3/auth" import ( "context" "errors" "time" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) const ( diff --git a/auth/noop.go b/auth/noop.go index 386ff5b5..7a021927 100644 --- a/auth/noop.go +++ b/auth/noop.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/util/id" ) type noopAuth struct { diff --git a/auth/options.go b/auth/options.go index 7dd6ecaa..503e4cff 100644 --- a/auth/options.go +++ b/auth/options.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/store" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/store" + "go.unistack.org/micro/v3/tracer" ) // NewOptions creates Options struct from slice of options diff --git a/broker/broker.go b/broker/broker.go index 6eaa9e2b..def61a7e 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -1,11 +1,11 @@ // Package broker is an interface used for asynchronous messaging -package broker +package broker // import "go.unistack.org/micro/v3/broker" import ( "context" "errors" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) // DefaultBroker default memory broker diff --git a/broker/memory.go b/broker/memory.go index 3e2888bb..cd723118 100644 --- a/broker/memory.go +++ b/broker/memory.go @@ -4,12 +4,12 @@ import ( "context" "sync" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/metadata" - maddr "github.com/unistack-org/micro/v3/util/addr" - "github.com/unistack-org/micro/v3/util/id" - mnet "github.com/unistack-org/micro/v3/util/net" - "github.com/unistack-org/micro/v3/util/rand" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/metadata" + maddr "go.unistack.org/micro/v3/util/addr" + "go.unistack.org/micro/v3/util/id" + mnet "go.unistack.org/micro/v3/util/net" + "go.unistack.org/micro/v3/util/rand" ) type memoryBroker struct { diff --git a/broker/memory_test.go b/broker/memory_test.go index ab0eca76..af949ede 100644 --- a/broker/memory_test.go +++ b/broker/memory_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) func TestMemoryBatchBroker(t *testing.T) { diff --git a/broker/options.go b/broker/options.go index 5f0f132a..0e4a8c75 100644 --- a/broker/options.go +++ b/broker/options.go @@ -5,11 +5,11 @@ import ( "crypto/tls" "time" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/tracer" ) // Options struct diff --git a/build/build.go b/build/build.go index 69107012..372cc8b2 100644 --- a/build/build.go +++ b/build/build.go @@ -1,5 +1,5 @@ // Package build is for building source into a package -package build +package build // import "go.unistack.org/micro/v3/build" // Build is an interface for building packages type Build interface { diff --git a/client/backoff.go b/client/backoff.go index 69087d4e..0aed7c60 100644 --- a/client/backoff.go +++ b/client/backoff.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/unistack-org/micro/v3/util/backoff" + "go.unistack.org/micro/v3/util/backoff" ) // BackoffFunc is the backoff call func diff --git a/client/client.go b/client/client.go index dfb5abad..087f263f 100644 --- a/client/client.go +++ b/client/client.go @@ -1,12 +1,12 @@ // Package client is an interface for an RPC client -package client +package client // import "go.unistack.org/micro/v3/client" import ( "context" "time" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/metadata" ) var ( diff --git a/client/lookup.go b/client/lookup.go index 47484a5b..e2677f90 100644 --- a/client/lookup.go +++ b/client/lookup.go @@ -4,8 +4,8 @@ import ( "context" "sort" - "github.com/unistack-org/micro/v3/errors" - "github.com/unistack-org/micro/v3/router" + "go.unistack.org/micro/v3/errors" + "go.unistack.org/micro/v3/router" ) // LookupFunc is used to lookup routes for a service diff --git a/client/noop.go b/client/noop.go index 92031673..809fa3fa 100644 --- a/client/noop.go +++ b/client/noop.go @@ -3,10 +3,10 @@ package client import ( "context" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/errors" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/errors" + "go.unistack.org/micro/v3/metadata" ) // DefaultCodecs will be used to encode/decode data diff --git a/client/options.go b/client/options.go index 638436cc..9a2eb73d 100644 --- a/client/options.go +++ b/client/options.go @@ -5,16 +5,16 @@ import ( "crypto/tls" "time" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/network/transport" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/router" - "github.com/unistack-org/micro/v3/selector" - "github.com/unistack-org/micro/v3/selector/random" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/network/transport" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/router" + "go.unistack.org/micro/v3/selector" + "go.unistack.org/micro/v3/selector/random" + "go.unistack.org/micro/v3/tracer" ) // Options holds client options diff --git a/client/retry.go b/client/retry.go index 26f8d2dd..89d22aef 100644 --- a/client/retry.go +++ b/client/retry.go @@ -3,7 +3,7 @@ package client import ( "context" - "github.com/unistack-org/micro/v3/errors" + "go.unistack.org/micro/v3/errors" ) // RetryFunc that returning either false or a non-nil error will result in the call not being retried diff --git a/client/test_request.go b/client/test_request.go index 0b4b7729..a42e2f47 100644 --- a/client/test_request.go +++ b/client/test_request.go @@ -1,7 +1,7 @@ package client import ( - "github.com/unistack-org/micro/v3/codec" + "go.unistack.org/micro/v3/codec" ) type testRequest struct { diff --git a/codec/codec.go b/codec/codec.go index 090e3260..1c137c52 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -1,11 +1,11 @@ // Package codec is an interface for encoding messages -package codec +package codec // import "go.unistack.org/micro/v3/codec" import ( "errors" "io" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) // Message types diff --git a/codec/frame.proto b/codec/frame.proto index f364bc53..69dc556a 100644 --- a/codec/frame.proto +++ b/codec/frame.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package micro.codec; option cc_enable_arenas = true; -option go_package = "github.com/unistack-org/micro/v3/codec;codec"; +option go_package = "go.unistack.org/micro/v3/codec;codec"; option java_multiple_files = true; option java_outer_classname = "MicroCodec"; option java_package = "micro.codec"; diff --git a/codec/options.go b/codec/options.go index c11d09d2..afcfb1c5 100644 --- a/codec/options.go +++ b/codec/options.go @@ -3,9 +3,9 @@ package codec import ( "context" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/tracer" ) // Option func diff --git a/config/config.go b/config/config.go index 7a638f66..f9dbd19f 100644 --- a/config/config.go +++ b/config/config.go @@ -1,5 +1,5 @@ // Package config is an interface for dynamic configuration. -package config +package config // import "go.unistack.org/micro/v3/config" import ( "context" diff --git a/config/default.go b/config/default.go index 6f784b77..d2797ffb 100644 --- a/config/default.go +++ b/config/default.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/imdario/mergo" - rutil "github.com/unistack-org/micro/v3/util/reflect" + rutil "go.unistack.org/micro/v3/util/reflect" ) type defaultConfig struct { diff --git a/config/default_test.go b/config/default_test.go index 2d1d4833..56383599 100644 --- a/config/default_test.go +++ b/config/default_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/unistack-org/micro/v3/config" + "go.unistack.org/micro/v3/config" ) type Cfg struct { diff --git a/config/options.go b/config/options.go index 21ee0b25..3dd70687 100644 --- a/config/options.go +++ b/config/options.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/tracer" ) // Options hold the config options diff --git a/errors/errors.go b/errors/errors.go index b5163036..1d7ffe55 100644 --- a/errors/errors.go +++ b/errors/errors.go @@ -1,6 +1,6 @@ // Package errors provides a way to return detailed information // for an RPC request error. The error is normally JSON encoded. -package errors +package errors // import "go.unistack.org/micro/v3/errors" import ( "encoding/json" diff --git a/event.go b/event.go index 53603aca..d64d1f06 100644 --- a/event.go +++ b/event.go @@ -3,7 +3,7 @@ package micro import ( "context" - "github.com/unistack-org/micro/v3/client" + "go.unistack.org/micro/v3/client" ) // Event is used to publish messages to a topic diff --git a/flow/default.go b/flow/default.go index 85aab18d..50dc09d8 100644 --- a/flow/default.go +++ b/flow/default.go @@ -7,12 +7,12 @@ import ( "sync" "github.com/silas/dag" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/store" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/store" + "go.unistack.org/micro/v3/util/id" ) type microFlow struct { diff --git a/flow/flow.go b/flow/flow.go index 369a0f8a..92b9ce77 100644 --- a/flow/flow.go +++ b/flow/flow.go @@ -1,5 +1,5 @@ // Package flow is an interface used for saga pattern microservice workflow -package flow +package flow // import "go.unistack.org/micro/v3/flow" import ( "context" @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) var ( diff --git a/flow/options.go b/flow/options.go index 79688d07..b501df64 100644 --- a/flow/options.go +++ b/flow/options.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/store" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/store" + "go.unistack.org/micro/v3/tracer" ) // Option func diff --git a/function.go b/function.go index 391d7ede..dc4aae44 100644 --- a/function.go +++ b/function.go @@ -6,7 +6,7 @@ import ( "context" "time" - "github.com/unistack-org/micro/v3/server" + "go.unistack.org/micro/v3/server" ) // Function is a one time executing Service diff --git a/function_test.go b/function_test.go index 7506e148..972cdbba 100644 --- a/function_test.go +++ b/function_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/unistack-org/micro/v3/register" + "go.unistack.org/micro/v3/register" ) func TestFunction(t *testing.T) { diff --git a/go.mod b/go.mod index 1f1d3a2b..e07fa95a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/unistack-org/micro/v3 +module go.unistack.org/micro/v3 go 1.16 @@ -8,7 +8,7 @@ require ( github.com/imdario/mergo v0.3.12 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4 - github.com/unistack-org/micro-proto v0.0.9 + go.unistack.org/micro-proto/v3 v3.1.0 golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect ) diff --git a/go.sum b/go.sum index 012f9562..e3e7fe0d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/ef-ds/deque v1.0.4 h1:iFAZNmveMT9WERAkqLJ+oaABF9AcVQ5AjXem/hroniI= github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg= -github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -11,14 +9,10 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/silas/dag v0.0.0-20210121180416-41cf55125c34 h1:vBfVmA5mZhsQa2jr1FOL9nfA37N/jnbBmi5XUfviVTI= -github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4 h1:fOH64AB0C3ixGf9emky61STvPJL3smxJg+1Zwx1oCdg= github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= -github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc= -github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= +go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b h1:eB48h3HiRycXNy8E0Gf5e0hv7YT6Kt14L/D73G1fuwo= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/logger/logger.go b/logger/logger.go index f991cc15..61379d66 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -1,5 +1,5 @@ // Package logger provides a log interface -package logger +package logger // import "go.unistack.org/micro/v3/logger" import ( "context" diff --git a/logger/wrapper.go b/logger/wrapper.go index d4a16e15..6367ecf9 100644 --- a/logger/wrapper.go +++ b/logger/wrapper.go @@ -1,10 +1,10 @@ -package logger +package logger // import "go.unistack.org/micro/v3/logger/wrapper" import ( "context" "reflect" - rutil "github.com/unistack-org/micro/v3/util/reflect" + rutil "go.unistack.org/micro/v3/util/reflect" ) // LogFunc function used for Log method diff --git a/logger/wrapper/wrapper.go b/logger/wrapper/wrapper.go index 9b72e104..86b5ff79 100644 --- a/logger/wrapper/wrapper.go +++ b/logger/wrapper/wrapper.go @@ -5,9 +5,9 @@ import ( "context" "fmt" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/server" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/server" ) var ( diff --git a/metadata/metadata.go b/metadata/metadata.go index 219e94ba..f3f1c2cf 100644 --- a/metadata/metadata.go +++ b/metadata/metadata.go @@ -1,5 +1,5 @@ // Package metadata is a way of defining message headers -package metadata +package metadata // import "go.unistack.org/micro/v3/metadata" import ( "net/textproto" diff --git a/meter/generate.go b/meter/generate.go index 875ed1a1..01112682 100644 --- a/meter/generate.go +++ b/meter/generate.go @@ -1,12 +1,12 @@ package meter -//go:generate sh -c "protoc -I./handler -I../ -I$(go list -f '{{ .Dir }}' -m github.com/unistack-org/micro-proto) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./handler handler/handler.proto" +//go:generate sh -c "protoc -I./handler -I../ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./handler handler/handler.proto" import ( // import required packages - _ "github.com/unistack-org/micro-proto/api" + _ "go.unistack.org/micro-proto/v3/api" // import required packages - _ "github.com/unistack-org/micro-proto/openapiv2" + _ "go.unistack.org/micro-proto/v3/openapiv3" ) diff --git a/meter/handler/handler.go b/meter/handler/handler.go index ff042dc2..0fe88ba4 100644 --- a/meter/handler/handler.go +++ b/meter/handler/handler.go @@ -1,12 +1,12 @@ -package handler +package handler // import "go.unistack.org/micro/v3/meter/handler" import ( "bytes" "context" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/errors" - "github.com/unistack-org/micro/v3/meter" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/errors" + "go.unistack.org/micro/v3/meter" ) // guard to fail early diff --git a/meter/handler/handler.proto b/meter/handler/handler.proto index d6d153e0..b3f69d6b 100644 --- a/meter/handler/handler.proto +++ b/meter/handler/handler.proto @@ -1,24 +1,20 @@ syntax = "proto3"; package micro.meter.handler; -option go_package = "github.com/unistack-org/micro/v3/meter/handler;handler"; +option go_package = "go.unistack.org/micro/v3/meter/handler;handler"; import "api/annotations.proto"; -import "openapiv2/annotations.proto"; +import "openapiv3/annotations.proto"; import "codec/frame.proto"; service Meter { rpc Metrics(micro.codec.Frame) returns (micro.codec.Frame) { - option (micro.openapiv2.openapiv2_operation) = { + option (micro.openapiv3.openapiv3_operation) = { operation_id: "Metrics"; responses: { - response_code: { - name: "default"; - value: { - json_reference: { - description: "Error response"; - _ref: "micro.codec.Frame"; - }; + default: { + reference: { + _ref: "micro.codec.Frame"; }; }; }; diff --git a/meter/handler/handler_micro.pb.go b/meter/handler/handler_micro.pb.go index 3e04404a..3b25bb29 100644 --- a/meter/handler/handler_micro.pb.go +++ b/meter/handler/handler_micro.pb.go @@ -1,14 +1,13 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.4.2 +// protoc-gen-go-micro version: v3.5.2 // source: handler.proto package handler import ( context "context" - - api "github.com/unistack-org/micro/v3/api" - codec "github.com/unistack-org/micro/v3/codec" + api "go.unistack.org/micro/v3/api" + codec "go.unistack.org/micro/v3/codec" ) var ( diff --git a/meter/handler/handler_micro_http.pb.go b/meter/handler/handler_micro_http.pb.go index 873017de..d8f40189 100644 --- a/meter/handler/handler_micro_http.pb.go +++ b/meter/handler/handler_micro_http.pb.go @@ -1,15 +1,14 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.4.2 +// protoc-gen-go-micro version: v3.5.2 // source: handler.proto package handler import ( context "context" - - api "github.com/unistack-org/micro/v3/api" - codec "github.com/unistack-org/micro/v3/codec" - server "github.com/unistack-org/micro/v3/server" + api "go.unistack.org/micro/v3/api" + codec "go.unistack.org/micro/v3/codec" + server "go.unistack.org/micro/v3/server" ) type meterServer struct { diff --git a/meter/meter.go b/meter/meter.go index 40c5213c..286f08bc 100644 --- a/meter/meter.go +++ b/meter/meter.go @@ -1,5 +1,5 @@ // Package meter is for instrumentation -package meter +package meter // import "go.unistack.org/micro/v3/meter" import ( "io" @@ -28,17 +28,31 @@ var ( // Meter is an interface for collecting and instrumenting metrics type Meter interface { + // Name returns meter name Name() string + // Init initialize meter Init(opts ...Option) error + // Clone create meter copy with new options + Clone(opts ...Option) Meter + // Counter get or create counter Counter(name string, labels ...string) Counter + // FloatCounter get or create float counter FloatCounter(name string, labels ...string) FloatCounter + // Gauge get or create gauge Gauge(name string, fn func() float64, labels ...string) Gauge + // Set create new meter metrics set Set(opts ...Option) Meter + // Histogram get or create histogram Histogram(name string, labels ...string) Histogram + // Summary get or create summary Summary(name string, labels ...string) Summary + // SummaryExt get or create summary with spcified quantiles and window time SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) Summary + // Write writes metrics to io.Writer Write(w io.Writer, opts ...Option) error + // Options returns meter options Options() Options + // String return meter type String() string } diff --git a/meter/noop.go b/meter/noop.go index 875310c4..a1b47a94 100644 --- a/meter/noop.go +++ b/meter/noop.go @@ -15,6 +15,15 @@ func NewMeter(opts ...Option) Meter { return &noopMeter{opts: NewOptions(opts...)} } +// Clone return old meter with new options +func (r *noopMeter) Clone(opts ...Option) Meter { + options := r.opts + for _, o := range opts { + o(&options) + } + return &noopMeter{opts: options} +} + func (r *noopMeter) Name() string { return r.opts.Name } diff --git a/meter/options.go b/meter/options.go index a9df13ee..3fa863db 100644 --- a/meter/options.go +++ b/meter/options.go @@ -3,7 +3,7 @@ package meter import ( "context" - "github.com/unistack-org/micro/v3/logger" + "go.unistack.org/micro/v3/logger" ) // Option powers the configuration for metrics implementations: @@ -51,6 +51,20 @@ func NewOptions(opt ...Option) Options { return opts } +// LabelPrefix sets the labels prefix +func LabelPrefix(pref string) Option { + return func(o *Options) { + o.LabelPrefix = pref + } +} + +// MetricPrefix sets the metric prefix +func MetricPrefix(pref string) Option { + return func(o *Options) { + o.MetricPrefix = pref + } +} + // Context sets the metrics context func Context(ctx context.Context) Option { return func(o *Options) { diff --git a/meter/wrapper/wrapper.go b/meter/wrapper/wrapper.go index d52ca94a..fe6f99c1 100644 --- a/meter/wrapper/wrapper.go +++ b/meter/wrapper/wrapper.go @@ -1,13 +1,13 @@ -package wrapper +package wrapper // import "go.unistack.org/micro/v3/meter/wrapper" import ( "context" "fmt" "time" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/server" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/server" ) var ( diff --git a/micro.go b/micro.go new file mode 100644 index 00000000..8736d7bf --- /dev/null +++ b/micro.go @@ -0,0 +1 @@ +package micro // import "go.unistack.org/micro/v3" diff --git a/model/model.go b/model/model.go deleted file mode 100644 index 8558a5ca..00000000 --- a/model/model.go +++ /dev/null @@ -1,35 +0,0 @@ -// +build ignore - -// Package model is an interface for data modelling -package model - -// Model provides an interface for data modelling -type Model interface { - // Initialise options - Init(...Option) error - // NewEntity creates a new entity to store or access - NewEntity(name string, value interface{}) Entity - // Create a value - Create(Entity) error - // Read values - Read(...ReadOption) ([]Entity, error) - // Update the value - Update(Entity) error - // Delete an entity - Delete(...DeleteOption) error - // Implementation of the model - String() string -} - -type Entity interface { - // Unique id of the entity - Id() string - // Name of the entity - Name() string - // The value associated with the entity - Value() interface{} - // Attributes of the entity - Attributes() map[string]interface{} - // Read a value as a concrete type - Read(v interface{}) error -} diff --git a/model/options.go b/model/options.go deleted file mode 100644 index 2c35324e..00000000 --- a/model/options.go +++ /dev/null @@ -1,41 +0,0 @@ -// +build ignore - -// Package model is an interface for data modelling -package model - -import ( - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/store" - "github.com/unistack-org/micro/v3/sync" -) - -type Options struct { - // Database to write to - Database string - // for serialising - Codec codec.Codec - // for locking - Sync sync.Sync - // for storage - Store store.Store - // for logger - Logger logger.Logger -} - -type Option func(o *Options) - -// Logger sets the logger -func Logger(l logger.Logger) Option { - return func(o *Options) { - o.Logger = l - } -} - -type ReadOptions struct{} - -type ReadOption func(o *ReadOptions) - -type DeleteOptions struct{} - -type DeleteOption func(o *DeleteOptions) diff --git a/network/network.go b/network/network.go index 0da07169..9e00e9de 100644 --- a/network/network.go +++ b/network/network.go @@ -1,9 +1,9 @@ // Package network is for creating internetworks -package network +package network // import "go.unistack.org/micro/v3/network" import ( - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/server" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/server" ) // Error is network node errors diff --git a/network/options.go b/network/options.go index 2f0b12e5..d4c68c6a 100644 --- a/network/options.go +++ b/network/options.go @@ -1,13 +1,13 @@ package network import ( - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/network/tunnel" - "github.com/unistack-org/micro/v3/proxy" - "github.com/unistack-org/micro/v3/router" - "github.com/unistack-org/micro/v3/tracer" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/network/tunnel" + "go.unistack.org/micro/v3/proxy" + "go.unistack.org/micro/v3/router" + "go.unistack.org/micro/v3/tracer" + "go.unistack.org/micro/v3/util/id" ) // Option func diff --git a/network/transport/memory.go b/network/transport/memory.go index 1aad85c6..209e885e 100644 --- a/network/transport/memory.go +++ b/network/transport/memory.go @@ -8,9 +8,9 @@ import ( "sync" "time" - maddr "github.com/unistack-org/micro/v3/util/addr" - mnet "github.com/unistack-org/micro/v3/util/net" - "github.com/unistack-org/micro/v3/util/rand" + maddr "go.unistack.org/micro/v3/util/addr" + mnet "go.unistack.org/micro/v3/util/net" + "go.unistack.org/micro/v3/util/rand" ) type memorySocket struct { diff --git a/network/transport/options.go b/network/transport/options.go index 8d4d25da..723fea35 100644 --- a/network/transport/options.go +++ b/network/transport/options.go @@ -5,10 +5,10 @@ import ( "crypto/tls" "time" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/tracer" ) // Options struct holds the transport options diff --git a/network/transport/transport.go b/network/transport/transport.go index b321204b..f70f34b9 100644 --- a/network/transport/transport.go +++ b/network/transport/transport.go @@ -1,11 +1,11 @@ // Package transport is an interface for synchronous connection based communication -package transport +package transport // import "go.unistack.org/micro/v3/network/transport" import ( "context" "time" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) var ( diff --git a/network/tunnel/broker/broker.go b/network/tunnel/broker/broker.go index bd06b28b..ea14c1f9 100644 --- a/network/tunnel/broker/broker.go +++ b/network/tunnel/broker/broker.go @@ -1,15 +1,15 @@ // Package broker is a tunnel broker -package broker +package broker // import "go.unistack.org/micro/v3/network/tunnel/broker" import ( "context" "fmt" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/network/transport" - "github.com/unistack-org/micro/v3/network/tunnel" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/tunnel" ) type tunBroker struct { diff --git a/network/tunnel/options.go b/network/tunnel/options.go index 86cc1faa..e3f33e97 100644 --- a/network/tunnel/options.go +++ b/network/tunnel/options.go @@ -3,11 +3,11 @@ package tunnel import ( "time" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/network/transport" - "github.com/unistack-org/micro/v3/tracer" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/network/transport" + "go.unistack.org/micro/v3/tracer" + "go.unistack.org/micro/v3/util/id" ) var ( diff --git a/network/tunnel/transport/listener.go b/network/tunnel/transport/listener.go index ebab4ef9..1a29a760 100644 --- a/network/tunnel/transport/listener.go +++ b/network/tunnel/transport/listener.go @@ -1,8 +1,8 @@ package transport import ( - "github.com/unistack-org/micro/v3/network/transport" - "github.com/unistack-org/micro/v3/network/tunnel" + "go.unistack.org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/tunnel" ) type tunListener struct { diff --git a/network/tunnel/transport/transport.go b/network/tunnel/transport/transport.go index 6d59def3..e5e6f68b 100644 --- a/network/tunnel/transport/transport.go +++ b/network/tunnel/transport/transport.go @@ -1,12 +1,12 @@ // Package transport provides a tunnel transport -package transport +package transport // import "go.unistack.org/micro/v3/network/tunnel/transport" import ( "context" "fmt" - "github.com/unistack-org/micro/v3/network/transport" - "github.com/unistack-org/micro/v3/network/tunnel" + "go.unistack.org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/tunnel" ) type tunTransport struct { diff --git a/network/tunnel/tunnel.go b/network/tunnel/tunnel.go index f5b609c0..3efa9294 100644 --- a/network/tunnel/tunnel.go +++ b/network/tunnel/tunnel.go @@ -1,12 +1,12 @@ // Package tunnel provides gre network tunnelling -package tunnel +package tunnel // import "go.unistack.org/micro/v3/network/transport/tunnel" import ( "context" "errors" "time" - "github.com/unistack-org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/transport" ) // DefaultTunnel contains default tunnel implementation diff --git a/options.go b/options.go index 8c9c715e..89c4a51b 100644 --- a/options.go +++ b/options.go @@ -5,18 +5,18 @@ import ( "fmt" "time" - "github.com/unistack-org/micro/v3/auth" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/config" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/router" - "github.com/unistack-org/micro/v3/server" - "github.com/unistack-org/micro/v3/store" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/auth" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/config" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/router" + "go.unistack.org/micro/v3/server" + "go.unistack.org/micro/v3/store" + "go.unistack.org/micro/v3/tracer" ) // Options for micro service diff --git a/profiler/http/http.go b/profiler/http/http.go index 27fbcb47..d0fa4a80 100644 --- a/profiler/http/http.go +++ b/profiler/http/http.go @@ -1,5 +1,5 @@ // Package http enables the http profiler -package http +package http // import "go.unistack.org/micro/v3/profiler/http" import ( "context" @@ -7,7 +7,7 @@ import ( "net/http/pprof" "sync" - profile "github.com/unistack-org/micro/v3/profiler" + profile "go.unistack.org/micro/v3/profiler" ) type httpProfile struct { diff --git a/profiler/pprof/pprof.go b/profiler/pprof/pprof.go index febd60ef..4ae85db6 100644 --- a/profiler/pprof/pprof.go +++ b/profiler/pprof/pprof.go @@ -1,5 +1,5 @@ // Package pprof provides a pprof profiler which writes output to /tmp/[name].{cpu,mem}.pprof -package pprof +package pprof // import "go.unistack.org/micro/v3/profiler/pprof" import ( "os" @@ -9,7 +9,7 @@ import ( "sync" "time" - profile "github.com/unistack-org/micro/v3/profiler" + profile "go.unistack.org/micro/v3/profiler" ) type profiler struct { diff --git a/profiler/profile.go b/profiler/profile.go index f14d5fb4..b29eb600 100644 --- a/profiler/profile.go +++ b/profiler/profile.go @@ -1,5 +1,5 @@ // Package profiler is for profilers -package profiler +package profiler // import "go.unistack.org/micro/v3/profiler" // Profiler interface type Profiler interface { diff --git a/proxy/options.go b/proxy/options.go index fdc4dfc8..0b0fe0c8 100644 --- a/proxy/options.go +++ b/proxy/options.go @@ -2,11 +2,11 @@ package proxy import ( - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/router" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/router" + "go.unistack.org/micro/v3/tracer" ) // Options for proxy diff --git a/proxy/proxy.go b/proxy/proxy.go index 54e59c1d..e80c1e9a 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -1,10 +1,10 @@ // Package proxy is a transparent proxy built on the micro/server -package proxy +package proxy // import "go.unistack.org/micro/v3/proxy" import ( "context" - "github.com/unistack-org/micro/v3/server" + "go.unistack.org/micro/v3/server" ) // DefaultEndpoint holds default proxy address diff --git a/register/extractor.go b/register/extractor.go index 1b0d6954..923729af 100644 --- a/register/extractor.go +++ b/register/extractor.go @@ -6,7 +6,7 @@ import ( "unicode" "unicode/utf8" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) // ExtractValue from reflect.Type from specified depth diff --git a/register/memory.go b/register/memory.go index 774c3b8a..bb94f774 100644 --- a/register/memory.go +++ b/register/memory.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/util/id" ) var ( diff --git a/register/options.go b/register/options.go index c2b2071b..cf61bd99 100644 --- a/register/options.go +++ b/register/options.go @@ -5,9 +5,9 @@ import ( "crypto/tls" "time" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/tracer" ) // Options holds options for register diff --git a/register/register.go b/register/register.go index 60816781..ed27f0a0 100644 --- a/register/register.go +++ b/register/register.go @@ -1,11 +1,11 @@ // Package register is an interface for service discovery -package register +package register // import "go.unistack.org/micro/v3/register" import ( "context" "errors" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) const ( diff --git a/resolver/dns/dns.go b/resolver/dns/dns.go index 187ca4fd..16569eb8 100644 --- a/resolver/dns/dns.go +++ b/resolver/dns/dns.go @@ -1,5 +1,5 @@ // Package dns resolves names to dns records -package dns +package dns // import "go.unistack.org/micro/v3/resolver/dns" import ( "context" @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/unistack-org/micro/v3/resolver" + "go.unistack.org/micro/v3/resolver" ) // Resolver is a DNS network resolve diff --git a/resolver/dnssrv/dnssrv.go b/resolver/dnssrv/dnssrv.go index ce44131c..f88f816f 100644 --- a/resolver/dnssrv/dnssrv.go +++ b/resolver/dnssrv/dnssrv.go @@ -1,11 +1,11 @@ // Package dnssrv resolves names to dns srv records -package dnssrv +package dnssrv // import "go.unistack.org/micro/v3/resolver/dnssrv" import ( "fmt" "net" - "github.com/unistack-org/micro/v3/resolver" + "go.unistack.org/micro/v3/resolver" ) // Resolver is a DNS network resolve diff --git a/resolver/http/http.go b/resolver/http/http.go index af64bbf7..8aa8e43e 100644 --- a/resolver/http/http.go +++ b/resolver/http/http.go @@ -1,5 +1,5 @@ // Package http resolves names to network addresses using a http request -package http +package http // import "go.unistack.org/micro/v3/resolver/http" import ( "encoding/json" @@ -8,7 +8,7 @@ import ( "net/http" "net/url" - "github.com/unistack-org/micro/v3/resolver" + "go.unistack.org/micro/v3/resolver" ) // nolint: golint,revive diff --git a/resolver/noop/noop.go b/resolver/noop/noop.go index c1d4c014..3fbe202e 100644 --- a/resolver/noop/noop.go +++ b/resolver/noop/noop.go @@ -1,8 +1,8 @@ // Package noop is a noop resolver -package noop +package noop // import "go.unistack.org/micro/v3/resolver/noop" import ( - "github.com/unistack-org/micro/v3/resolver" + "go.unistack.org/micro/v3/resolver" ) // Resolver contains noop resolver diff --git a/resolver/registry/registry.go b/resolver/registry/registry.go index 460de75d..064f7b59 100644 --- a/resolver/registry/registry.go +++ b/resolver/registry/registry.go @@ -1,11 +1,11 @@ // Package register resolves names using the micro register -package register +package register // import "go.unistack.org/micro/v3/resolver/registry" import ( "context" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/resolver" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/resolver" ) // Resolver is a register network resolver diff --git a/resolver/resolver.go b/resolver/resolver.go index 1e3e91e6..7ba1f6cf 100644 --- a/resolver/resolver.go +++ b/resolver/resolver.go @@ -1,5 +1,5 @@ // Package resolver resolves network names to addresses -package resolver +package resolver // import "go.unistack.org/micro/v3/resolver" // Resolver is network resolver. It's used to find network nodes // via the name to connect to. This is done based on Network.Name(). diff --git a/resolver/static/static.go b/resolver/static/static.go index 91fc6b0e..4985a89f 100644 --- a/resolver/static/static.go +++ b/resolver/static/static.go @@ -1,8 +1,8 @@ // Package static is a static resolver -package static +package static // import "go.unistack.org/micro/v3/resolver/static" import ( - "github.com/unistack-org/micro/v3/resolver" + "go.unistack.org/micro/v3/resolver" ) // Resolver returns a static list of nodes. In the event the node list diff --git a/router/options.go b/router/options.go index 7241e387..ab99475f 100644 --- a/router/options.go +++ b/router/options.go @@ -3,9 +3,9 @@ package router import ( "context" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/util/id" ) // Options are router options diff --git a/router/route.go b/router/route.go index 14e9641c..94a7aaf9 100644 --- a/router/route.go +++ b/router/route.go @@ -3,7 +3,7 @@ package router import ( "hash/fnv" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) var ( diff --git a/router/router.go b/router/router.go index 8575d4ce..43874196 100644 --- a/router/router.go +++ b/router/router.go @@ -1,5 +1,5 @@ // Package router provides a network routing control plane -package router +package router // import "go.unistack.org/micro/v3/router" import ( "errors" diff --git a/runtime/options.go b/runtime/options.go index b154996f..ceb420ac 100644 --- a/runtime/options.go +++ b/runtime/options.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/logger" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/logger" ) // Options configure runtime diff --git a/runtime/runtime.go b/runtime/runtime.go index 2e897361..6397a941 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -1,11 +1,11 @@ // Package runtime is a service runtime manager -package runtime +package runtime // import "go.unistack.org/micro/v3/runtime" import ( "errors" "time" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) // ErrAlreadyExists error diff --git a/selector/random/random.go b/selector/random/random.go index 01b3ad39..40b25daf 100644 --- a/selector/random/random.go +++ b/selector/random/random.go @@ -1,8 +1,8 @@ -package random +package random // import "go.unistack.org/micro/v3/selector/random" import ( - "github.com/unistack-org/micro/v3/selector" - "github.com/unistack-org/micro/v3/util/rand" + "go.unistack.org/micro/v3/selector" + "go.unistack.org/micro/v3/util/rand" ) type random struct{} diff --git a/selector/random/random_test.go b/selector/random/random_test.go index 6d5edb1d..08a00f74 100644 --- a/selector/random/random_test.go +++ b/selector/random/random_test.go @@ -3,7 +3,7 @@ package random import ( "testing" - "github.com/unistack-org/micro/v3/selector" + "go.unistack.org/micro/v3/selector" ) func TestRandom(t *testing.T) { diff --git a/selector/roundrobin/roundrobin.go b/selector/roundrobin/roundrobin.go index 575f308e..f39aca5c 100644 --- a/selector/roundrobin/roundrobin.go +++ b/selector/roundrobin/roundrobin.go @@ -1,8 +1,8 @@ -package roundrobin +package roundrobin // import "go.unistack.org/micro/v3/selector/roundrobin" import ( - "github.com/unistack-org/micro/v3/selector" - "github.com/unistack-org/micro/v3/util/rand" + "go.unistack.org/micro/v3/selector" + "go.unistack.org/micro/v3/util/rand" ) // NewSelector returns an initialised round robin selector diff --git a/selector/roundrobin/roundrobin_test.go b/selector/roundrobin/roundrobin_test.go index e23e45da..fa80d637 100644 --- a/selector/roundrobin/roundrobin_test.go +++ b/selector/roundrobin/roundrobin_test.go @@ -3,7 +3,7 @@ package roundrobin import ( "testing" - "github.com/unistack-org/micro/v3/selector" + "go.unistack.org/micro/v3/selector" ) func TestRoundRobin(t *testing.T) { diff --git a/selector/selector.go b/selector/selector.go index 808481f9..2c16cca6 100644 --- a/selector/selector.go +++ b/selector/selector.go @@ -1,5 +1,5 @@ // Package selector is for node selection and load balancing -package selector +package selector // import "go.unistack.org/micro/v3/selector" import ( "errors" diff --git a/server/errors.go b/server/errors.go index b9dc4dac..637998f7 100644 --- a/server/errors.go +++ b/server/errors.go @@ -1,6 +1,6 @@ package server -import "github.com/unistack-org/micro/v3/errors" +import "go.unistack.org/micro/v3/errors" type Error struct { id string diff --git a/server/errors_test.go b/server/errors_test.go index 728b0ba0..ffd9bf19 100644 --- a/server/errors_test.go +++ b/server/errors_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "github.com/unistack-org/micro/v3/errors" + "go.unistack.org/micro/v3/errors" ) func TestError(t *testing.T) { diff --git a/server/generate.go b/server/generate.go index 11499a70..9773d417 100644 --- a/server/generate.go +++ b/server/generate.go @@ -1,12 +1,12 @@ package server -//go:generate sh -c "protoc -I./health -I../ -I$(go list -f '{{ .Dir }}' -m github.com/unistack-org/micro-proto) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./health health/health.proto" +//go:generate sh -c "protoc -I./health -I../ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./health health/health.proto" import ( // import required packages - _ "github.com/unistack-org/micro-proto/api" + _ "go.unistack.org/micro-proto/v3/api" // import required packages - _ "github.com/unistack-org/micro-proto/openapiv2" + _ "go.unistack.org/micro-proto/v3/openapiv3" ) diff --git a/server/handler.go b/server/handler.go index 4825361f..8b99a0ff 100644 --- a/server/handler.go +++ b/server/handler.go @@ -3,7 +3,7 @@ package server import ( "reflect" - "github.com/unistack-org/micro/v3/register" + "go.unistack.org/micro/v3/register" ) type rpcHandler struct { diff --git a/server/health/health.go b/server/health/health.go index ff3a65ee..0f578443 100644 --- a/server/health/health.go +++ b/server/health/health.go @@ -1,10 +1,10 @@ -package health +package health // import "go.unistack.org/micro/v3/server/health" import ( "context" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/errors" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/errors" ) var _ HealthServer = &Handler{} diff --git a/server/health/health.proto b/server/health/health.proto index af42b028..6fd46bca 100644 --- a/server/health/health.proto +++ b/server/health/health.proto @@ -1,24 +1,20 @@ syntax = "proto3"; package micro.server.health; -option go_package = "github.com/unistack-org/micro/v3/server/health;health"; +option go_package = "go.unistack.org/micro/v3/server/health;health"; import "api/annotations.proto"; -import "openapiv2/annotations.proto"; +import "openapiv3/annotations.proto"; import "codec/frame.proto"; service Health { rpc Live(micro.codec.Frame) returns (micro.codec.Frame) { - option (micro.openapiv2.openapiv2_operation) = { + option (micro.openapiv3.openapiv3_operation) = { operation_id: "Live"; responses: { - response_code: { - name: "default"; - value: { - json_reference: { - description: "Error response"; - _ref: "micro.codec.Frame"; - }; + default: { + reference: { + _ref: "micro.codec.Frame"; }; }; }; @@ -26,16 +22,12 @@ service Health { option (micro.api.http) = { get: "/live"; }; }; rpc Ready(micro.codec.Frame) returns (micro.codec.Frame) { - option (micro.openapiv2.openapiv2_operation) = { + option (micro.openapiv3.openapiv3_operation) = { operation_id: "Ready"; responses: { - response_code: { - name: "default"; - value: { - json_reference: { - description: "Error response"; - _ref: "micro.codec.Frame"; - }; + default: { + reference: { + _ref: "micro.codec.Frame"; }; }; }; @@ -43,16 +35,12 @@ service Health { option (micro.api.http) = { get: "/ready"; }; }; rpc Version(micro.codec.Frame) returns (micro.codec.Frame) { - option (micro.openapiv2.openapiv2_operation) = { + option (micro.openapiv3.openapiv3_operation) = { operation_id: "Version"; responses: { - response_code: { - name: "default"; - value: { - json_reference: { - description: "Error response"; - _ref: "micro.codec.Frame"; - }; + default: { + reference: { + _ref: "micro.codec.Frame"; }; }; }; diff --git a/server/health/health_micro.pb.go b/server/health/health_micro.pb.go index 98a075fa..c72c2ec3 100644 --- a/server/health/health_micro.pb.go +++ b/server/health/health_micro.pb.go @@ -1,14 +1,13 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.4.2 +// protoc-gen-go-micro version: v3.5.2 // source: health.proto package health import ( context "context" - - api "github.com/unistack-org/micro/v3/api" - codec "github.com/unistack-org/micro/v3/codec" + api "go.unistack.org/micro/v3/api" + codec "go.unistack.org/micro/v3/codec" ) var ( diff --git a/server/health/health_micro_http.pb.go b/server/health/health_micro_http.pb.go index cd5b7dcc..0d23fd14 100644 --- a/server/health/health_micro_http.pb.go +++ b/server/health/health_micro_http.pb.go @@ -1,15 +1,14 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.4.2 +// protoc-gen-go-micro version: v3.5.2 // source: health.proto package health import ( context "context" - - api "github.com/unistack-org/micro/v3/api" - codec "github.com/unistack-org/micro/v3/codec" - server "github.com/unistack-org/micro/v3/server" + api "go.unistack.org/micro/v3/api" + codec "go.unistack.org/micro/v3/codec" + server "go.unistack.org/micro/v3/server" ) type healthServer struct { diff --git a/server/noop.go b/server/noop.go index 458ea9f6..3ebd02b1 100644 --- a/server/noop.go +++ b/server/noop.go @@ -6,13 +6,13 @@ import ( "sync" "time" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/register" - maddr "github.com/unistack-org/micro/v3/util/addr" - mnet "github.com/unistack-org/micro/v3/util/net" - "github.com/unistack-org/micro/v3/util/rand" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/register" + maddr "go.unistack.org/micro/v3/util/addr" + mnet "go.unistack.org/micro/v3/util/net" + "go.unistack.org/micro/v3/util/rand" ) // DefaultCodecs will be used to encode/decode diff --git a/server/noop_test.go b/server/noop_test.go index 7b6ea3d3..b343e08d 100644 --- a/server/noop_test.go +++ b/server/noop_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/server" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/server" ) type TestHandler struct { diff --git a/server/options.go b/server/options.go index 93daafc1..3b7ec988 100644 --- a/server/options.go +++ b/server/options.go @@ -7,15 +7,15 @@ import ( "sync" "time" - "github.com/unistack-org/micro/v3/auth" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/network/transport" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/auth" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/network/transport" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/tracer" ) // Option func diff --git a/server/registry.go b/server/registry.go index 7520a0b0..f9539522 100644 --- a/server/registry.go +++ b/server/registry.go @@ -4,10 +4,10 @@ import ( "net" "time" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/util/addr" - "github.com/unistack-org/micro/v3/util/backoff" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/util/addr" + "go.unistack.org/micro/v3/util/backoff" ) var ( diff --git a/server/request.go b/server/request.go index 5d2d83be..09271c74 100644 --- a/server/request.go +++ b/server/request.go @@ -1,8 +1,8 @@ package server import ( - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/metadata" ) type rpcMessage struct { diff --git a/server/server.go b/server/server.go index ff97c0ee..45b63f5f 100644 --- a/server/server.go +++ b/server/server.go @@ -1,14 +1,14 @@ // Package server is an interface for a micro server -package server +package server // import "go.unistack.org/micro/v3/server" import ( "context" "time" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/util/id" ) // DefaultServer default server diff --git a/server/subscriber.go b/server/subscriber.go index a4d3d04d..2d472251 100644 --- a/server/subscriber.go +++ b/server/subscriber.go @@ -10,12 +10,12 @@ import ( "unicode" "unicode/utf8" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/errors" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/register" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/errors" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/register" ) const ( diff --git a/service.go b/service.go index 4c04c9c2..fcb31025 100644 --- a/service.go +++ b/service.go @@ -5,17 +5,17 @@ import ( "fmt" "sync" - "github.com/unistack-org/micro/v3/auth" - "github.com/unistack-org/micro/v3/broker" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/config" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/router" - "github.com/unistack-org/micro/v3/server" - "github.com/unistack-org/micro/v3/store" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/auth" + "go.unistack.org/micro/v3/broker" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/config" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/router" + "go.unistack.org/micro/v3/server" + "go.unistack.org/micro/v3/store" + "go.unistack.org/micro/v3/tracer" ) // Service is an interface that wraps the lower level components. @@ -392,8 +392,12 @@ type nameIface interface { Name() string } -func getNameIndex(n string, ifaces ...interface{}) int { - for idx, iface := range ifaces { +func getNameIndex(n string, ifaces interface{}) int { + values, ok := ifaces.([]interface{}) + if !ok { + return 0 + } + for idx, iface := range values { if ifc, ok := iface.(nameIface); ok && ifc.Name() == n { return idx } diff --git a/service_test.go b/service_test.go new file mode 100644 index 00000000..1ee6a77f --- /dev/null +++ b/service_test.go @@ -0,0 +1,22 @@ +package micro + +import ( + "testing" +) + +type testItem struct { + name string +} + +func (ti *testItem) Name() string { + return ti.name +} + +func TestGetNameIndex(t *testing.T) { + item1 := &testItem{name: "first"} + item2 := &testItem{name: "second"} + items := []interface{}{item1, item2} + if idx := getNameIndex("second", items); idx != 1 { + t.Fatalf("getNameIndex func error, item not found") + } +} diff --git a/store/memory_test.go b/store/memory_test.go index 4669436f..da8a9ad0 100644 --- a/store/memory_test.go +++ b/store/memory_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/unistack-org/micro/v3/store" + "go.unistack.org/micro/v3/store" ) func TestMemoryReInit(t *testing.T) { diff --git a/store/options.go b/store/options.go index 76bcabd8..3fa6c79d 100644 --- a/store/options.go +++ b/store/options.go @@ -5,11 +5,11 @@ import ( "crypto/tls" "time" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/tracer" ) // Options contains configuration for the Store diff --git a/store/store.go b/store/store.go index 1f2cf4c4..01f33f8f 100644 --- a/store/store.go +++ b/store/store.go @@ -1,6 +1,5 @@ // Package store is an interface for distributed data storage. -// The design document is located at https://github.com/micro/development/blob/master/design/framework/store.md -package store +package store // import "go.unistack.org/micro/v3/store" import ( "context" diff --git a/sync/options.go b/sync/options.go index 4c5b6efb..b964d2cb 100644 --- a/sync/options.go +++ b/sync/options.go @@ -3,9 +3,9 @@ package sync import ( "time" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/meter" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/meter" + "go.unistack.org/micro/v3/tracer" ) // Options holds the sync options diff --git a/sync/sync.go b/sync/sync.go index a84dfb64..42329514 100644 --- a/sync/sync.go +++ b/sync/sync.go @@ -1,5 +1,5 @@ // Package sync is an interface for distributed synchronization -package sync +package sync // import "go.unistack.org/micro/v3/sync" import ( "errors" diff --git a/tracer/context.go b/tracer/context.go index 7f33150d..8ff4e621 100644 --- a/tracer/context.go +++ b/tracer/context.go @@ -8,14 +8,14 @@ import ( type tracerKey struct{} // FromContext returns a tracer from context -func FromContext(ctx context.Context) Tracer { +func FromContext(ctx context.Context) (Tracer, bool) { if ctx == nil { - return DefaultTracer + return nil, false } if tracer, ok := ctx.Value(tracerKey{}).(Tracer); ok { - return tracer + return tracer, true } - return DefaultTracer + return nil, false } // NewContext saves the tracer in the context @@ -29,14 +29,14 @@ func NewContext(ctx context.Context, tracer Tracer) context.Context { type spanKey struct{} // SpanFromContext returns a span from context -func SpanFromContext(ctx context.Context) Span { +func SpanFromContext(ctx context.Context) (Span, bool) { if ctx == nil { - return &noopSpan{} + return nil, false } if span, ok := ctx.Value(spanKey{}).(Span); ok { - return span + return span, true } - return &noopSpan{} + return nil, false } // NewSpanContext saves the span in the context diff --git a/tracer/noop.go b/tracer/noop.go index 4f900940..261c1ac6 100644 --- a/tracer/noop.go +++ b/tracer/noop.go @@ -35,6 +35,7 @@ type noopSpan struct { ctx context.Context tracer Tracer name string + labels []Label } func (s *noopSpan) Finish(opts ...SpanOption) { @@ -56,6 +57,7 @@ func (s *noopSpan) SetName(name string) { } func (s *noopSpan) SetLabels(labels ...Label) { + s.labels = labels } // NewTracer returns new memory tracer diff --git a/tracer/options.go b/tracer/options.go index 4f4624eb..a0f6149e 100644 --- a/tracer/options.go +++ b/tracer/options.go @@ -1,6 +1,6 @@ package tracer -import "github.com/unistack-org/micro/v3/logger" +import "go.unistack.org/micro/v3/logger" type SpanOptions struct{} diff --git a/tracer/tracer.go b/tracer/tracer.go index c31d9078..540b092f 100644 --- a/tracer/tracer.go +++ b/tracer/tracer.go @@ -1,5 +1,5 @@ // Package tracer provides an interface for distributed tracing -package tracer +package tracer // import "go.unistack.org/micro/v3/tracer" import ( "context" @@ -38,26 +38,26 @@ type Label struct { key string } -func Any(k string, v interface{}) Label { +func LabelAny(k string, v interface{}) Label { return Label{key: k, val: v} } -func String(k string, v string) Label { +func LabelString(k string, v string) Label { return Label{key: k, val: v} } -func Int(k string, v int) Label { +func LabelInt(k string, v int) Label { return Label{key: k, val: v} } -func Int64(k string, v int64) Label { +func LabelInt64(k string, v int64) Label { return Label{key: k, val: v} } -func Float64(k string, v float64) Label { +func LabelFloat64(k string, v float64) Label { return Label{key: k, val: v} } -func Bool(k string, v bool) Label { +func LabelBool(k string, v bool) Label { return Label{key: k, val: v} } diff --git a/tracer/wrapper/wrapper.go b/tracer/wrapper/wrapper.go index c85b67ca..ba2aec14 100644 --- a/tracer/wrapper/wrapper.go +++ b/tracer/wrapper/wrapper.go @@ -1,14 +1,14 @@ // Package wrapper provides wrapper for Tracer -package wrapper +package wrapper // import "go.unistack.org/micro/v3/tracer/wrapper" import ( "context" "fmt" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/server" - "github.com/unistack-org/micro/v3/tracer" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/server" + "go.unistack.org/micro/v3/tracer" ) var ( diff --git a/util/addr/addr.go b/util/addr/addr.go index 669c7db4..47e5636f 100644 --- a/util/addr/addr.go +++ b/util/addr/addr.go @@ -1,4 +1,4 @@ -package addr +package addr // import "go.unistack.org/micro/v3/util/addr" import ( "fmt" diff --git a/util/auth/auth.go b/util/auth/auth.go index e6bf18c7..3a6290e9 100644 --- a/util/auth/auth.go +++ b/util/auth/auth.go @@ -1,12 +1,12 @@ -package auth +package auth // import "go.unistack.org/micro/v3/util/auth" import ( "context" "time" - "github.com/unistack-org/micro/v3/auth" - "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/auth" + "go.unistack.org/micro/v3/logger" + "go.unistack.org/micro/v3/util/id" ) // Verify the auth credentials and refresh the auth token periodically diff --git a/util/backoff/backoff.go b/util/backoff/backoff.go index cadc2fc1..a18c6a52 100644 --- a/util/backoff/backoff.go +++ b/util/backoff/backoff.go @@ -1,5 +1,5 @@ // Package backoff provides backoff functionality -package backoff +package backoff // import "go.unistack.org/micro/v3/util/backoff" import ( "math" diff --git a/util/buf/buf.go b/util/buf/buf.go index 42421f68..9641bc6d 100644 --- a/util/buf/buf.go +++ b/util/buf/buf.go @@ -1,4 +1,4 @@ -package buf +package buf // import "go.unistack.org/micro/v3/util/buf" import ( "bytes" diff --git a/util/ctx/ctx.go b/util/ctx/ctx.go index 5e01ea87..bf008ce6 100644 --- a/util/ctx/ctx.go +++ b/util/ctx/ctx.go @@ -1,11 +1,11 @@ -package ctx +package ctx // import "go.unistack.org/micro/v3/util/ctx" import ( "context" "net/http" "strings" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) // FromRequest creates context with metadata from http.Request diff --git a/util/ctx/ctx_test.go b/util/ctx/ctx_test.go index da067e61..22b61bca 100644 --- a/util/ctx/ctx_test.go +++ b/util/ctx/ctx_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/unistack-org/micro/v3/metadata" + "go.unistack.org/micro/v3/metadata" ) func TestRequestToContext(t *testing.T) { diff --git a/util/http/http.go b/util/http/http.go index b37c29b7..de83f138 100644 --- a/util/http/http.go +++ b/util/http/http.go @@ -1,4 +1,4 @@ -package http +package http // import "go.unistack.org/micro/v3/util/http" import ( "context" @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/selector/random" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/selector/random" ) // Write sets the status and body on a http ResponseWriter diff --git a/util/http/http_test.go b/util/http/http_test.go index 8af11f58..c2bd4976 100644 --- a/util/http/http_test.go +++ b/util/http/http_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - "github.com/unistack-org/micro/v3/register" - "github.com/unistack-org/micro/v3/register/memory" - "github.com/unistack-org/micro/v3/router" - regRouter "github.com/unistack-org/micro/v3/router/register" + "go.unistack.org/micro/v3/register" + "go.unistack.org/micro/v3/register/memory" + "go.unistack.org/micro/v3/router" + regRouter "go.unistack.org/micro/v3/router/register" ) func TestRoundTripper(t *testing.T) { diff --git a/util/http/options.go b/util/http/options.go index 322c4534..961fcf82 100644 --- a/util/http/options.go +++ b/util/http/options.go @@ -1,6 +1,6 @@ package http -import "github.com/unistack-org/micro/v3/router" +import "go.unistack.org/micro/v3/router" // Options struct type Options struct { diff --git a/util/http/roundtripper.go b/util/http/roundtripper.go index 2dfa22d6..da7f9c8b 100644 --- a/util/http/roundtripper.go +++ b/util/http/roundtripper.go @@ -4,8 +4,8 @@ import ( "errors" "net/http" - "github.com/unistack-org/micro/v3/router" - "github.com/unistack-org/micro/v3/selector" + "go.unistack.org/micro/v3/router" + "go.unistack.org/micro/v3/selector" ) type roundTripper struct { diff --git a/util/id/id.go b/util/id/id.go index b07359ac..f4699e6e 100644 --- a/util/id/id.go +++ b/util/id/id.go @@ -1,4 +1,4 @@ -package id +package id // import "go.unistack.org/micro/v3/util/id" import ( "context" @@ -6,7 +6,7 @@ import ( "errors" "math" - "github.com/unistack-org/micro/v3/logger" + "go.unistack.org/micro/v3/logger" ) // DefaultAlphabet is the alphabet used for ID characters by default diff --git a/util/io/io.go b/util/io/io.go index 430105e3..54599523 100644 --- a/util/io/io.go +++ b/util/io/io.go @@ -1,10 +1,10 @@ // Package io is for io management -package io +package io // import "go.unistack.org/micro/v3/util/io" import ( "io" - "github.com/unistack-org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/transport" ) type rwc struct { diff --git a/util/jitter/random.go b/util/jitter/random.go index 3131afc7..c3caa5d3 100644 --- a/util/jitter/random.go +++ b/util/jitter/random.go @@ -1,10 +1,10 @@ // Package jitter provides a random jitter -package jitter +package jitter // import "go.unistack.org/micro/v3/util/jitter" import ( "time" - "github.com/unistack-org/micro/v3/util/rand" + "go.unistack.org/micro/v3/util/rand" ) // Random returns a random time to jitter with max cap specified diff --git a/util/jitter/ticker.go b/util/jitter/ticker.go index 7457d3d1..0b78342b 100644 --- a/util/jitter/ticker.go +++ b/util/jitter/ticker.go @@ -3,7 +3,7 @@ package jitter import ( "time" - "github.com/unistack-org/micro/v3/util/rand" + "go.unistack.org/micro/v3/util/rand" ) // Ticker is similar to time.Ticker but ticks at random intervals between diff --git a/util/net/net.go b/util/net/net.go index 96a4f1e7..a5e8e278 100644 --- a/util/net/net.go +++ b/util/net/net.go @@ -1,4 +1,4 @@ -package net +package net // import "go.unistack.org/micro/v3/util/net" import ( "errors" diff --git a/util/pki/pki.go b/util/pki/pki.go index e09cab82..681821bf 100644 --- a/util/pki/pki.go +++ b/util/pki/pki.go @@ -1,6 +1,6 @@ // Package pki provides PKI all the PKI functions necessary to run micro over an untrusted network // including a CA -package pki +package pki // import "go.unistack.org/micro/v3/util/pki" import ( "bytes" diff --git a/util/pool/default.go b/util/pool/default.go index deada016..7f61c281 100644 --- a/util/pool/default.go +++ b/util/pool/default.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/unistack-org/micro/v3/network/transport" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/network/transport" + "go.unistack.org/micro/v3/util/id" ) type pool struct { diff --git a/util/pool/default_test.go b/util/pool/default_test.go index 8a6ea172..7fe97f07 100644 --- a/util/pool/default_test.go +++ b/util/pool/default_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/unistack-org/micro/v3/network/transport" - "github.com/unistack-org/micro/v3/network/transport/memory" + "go.unistack.org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/transport/memory" ) func testPool(t *testing.T, size int, ttl time.Duration) { diff --git a/util/pool/options.go b/util/pool/options.go index d2ac5c50..3edfc310 100644 --- a/util/pool/options.go +++ b/util/pool/options.go @@ -3,7 +3,7 @@ package pool import ( "time" - "github.com/unistack-org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/transport" ) // Options struct diff --git a/util/pool/pool.go b/util/pool/pool.go index ebd28921..576d1873 100644 --- a/util/pool/pool.go +++ b/util/pool/pool.go @@ -1,11 +1,11 @@ // Package pool is a connection pool -package pool +package pool // import "go.unistack.org/micro/v3/util/pool" import ( "context" "time" - "github.com/unistack-org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/transport" ) // Pool is an interface for connection pooling diff --git a/util/qson/qson.go b/util/qson/qson.go index a7f85533..e36c0743 100644 --- a/util/qson/qson.go +++ b/util/qson/qson.go @@ -3,7 +3,7 @@ // // See https://golang.org/pkg/encoding/json/ for more // details on JSON struct tags. -package qson +package qson // import "go.unistack.org/micro/v3/util/qson" import ( "encoding/json" diff --git a/util/rand/rand.go b/util/rand/rand.go index 4b0b5ceb..72abe284 100644 --- a/util/rand/rand.go +++ b/util/rand/rand.go @@ -1,4 +1,4 @@ -package rand +package rand // import "go.unistack.org/micro/v3/util/rand" import ( crand "crypto/rand" diff --git a/util/reflect/reflect.go b/util/reflect/reflect.go index 06a686d4..9ac53d47 100644 --- a/util/reflect/reflect.go +++ b/util/reflect/reflect.go @@ -1,4 +1,4 @@ -package reflect +package reflect // import "go.unistack.org/micro/v3/util/reflect" import ( "errors" diff --git a/util/reflect/struct.go b/util/reflect/struct.go index f020283c..b0e7eba1 100644 --- a/util/reflect/struct.go +++ b/util/reflect/struct.go @@ -7,6 +7,7 @@ import ( "reflect" "regexp" "strings" + "time" ) // ErrInvalidParam specifies invalid url query params @@ -69,6 +70,89 @@ func StructFieldByTag(src interface{}, tkey string, tval string) (interface{}, e return nil, ErrNotFound } +// ZeroFieldByPath clean struct field by its path +func ZeroFieldByPath(src interface{}, path string) error { + var err error + val := reflect.ValueOf(src) + + for _, p := range strings.Split(path, ".") { + val, err = structValueByName(val, p) + if err != nil { + return err + } + } + + if IsEmpty(val) { + return nil + } + + if !val.CanSet() { + return ErrInvalidStruct + } + + val.Set(reflect.Zero(val.Type())) + + return nil +} + +// SetFieldByPath set struct field by its path +func SetFieldByPath(src interface{}, dst interface{}, path string) error { + var err error + val := reflect.ValueOf(src) + + for _, p := range strings.Split(path, ".") { + val, err = structValueByName(val, p) + if err != nil { + return err + } + } + + if !val.CanSet() { + return ErrInvalidStruct + } + + val.Set(reflect.ValueOf(dst)) + + return nil +} + +// structValueByName get struct field by its name +func structValueByName(sv reflect.Value, tkey string) (reflect.Value, error) { + if sv.Kind() == reflect.Ptr { + sv = sv.Elem() + } + if sv.Kind() != reflect.Struct { + return reflect.Zero(reflect.TypeOf(sv)), ErrInvalidStruct + } + + typ := sv.Type() + for idx := 0; idx < typ.NumField(); idx++ { + fld := typ.Field(idx) + val := sv.Field(idx) + if len(fld.PkgPath) != 0 { + continue + } + + if fld.Name == tkey || strings.EqualFold(strings.ToLower(fld.Name), strings.ToLower(tkey)) { + return val, nil + } + + switch val.Kind() { + case reflect.Ptr: + if val = val.Elem(); val.Kind() == reflect.Struct { + if iface, err := structValueByName(val, tkey); err == nil { + return iface, nil + } + } + case reflect.Struct: + if iface, err := structValueByName(val, tkey); err == nil { + return iface, nil + } + } + } + return reflect.Zero(reflect.TypeOf(sv)), ErrNotFound +} + // StructFieldByPath get struct field by its path func StructFieldByPath(src interface{}, path string) (interface{}, error) { var err error @@ -98,10 +182,7 @@ func StructFieldByName(src interface{}, tkey string) (interface{}, error) { if len(fld.PkgPath) != 0 { continue } - if fld.Name == tkey { - if val.Kind() != reflect.Ptr && val.CanAddr() { - val = val.Addr() - } + if fld.Name == tkey || strings.EqualFold(strings.ToLower(fld.Name), strings.ToLower(tkey)) { return val.Interface(), nil } @@ -153,10 +234,30 @@ func StructFields(src interface{}) ([]StructField, error) { continue } + switch val.Interface().(type) { + case time.Time, *time.Time: + fields = append(fields, StructField{Field: fld, Value: val, Path: fld.Name}) + continue + case time.Duration, *time.Duration: + fields = append(fields, StructField{Field: fld, Value: val, Path: fld.Name}) + continue + } + switch val.Kind() { - // case timeKind: - // fmt.Printf("GGG\n") - // fields = append(fields, StructField{Field: fld, Value: val, Path: fld.Name}) + case reflect.Ptr: + // if !val.IsValid() + if reflect.Indirect(val).Kind() == reflect.Struct { + infields, err := StructFields(val.Interface()) + if err != nil { + return nil, err + } + for _, infield := range infields { + infield.Path = fmt.Sprintf("%s.%s", fld.Name, infield.Path) + fields = append(fields, infield) + } + } else { + fields = append(fields, StructField{Field: fld, Value: val, Path: fld.Name}) + } case reflect.Struct: infields, err := StructFields(val.Interface()) if err != nil { diff --git a/util/reflect/struct_test.go b/util/reflect/struct_test.go index f590d393..0c98ac32 100644 --- a/util/reflect/struct_test.go +++ b/util/reflect/struct_test.go @@ -4,10 +4,105 @@ import ( "net/url" "reflect" "testing" + "time" - rutil "github.com/unistack-org/micro/v3/util/reflect" + rutil "go.unistack.org/micro/v3/util/reflect" ) +func TestStructfields(t *testing.T) { + type Config struct { + Wait time.Duration + Time time.Time + Metadata map[string]int + Broker string + Addr []string + Verbose bool + Nested *Config + } + cfg := &Config{Nested: &Config{}} + fields, err := rutil.StructFields(cfg) + if err != nil { + t.Fatal(err) + } + if len(fields) != 13 { + t.Fatalf("invalid fields number: %v", fields) + } +} + +func TestSetFieldByPath(t *testing.T) { + type NestedStr struct { + BBB string `json:"bbb"` + CCC int `json:"ccc"` + } + type Str1 struct { + Name []string `json:"name" codec:"flatten"` + XXX string `json:"xxx"` + Nested NestedStr `json:"nested"` + } + type Str2 struct { + XXX string `json:"xxx"` + Nested *NestedStr `json:"nested"` + Name []string `json:"name" codec:"flatten"` + } + var err error + val1 := &Str1{Name: []string{"first", "second"}, XXX: "ttt", Nested: NestedStr{BBB: "ddd", CCC: 9}} + val2 := &Str2{Name: []string{"first", "second"}, XXX: "ttt", Nested: &NestedStr{BBB: "ddd", CCC: 9}} + err = rutil.SetFieldByPath(val1, "xxx", "Nested.BBB") + if err != nil { + t.Fatal(err) + } + if val1.Nested.BBB != "xxx" { + t.Fatalf("SetFieldByPath not works: %#+v", val1) + } + err = rutil.SetFieldByPath(val2, "xxx", "Nested.BBB") + if err != nil { + t.Fatal(err) + } + if val2.Nested.BBB != "xxx" { + t.Fatalf("SetFieldByPath not works: %#+v", val1) + } +} + +func TestZeroFieldByPath(t *testing.T) { + type NestedStr struct { + BBB string `json:"bbb"` + CCC int `json:"ccc"` + } + type Str1 struct { + Name []string `json:"name" codec:"flatten"` + XXX string `json:"xxx"` + Nested NestedStr `json:"nested"` + } + type Str2 struct { + XXX string `json:"xxx"` + Nested *NestedStr `json:"nested"` + Name []string `json:"name" codec:"flatten"` + } + var err error + val1 := &Str1{Name: []string{"first", "second"}, XXX: "ttt", Nested: NestedStr{BBB: "ddd", CCC: 9}} + + err = rutil.ZeroFieldByPath(val1, "Nested.BBB") + if err != nil { + t.Fatal(err) + } + err = rutil.ZeroFieldByPath(val1, "Nested") + if err != nil { + t.Fatal(err) + } + if val1.Nested.BBB == "ddd" { + t.Fatalf("zero field not works: %v", val1) + } + + val2 := &Str2{Name: []string{"first", "second"}, XXX: "ttt", Nested: &NestedStr{BBB: "ddd", CCC: 9}} + err = rutil.ZeroFieldByPath(val2, "Nested") + if err != nil { + t.Fatal(err) + } + if val2.Nested != nil { + t.Fatalf("zero field not works: %v", val2) + } +} + func TestStructFieldsMap(t *testing.T) { type NestedStr struct { BBB string @@ -108,9 +203,9 @@ func TestStructByName(t *testing.T) { t.Fatal(err) } - if v, ok := iface.(*[]string); !ok { - t.Fatalf("not *[]string %v", iface) - } else if len(*v) != 2 { + if v, ok := iface.([]string); !ok { + t.Fatalf("not []string %v", iface) + } else if len(v) != 2 { t.Fatalf("invalid number %v", iface) } } diff --git a/util/register/util.go b/util/register/util.go index 24c7a0fd..b3baf17a 100644 --- a/util/register/util.go +++ b/util/register/util.go @@ -1,7 +1,7 @@ -package register +package register // import "go.unistack.org/micro/v3/util/register" import ( - "github.com/unistack-org/micro/v3/register" + "go.unistack.org/micro/v3/register" ) func addNodes(old, neu []*register.Node) []*register.Node { diff --git a/util/register/util_test.go b/util/register/util_test.go index 57433dd4..cea37b72 100644 --- a/util/register/util_test.go +++ b/util/register/util_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/unistack-org/micro/v3/register" + "go.unistack.org/micro/v3/register" ) func TestRemove(t *testing.T) { diff --git a/util/ring/buffer.go b/util/ring/buffer.go index 81d341d5..1c25f993 100644 --- a/util/ring/buffer.go +++ b/util/ring/buffer.go @@ -1,11 +1,11 @@ // Package ring provides a simple ring buffer for storing local data -package ring +package ring // import "go.unistack.org/micro/v3/util/ring" import ( "sync" "time" - "github.com/unistack-org/micro/v3/util/id" + "go.unistack.org/micro/v3/util/id" ) // Buffer is ring buffer diff --git a/util/socket/socket.go b/util/socket/socket.go index 05c1bc88..1797a71a 100644 --- a/util/socket/socket.go +++ b/util/socket/socket.go @@ -1,10 +1,10 @@ // Package socket provides a pseudo socket -package socket +package socket // import "go.unistack.org/micro/v3/util/socket" import ( "io" - "github.com/unistack-org/micro/v3/network/transport" + "go.unistack.org/micro/v3/network/transport" ) // Socket is our pseudo socket for transport.Socket diff --git a/util/stream/stream.go b/util/stream/stream.go index 7f0aff8c..c21c9bf8 100644 --- a/util/stream/stream.go +++ b/util/stream/stream.go @@ -1,14 +1,14 @@ // Package stream encapsulates streams within streams -package stream +package stream // import "go.unistack.org/micro/v3/util/stream" import ( "context" "sync" - "github.com/unistack-org/micro/v3/client" - "github.com/unistack-org/micro/v3/codec" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/server" + "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/server" ) // Stream interface diff --git a/util/sync/manager.go b/util/sync/manager.go index 54ad3226..609fb379 100644 --- a/util/sync/manager.go +++ b/util/sync/manager.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/unistack-org/micro/v3/store" + "go.unistack.org/micro/v3/store" ) func (c *syncStore) syncManager() { diff --git a/util/sync/options.go b/util/sync/options.go index 59482934..3e6725b7 100644 --- a/util/sync/options.go +++ b/util/sync/options.go @@ -3,7 +3,7 @@ package sync import ( "time" - "github.com/unistack-org/micro/v3/store" + "go.unistack.org/micro/v3/store" ) // Options represents Sync options diff --git a/util/sync/sync.go b/util/sync/sync.go index 6c330976..0102bf7d 100644 --- a/util/sync/sync.go +++ b/util/sync/sync.go @@ -1,5 +1,5 @@ // Package sync will sync multiple stores -package sync +package sync // import "go.unistack.org/micro/v3/util/sync" import ( "context" @@ -8,7 +8,7 @@ import ( "time" "github.com/ef-ds/deque" - "github.com/unistack-org/micro/v3/store" + "go.unistack.org/micro/v3/store" ) // Sync implements a sync in for stores diff --git a/util/token/basic/basic.go b/util/token/basic/basic.go index 68d3d2c7..f9685759 100644 --- a/util/token/basic/basic.go +++ b/util/token/basic/basic.go @@ -1,4 +1,4 @@ -package basic +package basic // import "go.unistack.org/micro/v3/util/token/basic" import ( "context" @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/unistack-org/micro/v3/auth" - "github.com/unistack-org/micro/v3/store" - "github.com/unistack-org/micro/v3/util/id" - "github.com/unistack-org/micro/v3/util/token" + "go.unistack.org/micro/v3/auth" + "go.unistack.org/micro/v3/store" + "go.unistack.org/micro/v3/util/id" + "go.unistack.org/micro/v3/util/token" ) // Basic implementation of token provider, backed by the store diff --git a/util/token/basic/basic_test.go b/util/token/basic/basic_test.go index 13fe2308..6bc9099b 100644 --- a/util/token/basic/basic_test.go +++ b/util/token/basic/basic_test.go @@ -5,9 +5,9 @@ package basic import ( "testing" - "github.com/unistack-org/micro/v3/auth" - "github.com/unistack-org/micro/v3/store/memory" - "github.com/unistack-org/micro/v3/util/token" + "go.unistack.org/micro/v3/auth" + "go.unistack.org/micro/v3/store/memory" + "go.unistack.org/micro/v3/util/token" ) func TestGenerate(t *testing.T) { diff --git a/util/token/jwt/jwt.go b/util/token/jwt/jwt.go index 3e567d08..dc3c644c 100644 --- a/util/token/jwt/jwt.go +++ b/util/token/jwt/jwt.go @@ -1,13 +1,13 @@ -package jwt +package jwt // import "go.unistack.org/micro/v3/util/token/jwt" import ( "encoding/base64" "time" "github.com/golang-jwt/jwt/v4" - "github.com/unistack-org/micro/v3/auth" - "github.com/unistack-org/micro/v3/metadata" - "github.com/unistack-org/micro/v3/util/token" + "go.unistack.org/micro/v3/auth" + "go.unistack.org/micro/v3/metadata" + "go.unistack.org/micro/v3/util/token" ) // authClaims to be encoded in the JWT diff --git a/util/token/jwt/jwt_test.go b/util/token/jwt/jwt_test.go index d80a23b9..996b48b2 100644 --- a/util/token/jwt/jwt_test.go +++ b/util/token/jwt/jwt_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/unistack-org/micro/v3/auth" - "github.com/unistack-org/micro/v3/util/token" + "go.unistack.org/micro/v3/auth" + "go.unistack.org/micro/v3/util/token" ) func TestGenerate(t *testing.T) { diff --git a/util/token/options.go b/util/token/options.go index 76044599..b7603148 100644 --- a/util/token/options.go +++ b/util/token/options.go @@ -3,7 +3,7 @@ package token import ( "time" - "github.com/unistack-org/micro/v3/store" + "go.unistack.org/micro/v3/store" ) // Options holds the options for token diff --git a/util/token/token.go b/util/token/token.go index 51bcc29a..af71828f 100644 --- a/util/token/token.go +++ b/util/token/token.go @@ -1,10 +1,10 @@ -package token +package token // import "go.unistack.org/micro/v3/util/token" import ( "errors" "time" - "github.com/unistack-org/micro/v3/auth" + "go.unistack.org/micro/v3/auth" ) var (