Address review comments

gravitational · Dec 9, 2020 · bee37d1 · bee37d1
1 parent 7511c94
commit bee37d1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/reversetunnel/srv.go b/lib/reversetunnel/srv.go
@@ -183,6 +183,7 @@ type Config struct {
 	// Component is a component used in logs
 	Component string
 
+	// Log specifies the logger
 	Log log.FieldLogger
 
 	// FIPS means Teleport was started in a FedRAMP/FIPS 140-2 compliant

diff --git a/lib/services/server.go b/lib/services/server.go
@@ -382,6 +382,11 @@ func (s *ServerV2) DeepCopy() Server {
 // Merge overwrites r from src and
 // is part of support for cloning Server values
 // using proto.Clone.
+//
+// Note: this does not implement the full Merger interface,
+// specifically, it assumes that r is zero value.
+// See https://github.com/gogo/protobuf/blob/v1.3.1/proto/clone.go#L58-L60
+//
 // Implements proto.Merger
 func (r *Rotation) Merge(src proto.Message) {
 	s, ok := src.(*Rotation)
@@ -394,6 +399,11 @@ func (r *Rotation) Merge(src proto.Message) {
 // Merge overwrites r from src and
 // is part of support for cloning Server values
 // using proto.Clone.
+//
+// Note: this does not implement the full Merger interface,
+// specifically, it assumes that r is zero value.
+// See https://github.com/gogo/protobuf/blob/v1.3.1/proto/clone.go#L58-L60
+//
 // Implements proto.Merger
 func (r *Metadata) Merge(src proto.Message) {
 	m, ok := src.(*Metadata)