Commit20bfd1f

authored

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

Fixes a bug where excess version info was not being stripped properly fromdocumentation links.

1 parent52f03db commit20bfd1fCopy full SHA for 20bfd1f

File tree

+41

-1

lines changed

+41

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -804,8 +804,12 @@ func DefaultSupportLinks(docsURL string) []LinkConfig {`
`804`	`804`	`}`
`805`	`805`	`}`
`806`	`806`
	`807`	`+funcremoveTrailingVersionInfo(vstring)string {`
	`808`	`+returnstrings.Split(strings.Split(v,"-")[0],"+")[0]`
	`809`	`+}`
	`810`	`+`
`807`	`811`	`funcDefaultDocsURL()string {`
`808`		`-version:=strings.Split(buildinfo.Version(),"-")[0]`
	`812`	`+version:=removeTrailingVersionInfo(buildinfo.Version())`
`809`	`813`	`ifversion=="v0.0.0" {`
`810`	`814`	`return"https://coder.com/docs"`
`811`	`815`	`}`

Lines changed: 36 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,36 @@`
	`1`	`+package codersdk`
	`2`	`+`
	`3`	`+import (`
	`4`	`+"testing"`
	`5`	`+`
	`6`	`+"github.com/stretchr/testify/require"`
	`7`	`+)`
	`8`	`+`
	`9`	`+funcTestRemoveTrailingVersionInfo(t*testing.T) {`
	`10`	`+t.Parallel()`
	`11`	`+`
	`12`	`+testCases:= []struct {`
	`13`	`+Versionstring`
	`14`	`+ExpectedAfterStrippingInfostring`
	`15`	`+}{`
	`16`	`+{`
	`17`	`+Version:"v2.16.0+683a720",`
	`18`	`+ExpectedAfterStrippingInfo:"v2.16.0",`
	`19`	`+},`
	`20`	`+{`
	`21`	`+Version:"v2.16.0-devel+683a720",`
	`22`	`+ExpectedAfterStrippingInfo:"v2.16.0",`
	`23`	`+},`
	`24`	`+{`
	`25`	`+Version:"v2.16.0+683a720-devel",`
	`26`	`+ExpectedAfterStrippingInfo:"v2.16.0",`
	`27`	`+},`
	`28`	`+}`
	`29`	`+`
	`30`	`+for_,tc:=rangetestCases {`
	`31`	`+tc:=tc`
	`32`	`+`
	`33`	`+stripped:=removeTrailingVersionInfo(tc.Version)`
	`34`	`+require.Equal(t,tc.ExpectedAfterStrippingInfo,stripped)`
	`35`	`+}`
	`36`	`+}`

Comments

(0)