1
1
package db_test
2
2
3
3
import (
4
- "crypto/tls"
5
4
"crypto/x509"
6
5
"encoding/pem"
7
6
"errors"
@@ -15,8 +14,7 @@ import (
15
14
)
16
15
17
16
const (
18
-
19
- DATABASE_CLIENT_CERT = `-----BEGIN CERTIFICATE-----
17
+ DATABASE_CLIENT_CERT = `-----BEGIN CERTIFICATE-----
20
18
MIIEOTCCAiECFFQB88eMvRFzig5vh+MJyi0LpnODMA0GCSqGSIb3DQEBCwUAMFcx
21
19
CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
22
20
cm5ldCBXaWRnaXRzIFB0eSBMdGQxEDAOBgNVBAMMB215c3FsQ0EwHhcNMjAwNzIx
@@ -42,7 +40,6 @@ Gim3GXnxjUDAUZOd88665Y2iirAmG1TcMDek0lBu7/ysuxjBK+Ef3BQ0YONQvzmn
42
40
mSvPMfv+Qs4rTUvQi9ISXSWS9WDxye35Y/H5Zas=
43
41
-----END CERTIFICATE-----`
44
42
45
-
46
43
DATABASE_CLIENT_KEY = `-----BEGIN RSA PRIVATE KEY-----
47
44
MIIEpAIBAAKCAQEAoCDk9QQsut5x0te6zRc9UmJ5lT4qMk26SrQ+hGUyVYj4dP4h
48
45
tzsgwqoPRdDGNeunU+lDCdGWe0IpbnU5Lh2kEQaNF4E0+vNKF+AvUBw5Bcm1+FDX
@@ -169,10 +166,8 @@ var _ = Describe("MySQLConnectionStringBuilder", func() {
169
166
Expect (mySQLAdapter .RegisterTLSConfigCallCount ()).To (Equal (1 ))
170
167
passedTLSConfigName , passedTLSConfig := mySQLAdapter .RegisterTLSConfigArgsForCall (0 )
171
168
Expect (passedTLSConfigName ).To (Equal ("some-database-tls" ))
172
- Expect (passedTLSConfig ).To (Equal (& tls.Config {
173
- InsecureSkipVerify : false ,
174
- RootCAs : caCertPool ,
175
- }))
169
+ Expect (passedTLSConfig .InsecureSkipVerify ).To (Equal (false ))
170
+ Expect (passedTLSConfig .RootCAs .Subjects ()).To (Equal (caCertPool .Subjects ()))
176
171
})
177
172
178
173
Context ("when SkipHostnameValidation is true" , func () {
@@ -189,7 +184,7 @@ var _ = Describe("MySQLConnectionStringBuilder", func() {
189
184
passedTLSConfigName , passedTLSConfig := mySQLAdapter .RegisterTLSConfigArgsForCall (0 )
190
185
Expect (passedTLSConfigName ).To (Equal ("some-database-tls" ))
191
186
Expect (passedTLSConfig .InsecureSkipVerify ).To (BeTrue ())
192
- Expect (passedTLSConfig .RootCAs ) .To (Equal (caCertPool ))
187
+ Expect (passedTLSConfig .RootCAs . Subjects ()) .To (Equal (caCertPool . Subjects () ))
193
188
Expect (passedTLSConfig .Certificates ).To (BeNil ())
194
189
// impossible to assert VerifyPeerCertificate is set to a specfic function
195
190
Expect (passedTLSConfig .VerifyPeerCertificate ).NotTo (BeNil ())
0 commit comments