diff --git a/servicediscovery/kubernetes/kubernetes.go b/servicediscovery/kubernetes/kubernetes.go index 74a7e2e55..370344759 100644 --- a/servicediscovery/kubernetes/kubernetes.go +++ b/servicediscovery/kubernetes/kubernetes.go @@ -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 } diff --git a/servicediscovery/kubernetes/kubernetes_test.go b/servicediscovery/kubernetes/kubernetes_test.go index 63e484e71..2a51b6df9 100644 --- a/servicediscovery/kubernetes/kubernetes_test.go +++ b/servicediscovery/kubernetes/kubernetes_test.go @@ -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) diff --git a/servicediscovery/mdns/mdns.go b/servicediscovery/mdns/mdns.go index 399b70c5a..a43462215 100644 --- a/servicediscovery/mdns/mdns.go +++ b/servicediscovery/mdns/mdns.go @@ -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) diff --git a/servicediscovery/servicediscovery.go b/servicediscovery/servicediscovery.go index 7122c41c8..c99625008 100644 --- a/servicediscovery/servicediscovery.go +++ b/servicediscovery/servicediscovery.go @@ -6,5 +6,5 @@ package servicediscovery type Resolver interface { - ResolveID(req *ResolveRequest) (string, error) + ResolveID(req ResolveRequest) (string, error) }