From 60862f3896c81705518d16b06a4c4e61f4ff4802 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Tue, 3 Nov 2020 12:24:41 -0600 Subject: [PATCH 1/3] Fix version warning parse logic --- internal/version/version.go | 2 +- internal/version/version_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/version/version.go b/internal/version/version.go index 00effefa..88b0626c 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -13,6 +13,6 @@ func VersionsMatch(apiVersion string) bool { if len(withoutPatchRelease) < 3 { return false } - majorMinor := strings.Join(withoutPatchRelease[:len(withoutPatchRelease)-1], ".") + majorMinor := strings.Join(withoutPatchRelease[:2], ".") return strings.HasPrefix(strings.TrimPrefix(apiVersion, "v"), strings.TrimPrefix(majorMinor, "v")) } diff --git a/internal/version/version_test.go b/internal/version/version_test.go index 9791717e..c1f87797 100644 --- a/internal/version/version_test.go +++ b/internal/version/version_test.go @@ -26,4 +26,8 @@ func TestVersion(t *testing.T) { Version = "1.15.4" match = VersionsMatch("v2.15.2") assert.True(t, "versions do not match", !match) + + Version="1.12.2+cli.rc1" + match = VersionsMatch("v1.12.2") + assert.True(t, "versions do match", match) } From 8928d8107083d75a829d63cfbdb11882dec1ef95 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Tue, 3 Nov 2020 12:26:13 -0600 Subject: [PATCH 2/3] fixup! Fix version warning parse logic --- internal/version/version_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/version/version_test.go b/internal/version/version_test.go index c1f87797..cb6529df 100644 --- a/internal/version/version_test.go +++ b/internal/version/version_test.go @@ -28,6 +28,6 @@ func TestVersion(t *testing.T) { assert.True(t, "versions do not match", !match) Version="1.12.2+cli.rc1" - match = VersionsMatch("v1.12.2") + match = VersionsMatch("v1.12.9") assert.True(t, "versions do match", match) } From 80a95f6cc4aa563d05719d82377a27cd34225461 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Tue, 3 Nov 2020 12:28:04 -0600 Subject: [PATCH 3/3] fixup! Fix version warning parse logic --- internal/version/version_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/version/version_test.go b/internal/version/version_test.go index cb6529df..e51b64dd 100644 --- a/internal/version/version_test.go +++ b/internal/version/version_test.go @@ -27,7 +27,7 @@ func TestVersion(t *testing.T) { match = VersionsMatch("v2.15.2") assert.True(t, "versions do not match", !match) - Version="1.12.2+cli.rc1" + Version = "1.12.2+cli.rc1" match = VersionsMatch("v1.12.9") assert.True(t, "versions do match", match) } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy