From eeea18b16e35e9d5c3f4f5971a2698d822a027dd Mon Sep 17 00:00:00 2001 From: Sasha Melentyev Date: Tue, 10 Oct 2023 05:42:53 +0300 Subject: [PATCH] chore(client/daemon): cleanup, and add noTLSConfig (#2783) chore(client/daemon): cleanup, and add noTLSConfig instead nil for better readable Signed-off-by: Sasha Melentyev --- client/daemon/daemon.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/client/daemon/daemon.go b/client/daemon/daemon.go index 8b659c6b0..3dc7acf98 100644 --- a/client/daemon/daemon.go +++ b/client/daemon/daemon.go @@ -120,7 +120,7 @@ func New(opt *config.DaemonOption, d dfpath.Dfpath) (Daemon, error) { tmpOpt := config.NewDaemonConfig() err := tmpOpt.Load(viper.ConfigFileUsed()) if err != nil { - return nil, fmt.Errorf("read config error: %s", err) + return nil, fmt.Errorf("read config error: %w", err) } err = source.InitSourceClients(tmpOpt.Download.ResourceClients) @@ -400,15 +400,17 @@ func loadLegacyGPRCTLSCredentials(opt config.SecurityOption, certifyClient *cert return loadGPRCTLSCredentialsWithOptions(opt.TLSConfig, security, options...) } +var noTLSConfig *tls.Config = nil + func loadGlobalGPRCTLSCredentials(certifyClient *certify.Certify, security config.GlobalSecurityOption) (credentials.TransportCredentials, error) { - return loadGPRCTLSCredentialsWithOptions(nil, security, func(c *tls.Config) { + return loadGPRCTLSCredentialsWithOptions(noTLSConfig, security, func(c *tls.Config) { c.GetCertificate = config.GetCertificate(certifyClient) c.GetClientCertificate = certifyClient.GetClientCertificate }) } func loadManagerGPRCTLSCredentials(security config.GlobalSecurityOption) (credentials.TransportCredentials, error) { - return loadGPRCTLSCredentialsWithOptions(nil, security, func(c *tls.Config) { + return loadGPRCTLSCredentialsWithOptions(noTLSConfig, security, func(c *tls.Config) { c.ClientAuth = tls.NoClientCert }) } @@ -418,11 +420,11 @@ func loadGPRCTLSCredentialsWithOptions(baseConfig *tls.Config, security config.G certPool := x509.NewCertPool() if security.CACert == "" { - return nil, fmt.Errorf("empty glocal CA's certificate") + return nil, errors.New("empty global CA's certificate") } if !certPool.AppendCertsFromPEM([]byte(security.CACert)) { - return nil, fmt.Errorf("failed to add global CA's certificate") + return nil, errors.New("failed to add global CA's certificate") } var tlsConfig *tls.Config