github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tlsutil: update to renamed ParseTLSVersion and goTLSVersions

pull/11647/head
Mike Morris 2021-11-23 15:50:26 -05:00
parent 9f59d1bdf3
commit 2bfb10e978
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tlsutil/config_test.go
View File

@ -720,14 +720,14 @@ func TestConfigurator_CommonTLSConfigCAs(t *testing.T) {
func TestConfigurator_CommonTLSConfigTLSMinVersion(t *testing.T) { func TestConfigurator_CommonTLSConfigTLSMinVersion(t *testing.T) {
c, err := NewConfigurator(Config{TLSMinVersion: ""}, nil) c, err := NewConfigurator(Config{TLSMinVersion: ""}, nil)
require.NoError(t, err) require.NoError(t, err)
tlsVersion, _ := tlsLookup("TLSv1_0") tlsVersion, _ := ParseTLSVersion("TLSv1_0")
require.Equal(t, c.commonTLSConfig(false).MinVersion, GoTLSVersions[tlsVersion]) require.Equal(t, c.commonTLSConfig(false).MinVersion, goTLSVersions[tlsVersion])
for _, version := range tlsVersions() { for _, version := range tlsVersions() {
require.NoError(t, c.Update(Config{TLSMinVersion: version})) require.NoError(t, c.Update(Config{TLSMinVersion: version}))
tlsVersion, _ := tlsLookup(version) tlsVersion, _ := ParseTLSVersion(version)
require.Equal(t, c.commonTLSConfig(false).MinVersion, require.Equal(t, c.commonTLSConfig(false).MinVersion,
GoTLSVersions[tlsVersion]) goTLSVersions[tlsVersion])
} }
// NOTE: checks for deprecated TLS version string warnings, // NOTE: checks for deprecated TLS version string warnings,
@ -735,9 +735,9 @@ func TestConfigurator_CommonTLSConfigTLSMinVersion(t *testing.T) {
for version := range types.DeprecatedAgentTLSVersions { for version := range types.DeprecatedAgentTLSVersions {
// TODO: check for warning log message? how? // TODO: check for warning log message? how?
require.NoError(t, c.Update(Config{TLSMinVersion: version})) require.NoError(t, c.Update(Config{TLSMinVersion: version}))
tlsVersion, _ := tlsLookup(version) tlsVersion, _ := ParseTLSVersion(version)
require.Equal(t, c.commonTLSConfig(false).MinVersion, require.Equal(t, c.commonTLSConfig(false).MinVersion,
GoTLSVersions[tlsVersion]) goTLSVersions[tlsVersion])
} }
require.Error(t, c.Update(Config{TLSMinVersion: "tlsBOGUS"})) require.Error(t, c.Update(Config{TLSMinVersion: "tlsBOGUS"}))