code review: avoid exporting getCommonProtocol function

kumahq · Feb 17, 2020 · 0c06b96 · 0c06b96
1 parent e3ddf95
commit 0c06b96
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/pkg/xds/generator/protocol.go b/pkg/xds/generator/protocol.go
@@ -17,14 +17,14 @@ var (
 	}
 )
 
-// GetCommonProtocol returns a common protocol between given two.
+// getCommonProtocol returns a common protocol between given two.
 //
 // E.g.,
 // a common protocol between HTTP and HTTP  is HTTP,
 // a common protocol between HTTP and TCP   is TCP,
 // a common protocol between GRPC and HTTP2 is HTTP2,
 // a common protocol between HTTP and HTTP2 is TCP.
-func GetCommonProtocol(one, another mesh_core.Protocol) mesh_core.Protocol {
+func getCommonProtocol(one, another mesh_core.Protocol) mesh_core.Protocol {
 	if one == another {
 		return one
 	}
@@ -57,7 +57,7 @@ func InferServiceProtocol(endpoints []core_xds.Endpoint) mesh_core.Protocol {
 	serviceProtocol := mesh_core.ParseProtocol(endpoints[0].Tags[mesh_proto.ProtocolTag])
 	for _, endpoint := range endpoints[1:] {
 		endpointProtocol := mesh_core.ParseProtocol(endpoint.Tags[mesh_proto.ProtocolTag])
-		serviceProtocol = GetCommonProtocol(serviceProtocol, endpointProtocol)
+		serviceProtocol = getCommonProtocol(serviceProtocol, endpointProtocol)
 	}
 	return serviceProtocol
 }
diff --git a/pkg/xds/generator/protocol_helper_test.go b/pkg/xds/generator/protocol_helper_test.go
@@ -0,0 +1,5 @@
+package generator
+
+// GetCommonProtocol is an alias for function getCommonProtocol
+// that is accessible to unit tests in generator_test package.
+var GetCommonProtocol = getCommonProtocol
diff --git a/pkg/xds/generator/protocol_test.go b/pkg/xds/generator/protocol_test.go
@@ -11,7 +11,7 @@ import (
 	core_xds "github.com/Kong/kuma/pkg/core/xds"
 )
 
-var _ = Describe("GetCommonProtocol()", func() {
+var _ = Describe("getCommonProtocol()", func() {
 	type testCase struct {
 		one      mesh_core.Protocol
 		another  mesh_core.Protocol