Merge branch 'cherry-pick-a1afa563' into 'release/0.24'

Merge branch 'hotfix/PRXS-2425-CLIConnection' into 'master'

See merge request perxis/perxis-go!229

pkg/auth/grpc.go

@@ -131,6 +131,15 @@ func WithOAuth2Credentials(ctx context.Context, tokenURL, clientID, clientSecret
 
 // WithTLSCredentials возвращает опции для создания grpc-соединения с TLS-сертификатами
 func WithTLSCredentials(ctx context.Context, cert, cacert, key []byte) (grpc.DialOption, error) {
+	creds, err := TLSCredentials(ctx, cert, cacert, key)
+	if err != nil {
+		return nil, err
+	}
+	return grpc.WithTransportCredentials(creds), nil
+}
+
+// TLSCredentials возвращает TransportCredentials для создания grpc-соединения с TLS-сертификатами
+func TLSCredentials(ctx context.Context, cert, cacert, key []byte) (credentials.TransportCredentials, error) {
 	certPool := x509.NewCertPool()
 	if !certPool.AppendCertsFromPEM(cacert) {
 		return nil, errors.New("CA certificate not loaded")
@@ -139,5 +148,5 @@ func WithTLSCredentials(ctx context.Context, cert, cacert, key []byte) (grpc.Dia
 	if err != nil {
 		return nil, err
 	}
-	return grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{Certificates: []tls.Certificate{clientCert}, RootCAs: certPool})), nil
+	return credentials.NewTLS(&tls.Config{Certificates: []tls.Certificate{clientCert}, RootCAs: certPool}), nil
 }