luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

tlsutil: remove unused method 

Method was only used in tests, and an equivalent function alraedy exists.
This commit is contained in:
Daniel Nephin 2021-06-21 11:51:05 -04:00
parent f2a904db00
commit 212b8a7b3c
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tlsutil/config.go
View File

@ -139,11 +139,6 @@ func tlsVersions() []string {
return versions
}
// KeyPair is used to open and parse a certificate and key file
func (c *Config) KeyPair() (*tls.Certificate, error) {
return loadKeyPair(c.CertFile, c.KeyFile)
}
// SpecificDC is used to invoke a static datacenter
// and turns a DCWrapper into a Wrapper type.
func SpecificDC(dc string, tlsWrap DCWrapper) Wrapper {

24
tlsutil/config_test.go
View File

@ -405,7 +405,7 @@ func TestConfig_ParseCiphers(t *testing.T) {
require.Equal(t, []uint16{}, v)
}
func TestConfigurator_loadKeyPair(t *testing.T) {
func TestLoadKeyPair(t *testing.T) {
type variant struct {
cert, key string
shoulderr bool
@ -422,24 +422,20 @@ func TestConfigurator_loadKeyPair(t *testing.T) {
false, false},
}
for i, v := range variants {
info := fmt.Sprintf("case %d", i)
cert1, err1 := loadKeyPair(v.cert, v.key)
config := &Config{CertFile: v.cert, KeyFile: v.key}
cert2, err2 := config.KeyPair()
t.Run(fmt.Sprintf("case %d", i), func(t *testing.T) {
cert, err := loadKeyPair(v.cert, v.key)
if v.shoulderr {
require.Error(t, err1, info)
require.Error(t, err2, info)
require.Error(t, err)
} else {
require.NoError(t, err1, info)
require.NoError(t, err2, info)
require.NoError(t, err)
}
if v.isnil {
require.Nil(t, cert1, info)
require.Nil(t, cert2, info)
require.Nil(t, cert)
} else {
require.NotNil(t, cert1, info)
require.NotNil(t, cert2, info)
require.NotNil(t, cert)
}
})
}
}
@ -518,7 +514,7 @@ func TestConfigurator_ErrorPropagation(t *testing.T) {
var err3 error
if !v.excludeCheck {
cert, err := v.config.KeyPair()
cert, err := loadKeyPair(v.config.CertFile, v.config.KeyFile)
require.NoError(t, err, info)
pems, err := LoadCAs(v.config.CAFile, v.config.CAPath)
require.NoError(t, err, info)