@@ -86,20 +86,23 @@ func NewRunner(config RunnerConfig, feature *PreparedFeature) (*Runner, error) {
8686 }()
8787
8888 // Create client
89+ var err error
90+ tlsCfg , err := LoadTLSConfig (r .ClientCertPath , r .ClientKeyPath )
91+ if err != nil {
92+ return nil , err
93+ }
94+
8995 r .Feature .ClientOptions .HostPort = r .ServerHostPort
9096 if r .Feature .ClientUsesProxy {
9197 r .Feature .ClientOptions .HostPort = r .ProxyListenHostPort
98+ } else {
99+ // Don't use TLS for the proxy connection
100+ r .Feature .ClientOptions .ConnectionOptions .TLS = tlsCfg
92101 }
93102 r .Feature .ClientOptions .Namespace = r .Namespace
94103 if r .Feature .ClientOptions .Logger == nil {
95104 r .Feature .ClientOptions .Logger = r .Log
96105 }
97- var err error
98- tlsCfg , err := LoadTLSConfig (r .ClientCertPath , r .ClientKeyPath )
99- if err != nil {
100- return nil , err
101- }
102- r .Feature .ClientOptions .ConnectionOptions .TLS = tlsCfg
103106
104107 if r .Feature .BeforeDial != nil {
105108 if err = r .Feature .BeforeDial (r ); err != nil {
@@ -113,6 +116,7 @@ func NewRunner(config RunnerConfig, feature *PreparedFeature) (*Runner, error) {
113116
114117 savedValue := r .Feature .ClientOptions .HostPort
115118 r .Feature .ClientOptions .HostPort = r .ServerHostPort
119+ r .Feature .ClientOptions .ConnectionOptions .TLS = tlsCfg
116120 if r .DirectClient , err = client .Dial (r .Feature .ClientOptions ); err != nil {
117121 return nil , fmt .Errorf ("failed creating client: %w" , err )
118122 }
0 commit comments