fixing HSM integration test issues

Author: eriktate

lib/service/service.go

@@ -2067,19 +2067,19 @@ func (process *TeleportProcess) initAuthService() error {
 		ClusterName: clusterName,
 	})
 
-	if cfg.ClusterConfiguration == nil {
-		clusterConfig, err := local.NewClusterConfigurationService(b)
+	clusterConfig := cfg.ClusterConfiguration
+	if clusterConfig == nil {
+		clusterConfig, err = local.NewClusterConfigurationService(b)
 		if err != nil {
 			return trace.Wrap(err)
 		}
-		cfg.ClusterConfiguration = clusterConfig
 	}
 
 	// create keystore
 	keystoreOpts := &keystore.Options{
 		HostUUID:             cfg.HostUUID,
 		ClusterName:          cn,
-		AuthPreferenceGetter: cfg.ClusterConfiguration,
+		AuthPreferenceGetter: clusterConfig,
 		FIPS:                 cfg.FIPS,
 	}
 
@@ -2112,17 +2112,24 @@ func (process *TeleportProcess) initAuthService() error {
 		Backend:  localRecordingEncryption,
 		KeyStore: keyStore,
 		Logger:   logger,
+		LockConfig: backend.RunWhileLockedConfig{
+			LockConfiguration: backend.LockConfiguration{
+				Backend:            process.backend,
+				TTL:                time.Second * 30,
+				LockNameComponents: []string{"recording_encryption"},
+			},
+		},
 	})
 	if err != nil {
 		return trace.Wrap(err)
 	}
 
-	cfg.ClusterConfiguration = recordingencryption.NewClusterConfigService(cfg.ClusterConfiguration, recordingEncryptionManager)
+	clusterConfig = recordingencryption.NewClusterConfigService(clusterConfig, recordingEncryptionManager)
 	var emitter apievents.Emitter
 	var streamer events.Streamer
 	var uploadHandler events.MultipartHandler
 	var externalAuditStorage *externalauditstorage.Configurator
-	encryptedIO := recordingencryption.NewEncryptedIO(cfg.ClusterConfiguration, recordingEncryptionManager)
+	encryptedIO := recordingencryption.NewEncryptedIO(clusterConfig, recordingEncryptionManager)
 
 	// create the audit log, which will be consuming (and recording) all events
 	// and recording all sessions.
@@ -2229,9 +2236,6 @@ func (process *TeleportProcess) initAuthService() error {
 
 		traceClt = clt
 	}
-	if err != nil {
-		return trace.Wrap(err)
-	}
 
 	// Environment variable for disabling the check major version upgrade check and overrides
 	// latest known version in backend.
@@ -2245,7 +2249,7 @@ func (process *TeleportProcess) initAuthService() error {
 			VersionStorage:          process.storage,
 			SkipVersionCheck:        cfg.SkipVersionCheck || skipVersionCheckFromEnv,
 			Authority:               cfg.Keygen,
-			ClusterConfiguration:    cfg.ClusterConfiguration,
+			ClusterConfiguration:    clusterConfig,
 			AutoUpdateService:       cfg.AutoUpdateService,
 			ClusterAuditConfig:      cfg.Auth.AuditConfig,
 			ClusterNetworkingConfig: cfg.Auth.NetworkingConfig,