service: Simplify and test MeshService.FQDN() (#3826)

* service: Simplify and test MeshService.FQDN()

Signed-off-by: Delyan Raychev <[email protected]>

pkg/service/types.go

@@ -3,7 +3,6 @@ package service
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/openservicemesh/osm/pkg/constants"
 	"github.com/openservicemesh/osm/pkg/identity"
@@ -56,7 +55,7 @@ func (ms MeshService) FQDN() string {
 	if ms.ClusterDomain == "" {
 		ms.ClusterDomain = constants.LocalDomain
 	}
-	return strings.Join([]string{ms.Name, ms.Namespace, ms.ClusterDomain.String()}, ".")
+	return fmt.Sprintf("%s.%s.%s", ms.Name, ms.Namespace, ms.ClusterDomain)
 }
 
 // Local returns whether or not this is service is in the local cluster.

pkg/service/types_test.go

@@ -23,7 +23,7 @@ var _ = Describe("Test pkg/service functions", func() {
 		})
 	})
 
-	Context("Test MeshService's String method", func() {
+	Context("Test MeshService's String and FQDN methods", func() {
 		namespace := uuid.New().String()
 		name := uuid.New().String()
 		ms := MeshService{
@@ -32,9 +32,13 @@ var _ = Describe("Test pkg/service functions", func() {
 			ClusterDomain: constants.LocalDomain,
 		}
 
-		It("implements stringer correctly", func() {
+		It("implements String() correctly", func() {
 			Expect(ms.String()).To(Equal(fmt.Sprintf("%s/%s/%s", namespace, name, constants.LocalDomain)))
 		})
+
+		It("implements FQDN() correctly", func() {
+			Expect(ms.FQDN()).To(Equal(fmt.Sprintf("%s.%s.%s", name, namespace, constants.LocalDomain)))
+		})
 	})
 
 })