Minor refactoring of properties and vars

Signed-off-by: rjs211 <srivatsa211@gmail.com>

cmd/query/app/flags.go

@@ -48,13 +48,13 @@ const (
 	queryMaxClockSkewAdjust = "query.max-clock-skew-adjustment"
 )
 
-var tlsGrpcFlagsConfig = tlscfg.ServerFlagsConfig{
+var tlsGRPCFlagsConfig = tlscfg.ServerFlagsConfig{
 	Prefix:       "query.grpc",
 	ShowEnabled:  true,
 	ShowClientCA: true,
 }
 
-var tlsHttpFlagsConfig = tlscfg.ServerFlagsConfig{
+var tlsHTTPFlagsConfig = tlscfg.ServerFlagsConfig{
 	Prefix:       "query.http",
 	ShowEnabled:  true,
 	ShowClientCA: true,
@@ -73,9 +73,9 @@ type QueryOptions struct {
 	// BearerTokenPropagation activate/deactivate bearer token propagation to storage
 	BearerTokenPropagation bool
 	// TLS configures secure transport (Consumer to Query service gRPC APO)
-	TLSGrpc tlscfg.Options
+	TLSGRPC tlscfg.Options
 	// TLS configures secure transport (Consumer to Query service HTTP API)
-	TLSHttp tlscfg.Options
+	TLSHTTP tlscfg.Options
 	// AdditionalHeaders
 	AdditionalHeaders http.Header
 	// MaxClockSkewAdjust is the maximum duration by which jaeger-query will adjust a span
@@ -101,8 +101,8 @@ func (qOpts *QueryOptions) InitFromViper(v *viper.Viper, logger *zap.Logger) *Qu
 	qOpts.StaticAssets = v.GetString(queryStaticFiles)
 	qOpts.UIConfig = v.GetString(queryUIConfig)
 	qOpts.BearerTokenPropagation = v.GetBool(queryTokenPropagation)
-	qOpts.TLSGrpc = tlsGrpcFlagsConfig.InitFromViper(v)
-	qOpts.TLSGrpc = tlsHttpFlagsConfig.InitFromViper(v)
+	qOpts.TLSGRPC = tlsGRPCFlagsConfig.InitFromViper(v)
+	qOpts.TLSHTTP = tlsHTTPFlagsConfig.InitFromViper(v)
 	qOpts.MaxClockSkewAdjust = v.GetDuration(queryMaxClockSkewAdjust)
 
 	stringSlice := v.GetStringSlice(queryAdditionalHeaders)

cmd/query/app/server.go

@@ -79,8 +79,8 @@ func (s Server) HealthCheckStatus() chan healthcheck.Status {
 func createGRPCServer(querySvc *querysvc.QueryService, options *QueryOptions, logger *zap.Logger, tracer opentracing.Tracer) (*grpc.Server, error) {
 	var grpcOpts []grpc.ServerOption
 
-	if options.TLSGrpc.Enabled {
-		tlsCfg, err := options.TLSGrpc.Config()
+	if options.TLSGRPC.Enabled {
+		tlsCfg, err := options.TLSGRPC.Config()
 		if err != nil {
 			return nil, err
 		}
@@ -102,8 +102,8 @@ func createHTTPServer(querySvc *querysvc.QueryService, queryOpts *QueryOptions,
 		HandlerOptions.Tracer(tracer),
 	}
 
-	if queryOpts.TLSHttp.Enabled {
-		_, err := queryOpts.TLSHttp.Config() // This checks if the certificates are correctly provided
+	if queryOpts.TLSHTTP.Enabled {
+		_, err := queryOpts.TLSHTTP.Config() // This checks if the certificates are correctly provided
 		if err != nil {
 			return nil, err
 		}
@@ -161,8 +161,8 @@ func (s *Server) Start() error {
 	go func() {
 		s.logger.Info("Starting HTTP server", zap.Int("port", tcpPort), zap.String("addr", s.queryOptions.HostPort))
 		var err error
-		if s.queryOptions.TLSHttp.Enabled {
-			err = s.httpServer.ServeTLS(httpListener, filepath.Clean(s.queryOptions.TLSHttp.CertPath), filepath.Clean(s.queryOptions.TLSHttp.KeyPath))
+		if s.queryOptions.TLSHTTP.Enabled {
+			err = s.httpServer.ServeTLS(httpListener, filepath.Clean(s.queryOptions.TLSHTTP.CertPath), filepath.Clean(s.queryOptions.TLSHTTP.KeyPath))
 
 		} else {
 			err = s.httpServer.Serve(httpListener)

cmd/query/app/server_test.go

@@ -53,7 +53,7 @@ func TestCreateTLSGrpcServerError(t *testing.T) {
 	}
 
 	_, err := NewServer(zap.NewNop(), &querysvc.QueryService{},
-		&QueryOptions{TLSGrpc: tlsCfg}, opentracing.NoopTracer{})
+		&QueryOptions{TLSGRPC: tlsCfg}, opentracing.NoopTracer{})
 	assert.NotNil(t, err)
 }
 
@@ -66,7 +66,7 @@ func TestCreateTLSHttpServerError(t *testing.T) {
 	}
 
 	_, err := NewServer(zap.NewNop(), &querysvc.QueryService{},
-		&QueryOptions{TLSHttp: tlsCfg}, opentracing.NoopTracer{})
+		&QueryOptions{TLSHTTP: tlsCfg}, opentracing.NoopTracer{})
 	assert.NotNil(t, err)
 }