Adjust interface a bit, fix indirect lint error (#125)

* Adjust interface a bit

* Extra lines at end
This commit is contained in:
Leon Mai 2019-11-15 15:26:56 -08:00 committed by Yaron Schneider
parent cf2f5287fe
commit 5a27c138e7
4 changed files with 9 additions and 9 deletions

View File

@ -11,14 +11,14 @@ import (
"github.com/dapr/components-contrib/servicediscovery"
)
type Resolver struct {
type resolver struct {
}
func NewKubernetesResolver() *Resolver {
return &Resolver{}
func NewKubernetesResolver() servicediscovery.Resolver {
return &resolver{}
}
func (z *Resolver) ResolveID(req *servicediscovery.ResolveRequest) (string, error) {
func (z *resolver) ResolveID(req servicediscovery.ResolveRequest) (string, error) {
// Dapr requires this formatting for Kubernetes services
return fmt.Sprintf("%s-dapr.%s.svc.cluster.local:%d", req.ID, req.Namespace, req.Port), nil
}

View File

@ -18,7 +18,7 @@ func TestResolve(t *testing.T) {
request := servicediscovery.ResolveRequest{ID: "myid", Namespace: "abc", Port: 1234}
u := fmt.Sprintf("myid-dapr.abc.svc.cluster.local:1234")
target, err := resolver.ResolveID(&request)
target, err := resolver.ResolveID(request)
assert.Nil(t, err)
assert.Equal(t, target, u)

View File

@ -21,7 +21,7 @@ func NewMDNSResolver() servicediscovery.Resolver {
type resolver struct {
}
func (z *resolver) ResolveID(req *servicediscovery.ResolveRequest) (string, error) {
func (z *resolver) ResolveID(req servicediscovery.ResolveRequest) (string, error) {
port, err := LookupPortMDNS(req.ID)
if err != nil {
return "", err
@ -30,12 +30,12 @@ func (z *resolver) ResolveID(req *servicediscovery.ResolveRequest) (string, erro
}
// LookupPortMDNS uses mdns to find the port of a given service entry on a local network
func LookupPortMDNS(id string) (int, error) {
func LookupPortMDNS(id string) (int, error) {
resolver, err := zeroconf.NewResolver(nil)
if err != nil {
return -1, fmt.Errorf("failed to initialize resolver: %e", err)
}
port := -1
entries := make(chan *zeroconf.ServiceEntry)

View File

@ -6,5 +6,5 @@
package servicediscovery
type Resolver interface {
ResolveID(req *ResolveRequest) (string, error)
ResolveID(req ResolveRequest) (string, error)
}