Add server option for overriding default TLS config provider (#830)

* Add server option for overriding default TLS config provider Co-authored-by: Alex Shtin <alex@shtin.com>
temporalio · Oct 12, 2020 · 9c8813b · 9c8813b
1 parent 505f876
commit 9c8813b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/temporal/server.go b/temporal/server.go
@@ -112,9 +112,14 @@ func (s *Server) Start() error {
 		return err
 	}
 
-	tlsFactory, err := encryption.NewTLSConfigProviderFromConfig(s.so.config.Global.TLS)
-	if err != nil {
-		return fmt.Errorf("TLS provider initialization error : %w", err)
+	var tlsFactory encryption.TLSConfigProvider
+	if s.so.tlsConfigProvider != nil {
+		tlsFactory = s.so.tlsConfigProvider
+	} else {
+		tlsFactory, err = encryption.NewTLSConfigProviderFromConfig(s.so.config.Global.TLS)
+		if err != nil {
+			return fmt.Errorf("TLS provider initialization error: %w", err)
+		}
 	}
 
 	dynamicConfig, err := dynamicconfig.NewFileBasedClient(&s.so.config.DynamicConfigClient, s.logger, s.stoppedCh)

diff --git a/temporal/server_option.go b/temporal/server_option.go
@@ -26,6 +26,7 @@ package temporal
 
 import (
 	"go.temporal.io/server/common/authorization"
+	"go.temporal.io/server/common/rpc/encryption"
 	"go.temporal.io/server/common/service/config"
 )
 
@@ -67,3 +68,10 @@ func WithAuthorizer(authorizer authorization.Authorizer) ServerOption {
 		s.authorizer = authorizer
 	})
 }
+
+// Overrides default provider of TLS configuration
+func WithTLSConfigFactory(tlsConfigProvider encryption.TLSConfigProvider) ServerOption {
+	return newApplyFuncContainer(func(s *serverOptions) {
+		s.tlsConfigProvider = tlsConfigProvider
+	})
+}
diff --git a/temporal/server_options.go b/temporal/server_options.go
@@ -28,16 +28,18 @@ import (
 	"fmt"
 
 	"go.temporal.io/server/common/authorization"
+	"go.temporal.io/server/common/rpc/encryption"
 	"go.temporal.io/server/common/service/config"
 )
 
 type (
 	serverOptions struct {
-		config     *config.Config
-		authorizer authorization.Authorizer
-		configDir  string
-		env        string
-		zone       string
+		config            *config.Config
+		authorizer        authorization.Authorizer
+		tlsConfigProvider encryption.TLSConfigProvider
+		configDir         string
+		env               string
+		zone              string
 
 		serviceNames []string