diff --git a/cluster/images/etcd/migrate/integration_test.go b/cluster/images/etcd/migrate/integration_test.go index 34edbfaafad..ff3b2959e7f 100644 --- a/cluster/images/etcd/migrate/integration_test.go +++ b/cluster/images/etcd/migrate/integration_test.go @@ -42,7 +42,7 @@ import ( ) var ( - testSupportedVersions = MustParseSupportedVersions([]string{"3.0.17", "3.1.12"}) + testSupportedVersions = mustParseSupportedVersions([]string{"3.0.17", "3.1.12"}) testVersionPrevious = &EtcdVersion{semver.MustParse("3.0.17")} testVersionLatest = &EtcdVersion{semver.MustParse("3.1.12")} ) @@ -79,8 +79,8 @@ func TestMigrate(t *testing.T) { for _, m := range migrations { t.Run(m.title, func(t *testing.T) { - start := MustParseEtcdVersionPair(m.startVersion) - end := MustParseEtcdVersionPair(m.endVersion) + start := mustParseEtcdVersionPair(m.startVersion) + end := mustParseEtcdVersionPair(m.endVersion) testCfgs := clusterConfig(t, m.title, m.memberCount, m.protocol, m.clientListenUrls) @@ -363,3 +363,22 @@ func generateSelfSignedCertKey(host string, alternateIPs []net.IP, alternateDNS return certBuffer.Bytes(), keyBuffer.Bytes(), nil } + +// mustParseEtcdVersionPair parses a "/" string to an EtcdVersionPair +// or panics if the parse fails. +func mustParseEtcdVersionPair(s string) *EtcdVersionPair { + pair, err := ParseEtcdVersionPair(s) + if err != nil { + panic(err) + } + return pair +} + +// mustParseSupportedVersions parses a comma separated list of etcd versions or panics if the parse fails. +func mustParseSupportedVersions(list []string) SupportedVersions { + versions, err := ParseSupportedVersions(list) + if err != nil { + panic(err) + } + return versions +} diff --git a/cluster/images/etcd/migrate/versions.go b/cluster/images/etcd/migrate/versions.go index ea1d8d7bf27..de2b8318851 100644 --- a/cluster/images/etcd/migrate/versions.go +++ b/cluster/images/etcd/migrate/versions.go @@ -124,17 +124,6 @@ func ParseEtcdVersionPair(s string) (*EtcdVersionPair, error) { return &EtcdVersionPair{version, storageVersion}, nil } -// MustParseEtcdVersionPair parses a "/" string to an EtcdVersionPair -// or panics if the parse fails. -//lint:ignore U1000 Keep unused but exported MustParseEtcdVersionPair until deprecated package is being removed -func MustParseEtcdVersionPair(s string) *EtcdVersionPair { - pair, err := ParseEtcdVersionPair(s) - if err != nil { - panic(err) - } - return pair -} - // String returns "/" string of the EtcdVersionPair. func (vp *EtcdVersionPair) String() string { return fmt.Sprintf("%s/%s", vp.version, vp.storageVersion) @@ -187,13 +176,3 @@ func ParseSupportedVersions(list []string) (SupportedVersions, error) { } return versions, nil } - -// MustParseSupportedVersions parses a comma separated list of etcd versions or panics if the parse fails. -//lint:ignore U1000 Keep unused but exported MustParseSupportedVersions until deprecated package is being removed -func MustParseSupportedVersions(list []string) SupportedVersions { - versions, err := ParseSupportedVersions(list) - if err != nil { - panic(err) - } - return versions -}