Skip to content

CNTRLPLANE-2544: Add ExternalOIDCWithUpstreamParity e2e tests #30906

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

Open
xingxingxia wants to merge 1 commit into
base: main
Choose a base branch
from
+436 −5
Open

CNTRLPLANE-2544: Add ExternalOIDCWithUpstreamParity e2e tests #30906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions test/extended/authentication/keycloak_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ func (kc *keycloakClient) CreateGroup(name string) error {
}
defer resp.Body.Close()

if resp.StatusCode != http.StatusCreated {
if resp.StatusCode != http.StatusCreated && resp.StatusCode != http.StatusConflict {
// If the group already exists (409 Conflict), that's fine - we can reuse it
respBytes, _ := io.ReadAll(resp.Body)
return fmt.Errorf("failed creating group %q: %s - %s", name, resp.Status, respBytes)
}
Expand Down Expand Up @@ -95,11 +96,15 @@ const (
)

func (kc *keycloakClient) CreateUser(username, password string, groups ...string) error {
return kc.CreateUserWithEmail(username, fmt.Sprintf("%s@payload.openshift.io", username), password, groups...)
}

func (kc *keycloakClient) CreateUserWithEmail(username, email, password string, groups ...string) error {
userURL := kc.adminURL.JoinPath("users")

user := user{
Username: username,
Email: fmt.Sprintf("%s@payload.openshift.io", username),
Email: email,
Enabled: true,
EmailVerified: true,
Groups: groups,
Expand All @@ -114,18 +119,18 @@ func (kc *keycloakClient) CreateUser(username, password string, groups ...string

userBytes, err := json.Marshal(user)
if err != nil {
return fmt.Errorf("marshalling user configuration %v", user)
return fmt.Errorf("marshalling user configuration for %q: %w", username, err)
}

resp, err := kc.DoRequest(http.MethodPost, userURL.String(), runtime.ContentTypeJSON, true, bytes.NewBuffer(userBytes))
if err != nil {
return fmt.Errorf("sending POST request to %q to create user %v", userURL.String(), user)
return fmt.Errorf("sending POST request to %q to create user %q: %w", userURL.String(), username, err)
}
defer resp.Body.Close()

if resp.StatusCode != http.StatusCreated {
respBytes, _ := io.ReadAll(resp.Body)
return fmt.Errorf("failed creating user %v: %s - %s", user, resp.Status, respBytes)
return fmt.Errorf("failed creating user %q: %s - %s", username, resp.Status, respBytes)
}

return nil
Expand Down
Loading