[baseserver] Incorporate review feedback

Author: csweichel

components/common-go/baseserver/config.go

@@ -27,7 +27,7 @@ func (s *ServerConfiguration) GetAddress() string {
 }
 
 type TLSConfiguration struct {
-	CA   string `json:"ca" yaml:"ca"`
-	Cert string `json:"cert" yaml:"cert"`
-	Key  string `json:"key" yaml:"key"`
+	CAPath   string `json:"caPath" yaml:"caPath"`
+	CertPath string `json:"certPath" yaml:"certPath"`
+	KeyPath  string `json:"keyPath" yaml:"keyPath"`
 }

components/common-go/baseserver/options.go

@@ -24,8 +24,7 @@ type options struct {
 	// closeTimeout is the amount we allow for the server to shut down cleanly
 	closeTimeout time.Duration
 
-	noBuiltinServices bool
-	underTest         bool
+	underTest bool
 
 	// metricsRegistry configures the metrics registry to use for exporting metrics. When not set, the default prometheus registry is used.
 	metricsRegistry *prometheus.Registry
@@ -62,13 +61,6 @@ func WithConfig(config *Configuration) Option {
 	}
 }
 
-func WithoutBuiltinServices() Option {
-	return func(opts *options) error {
-		opts.noBuiltinServices = true
-		return nil
-	}
-}
-
 func WithUnderTest() Option {
 	return func(opts *options) error {
 		opts.underTest = true

components/common-go/baseserver/server.go

@@ -93,7 +93,7 @@ func serveHTTP(cfg *ServerConfiguration, srv *http.Server, l net.Listener) (err
 	if cfg.TLS == nil {
 		err = srv.Serve(l)
 	} else {
-		err = srv.ServeTLS(l, cfg.TLS.Cert, cfg.TLS.Key)
+		err = srv.ServeTLS(l, cfg.TLS.CertPath, cfg.TLS.KeyPath)
 	}
 	return
 }
@@ -272,7 +272,7 @@ func (s *Server) initializeGRPC() error {
 	opts := common_grpc.ServerOptionsWithInterceptors(stream, unary)
 	if cfg := s.options.config.Services.GRPC; cfg != nil && cfg.TLS != nil {
 		tlsConfig, err := common_grpc.ClientAuthTLSConfig(
-			cfg.TLS.CA, cfg.TLS.Cert, cfg.TLS.Key,
+			cfg.TLS.CAPath, cfg.TLS.CertPath, cfg.TLS.KeyPath,
 			common_grpc.WithSetClientCAs(true),
 			common_grpc.WithServerName(s.Name),
 		)