Skip to content

Commit abc191a

Browse files
authored
feat: support updated RedHat SSO version strings (#903)
1 parent 264286d commit abc191a

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

keycloak/keycloak_client.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"net/http/cookiejar"
1414
"net/url"
1515
"os"
16+
"regexp"
1617
"strings"
1718
"time"
1819

@@ -167,6 +168,19 @@ func (keycloakClient *KeycloakClient) login(ctx context.Context) error {
167168
serverVersion := info.SystemInfo.ServerVersion
168169
if strings.Contains(serverVersion, ".GA") {
169170
serverVersion = strings.ReplaceAll(info.SystemInfo.ServerVersion, ".GA", "")
171+
} else {
172+
regex, err := regexp.Compile(`\.redhat-\w+`)
173+
174+
if err != nil {
175+
fmt.Println("Error compiling regex:", err)
176+
return err
177+
}
178+
179+
// Check if the pattern is found in serverVersion
180+
if regex.MatchString(serverVersion) {
181+
// Replace the matched pattern with an empty string
182+
serverVersion = regex.ReplaceAllString(serverVersion, "")
183+
}
170184
}
171185

172186
v, err := version.NewVersion(serverVersion)

0 commit comments

Comments
 (0)