Merge remote-tracking branch 'origin/master'

ThreeDotsLabs · Jan 29, 2022 · 33af2a4 · 33af2a4
2 parents 59b07dd + 766b61c
commit 33af2a4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/trainings/handlers.go b/trainings/handlers.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"runtime"
 
 	"github.com/ThreeDotsLabs/cli/internal"
 	"github.com/pkg/errors"
@@ -47,9 +48,12 @@ func (h *Handlers) newGrpcClientWithAddr(ctx context.Context, addr string, insec
 			opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{InsecureSkipVerify: true})))
 		} else {
 			systemRoots, err := x509.SystemCertPool()
-			if err != nil {
+			if err != nil && runtime.GOOS != "windows" {
 				panic(errors.Wrap(err, "cannot load root CA cert"))
 			}
+			if systemRoots == nil {
+				systemRoots = x509.NewCertPool()
+			}
 			creds := credentials.NewTLS(&tls.Config{
 				RootCAs:    systemRoots,
 				MinVersion: tls.VersionTLS12,