Skip to content

fix: fix bug with trailing version info not being properly stripped #14963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 3, 2024
Merged

fix: fix bug with trailing version info not being properly stripped #14963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41064c2
fix bug with trailing version info not being properly stripped
bcpeinhardt Oct 3, 2024
d796aa8
revise test structure
bcpeinhardt Oct 3, 2024
c5080e5
add back the icons I somehow deleted
bcpeinhardt Oct 3, 2024
5ebb410
new test case
bcpeinhardt Oct 3, 2024
5919ef9
make helper private and pull into own test file
bcpeinhardt Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
make helper private and pull into own test file
  • Loading branch information
@bcpeinhardt
bcpeinhardt committed Oct 3, 2024
commit 5919ef9f99c3584a42a914d8d404d8451b3e3b58
4 changes: 2 additions & 2 deletions codersdk/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,12 +804,12 @@ func DefaultSupportLinks(docsURL string) []LinkConfig {
}
}

func RemoveTrailingVersionInfo(v string) string {
func removeTrailingVersionInfo(v string) string {
return strings.Split(strings.Split(v, "-")[0], "+")[0]
}

func DefaultDocsURL() string {
version := RemoveTrailingVersionInfo(buildinfo.Version())
version := removeTrailingVersionInfo(buildinfo.Version())
if version == "v0.0.0" {
return "https://coder.com/docs"
}
Expand Down
36 changes: 36 additions & 0 deletions codersdk/deployment_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package codersdk

import (
"testing"

"github.com/stretchr/testify/require"
)

func TestRemoveTrailingVersionInfo(t *testing.T) {
t.Parallel()

testCases := []struct {
Version string
ExpectedAfterStrippingInfo string
}{
{
Version: "v2.16.0+683a720",
ExpectedAfterStrippingInfo: "v2.16.0",
},
{
Version: "v2.16.0-devel+683a720",
ExpectedAfterStrippingInfo: "v2.16.0",
},
{
Version: "v2.16.0+683a720-devel",
ExpectedAfterStrippingInfo: "v2.16.0",
},
}

for _, tc := range testCases {
tc := tc

stripped := removeTrailingVersionInfo(tc.Version)
require.Equal(t, tc.ExpectedAfterStrippingInfo, stripped)
}
}
30 changes: 0 additions & 30 deletions codersdk/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,33 +565,3 @@ func TestPremiumSuperSet(t *testing.T) {
require.NotContains(t, enterprise.Features(), "", "enterprise should not contain empty string")
require.NotContains(t, premium.Features(), "", "premium should not contain empty string")
}

func TestRemoveTrailingVersionInfo(t *testing.T) {
t.Parallel()

testCases := []struct {
Version string
ExpectedAfterStrippingInfo string
}{
{
Version: "v2.16.0+683a720",
ExpectedAfterStrippingInfo: "v2.16.0",
},
{
Version: "v2.16.0-devel+683a720",
ExpectedAfterStrippingInfo: "v2.16.0",
},
{
Version: "v2.16.0+683a720-devel",
ExpectedAfterStrippingInfo: "v2.16.0",
},
}

for _, tc := range testCases {
// Is this still necessary?
tc := tc

stripped := codersdk.RemoveTrailingVersionInfo(tc.Version)
require.Equal(t, tc.ExpectedAfterStrippingInfo, stripped)
}
}
Loading