Skip to content
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

SANDBOX-770: fix WaitForBannedUser #1077

Merged
merged 4 commits into from
Dec 4, 2024
Merged

SANDBOX-770: fix WaitForBannedUser #1077

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
664fc64
fix WaitForBannedUser
rsoaresd Dec 3, 2024
28316e4
update comment
rsoaresd Dec 3, 2024
57a568e
requested change
rsoaresd Dec 4, 2024
5298f1e
improve comments
rsoaresd Dec 4, 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
24 changes: 13 additions & 11 deletions testsupport/wait/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
"github.com/codeready-toolchain/toolchain-common/pkg/condition"
"github.com/codeready-toolchain/toolchain-common/pkg/hash"
"github.com/codeready-toolchain/toolchain-common/pkg/spacebinding"
"github.com/codeready-toolchain/toolchain-common/pkg/test"
testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config"
Expand Down Expand Up @@ -770,24 +769,27 @@ func (a *HostAwaitility) WaitAndVerifyThatUserSignupIsNotCreated(t *testing.T, n
}

// WaitForBannedUser waits until there is a BannedUser available with the given email
rsoaresd marked this conversation as resolved.
Show resolved Hide resolved
func (a *HostAwaitility) WaitForBannedUser(t *testing.T, email string) (*toolchainv1alpha1.BannedUser, error) {
t.Logf("waiting for BannedUser for user '%s' in namespace '%s'", email, a.Namespace)
// !!! WARNING: for now, just used for WA
func (a *HostAwaitility) WaitForBannedUser(t *testing.T, userEmailHash string) (*toolchainv1alpha1.BannedUser, error) {
t.Logf("waiting for BannedUser for user '%s' in namespace '%s'", userEmailHash, a.Namespace)
mfrancisc marked this conversation as resolved.
Show resolved Hide resolved
var bannedUser *toolchainv1alpha1.BannedUser
labels := map[string]string{toolchainv1alpha1.BannedUserEmailHashLabelKey: hash.EncodeString(email)}
emailHashLabelMatch := client.MatchingLabels(map[string]string{
toolchainv1alpha1.BannedUserEmailHashLabelKey: userEmailHash,
})
err := wait.PollUntilContextTimeout(context.TODO(), a.RetryInterval, a.Timeout, true, func(ctx context.Context) (done bool, err error) {
bannedUserList := &toolchainv1alpha1.BannedUserList{}
if err = a.Client.List(context.TODO(), bannedUserList, client.MatchingLabels(labels), client.InNamespace(a.Namespace)); err != nil {
if len(bannedUserList.Items) == 0 {
return false, nil
}
if err := a.Client.List(ctx, bannedUserList, emailHashLabelMatch, client.InNamespace(a.Namespace)); err != nil {
return false, err
}
bannedUser = &bannedUserList.Items[0]
return true, nil
if len(bannedUserList.Items) > 0 {
bannedUser = &bannedUserList.Items[0]
return true, nil
}
return false, nil
})
// log message if an error occurred
if err != nil {
t.Logf("failed to find Banned for email address '%s': %v", email, err)
t.Logf("failed to find Banned for email address '%s': %v", userEmailHash, err)
}
return bannedUser, err
}
Expand Down
Loading