Semantic fixes

Author: jshahriddhi

cmd/consul-dataplane/main.go

@@ -67,8 +67,8 @@ func init() {
 	flag.StringVar(&readyBindAddr, "envoy-ready-bind-address", "", "The address on which Envoy's readiness probe will be available.")
 	flag.IntVar(&readyBindPort, "envoy-ready-bind-port", 0, "The port on which Envoy's readiness probe will be available.")
 
-	flag.StringVar(&xdsBindAddr, "xds-bind-addr", "127.0.0.1", "The address on which the envoy xDS server will be available.")
-	flag.IntVar(&xdsBindPort, "xds-bind-port", 0, "The port on which the envoy xDS server will be available.")
+	flag.StringVar(&xdsBindAddr, "xds-bind-addr", "127.0.0.1", "The address on which the Envoy xDS server will be available.")
+	flag.IntVar(&xdsBindPort, "xds-bind-port", 0, "The port on which the Envoy xDS server will be available.")
 }
 
 // validateFlags performs semantic validation of the flag values

pkg/consuldp/config.go

@@ -76,7 +76,7 @@ type EnvoyConfig struct {
 	ReadyBindPort int
 }
 
-//
+// XDSServer contains the configuration of the xDS server.
 type XDSServer struct {
 	// BindAddress is the address on which the Envoy xDS server will be available.
 	BindAddress string

pkg/consuldp/xds.go

@@ -34,7 +34,7 @@ func (cdp *ConsulDataplane) director(ctx context.Context, fullMethodName string)
 		mdCopy = md.Copy()
 	}
 	// TODO (NET-148): Inject the ACL token acquired from the server discovery library
-	mdCopy[metadataKeyToken] = []string{cdp.cfg.Consul.Credentials.Static.Token}
+	mdCopy.Set(metadataKeyToken, cdp.cfg.Consul.Credentials.Static.Token)
 	outCtx := metadata.NewOutgoingContext(ctx, mdCopy)
 	return outCtx, cdp.consulServer.grpcClientConn, nil
 }