SANDBOX-838: loop update calls

test/e2e/no_user_identity_test.go

@@ -83,10 +83,11 @@ func TestCreationOfUserAndIdentityIsSkipped(t *testing.T) {
 
 	t.Run("user and identity stay there when user is deactivated", func(t *testing.T) {
 		// when
-		userSignup, err := hostAwait.UpdateUserSignup(t, signup.Name,
-			func(us *toolchainv1alpha1.UserSignup) {
-				states.SetDeactivated(us, true)
-			})
+		userSignup, err := wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+			Update(signup.Name,
+				func(us *toolchainv1alpha1.UserSignup) {
+					states.SetDeactivated(us, true)
+				})
 		require.NoError(t, err)
 
 		// Wait until the UserSignup is deactivated

test/e2e/parallel/e2e_test.go

@@ -160,8 +160,10 @@ func TestE2EFlow(t *testing.T) {
 			require.NoError(t, err)
 
 			// when
-			user.Identities = []string{}
-			err = memberAwait.Client.Update(context.TODO(), user)
+			_, err = wait.For(t, memberAwait.Awaitility, &userv1.User{}).
+				Update(user.Name, func(u *userv1.User) {
+					u.Identities = []string{}
+				})
 
 			// then
 			require.NoError(t, err)
@@ -175,10 +177,12 @@ func TestE2EFlow(t *testing.T) {
 			err := memberAwait.Client.Get(context.TODO(), types.NamespacedName{Name: identitypkg.NewIdentityNamingStandard(
 				johnSignup.Spec.IdentityClaims.Sub, "rhd").IdentityName()}, identity)
 			require.NoError(t, err)
-			identity.User = corev1.ObjectReference{Name: "", UID: ""}
 
 			// when
-			err = memberAwait.Client.Update(context.TODO(), identity)
+			_, err = wait.For(t, memberAwait.Awaitility, &userv1.Identity{}).
+				Update(identity.Name, func(i *userv1.Identity) {
+					i.User = corev1.ObjectReference{Name: "", UID: ""}
+				})
 
 			// then
 			require.NoError(t, err)
@@ -483,10 +487,11 @@ func TestE2EFlow(t *testing.T) {
 		require.Len(t, userList.Items, 1)
 
 		// Now deactivate the UserSignup
-		userSignup, err := hostAwait.UpdateUserSignup(t, originalSubJohnSignup.Name,
-			func(us *toolchainv1alpha1.UserSignup) {
-				states.SetDeactivated(us, true)
-			})
+		userSignup, err := wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+			Update(originalSubJohnSignup.Name,
+				func(us *toolchainv1alpha1.UserSignup) {
+					states.SetDeactivated(us, true)
+				})
 		require.NoError(t, err)
 
 		// Wait until the UserSignup is deactivated

test/e2e/parallel/nstemplatetier_test.go

@@ -169,10 +169,11 @@ func TestResetDeactivatingStateWhenPromotingUser(t *testing.T) {
 			RequireConditions(wait.ConditionSet(wait.Default(), wait.ApprovedByAdmin())...).
 			Execute(t)
 		// Set the deactivating state on the UserSignup
-		updatedUserSignup, err := hostAwait.UpdateUserSignup(t, user.UserSignup.Name,
-			func(us *toolchainv1alpha1.UserSignup) {
-				states.SetDeactivating(us, true)
-			})
+		updatedUserSignup, err := wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+			Update(user.UserSignup.Name,
+				func(us *toolchainv1alpha1.UserSignup) {
+					states.SetDeactivating(us, true)
+				})
 		require.NoError(t, err)
 
 		// Move the MUR to the user tier with longer deactivation time

test/e2e/parallel/proxy_test.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	rbacv1 "k8s.io/api/rbac/v1"
 	"net/http"
 	"net/url"
 	"os"
@@ -18,6 +17,8 @@ import (
 	"testing"
 	"time"
 
+	rbacv1 "k8s.io/api/rbac/v1"
+
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
 	commonproxy "github.com/codeready-toolchain/toolchain-common/pkg/proxy"
 	"github.com/codeready-toolchain/toolchain-common/pkg/test"

test/e2e/parallel/registration_service_test.go

@@ -412,12 +412,13 @@ func TestSignupOK(t *testing.T) {
 			identity.ID, identity.Username), mp["message"])
 		assert.Equal(t, "error creating UserSignup resource", mp["details"])
 
-		userSignup, err = hostAwait.UpdateUserSignup(t, userSignup.Name,
-			func(instance *toolchainv1alpha1.UserSignup) {
-				// Approve usersignup.
-				states.SetApprovedManually(instance, true)
-				instance.Spec.TargetCluster = memberAwait.ClusterName
-			})
+		userSignup, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+			Update(userSignup.Name,
+				func(instance *toolchainv1alpha1.UserSignup) {
+					// Approve usersignup.
+					states.SetApprovedManually(instance, true)
+					instance.Spec.TargetCluster = memberAwait.ClusterName
+				})
 		require.NoError(t, err)
 
 		// Wait for the resources to be provisioned
@@ -444,10 +445,11 @@ func TestSignupOK(t *testing.T) {
 		t.Logf("Signed up new user %+v", userSignup)
 
 		// Deactivate the usersignup
-		userSignup, err = hostAwait.UpdateUserSignup(t, userSignup.Name,
-			func(us *toolchainv1alpha1.UserSignup) {
-				states.SetDeactivated(us, true)
-			})
+		userSignup, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+			Update(userSignup.Name,
+				func(us *toolchainv1alpha1.UserSignup) {
+					states.SetDeactivated(us, true)
+				})
 		require.NoError(t, err)
 		_, err = hostAwait.WaitForUserSignup(t, userSignup.Name,
 			wait.UntilUserSignupHasConditions(wait.ConditionSet(wait.Default(), wait.DeactivatedWithoutPreDeactivation())...),
@@ -609,11 +611,12 @@ func TestPhoneVerification(t *testing.T) {
 	assert.Equal(t, "PendingApproval", mpStatus["reason"])
 	require.False(t, mpStatus["verificationRequired"].(bool))
 
-	userSignup, err = hostAwait.UpdateUserSignup(t, userSignup.Name,
-		func(instance *toolchainv1alpha1.UserSignup) {
-			// Now approve the usersignup.
-			states.SetApprovedManually(instance, true)
-		})
+	userSignup, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+		Update(userSignup.Name,
+			func(instance *toolchainv1alpha1.UserSignup) {
+				// Now approve the usersignup.
+				states.SetApprovedManually(instance, true)
+			})
 	require.NoError(t, err)
 	transformedUsername := commonsignup.TransformUsername(userSignup.Spec.IdentityClaims.PreferredUsername, []string{"openshift", "kube", "default", "redhat", "sandbox"}, []string{"admin"})
 	// Confirm the MasterUserRecord is provisioned
@@ -666,11 +669,12 @@ func TestPhoneVerification(t *testing.T) {
 	userSignup, err = hostAwait.WaitForUserSignup(t, userSignup.Name)
 	require.NoError(t, err)
 
-	userSignup, err = hostAwait.UpdateUserSignup(t, userSignup.Name,
-		func(instance *toolchainv1alpha1.UserSignup) {
-			// Now mark the original UserSignup as deactivated
-			states.SetDeactivated(instance, true)
-		})
+	userSignup, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+		Update(userSignup.Name,
+			func(instance *toolchainv1alpha1.UserSignup) {
+				// Now mark the original UserSignup as deactivated
+				states.SetDeactivated(instance, true)
+			})
 	require.NoError(t, err)
 
 	// Ensure the UserSignup is deactivated
@@ -720,10 +724,11 @@ func TestActivationCodeVerification(t *testing.T) {
 			wait.UntilUserSignupHasConditions(wait.ConditionSet(wait.Default(), wait.PendingApproval())...))
 		require.NoError(t, err)
 		// explicitly approve the usersignup (see above, config for parallel test has automatic approval disabled)
-		userSignup, err = hostAwait.UpdateUserSignup(t, userSignup.Name,
-			func(us *toolchainv1alpha1.UserSignup) {
-				states.SetApprovedManually(us, true)
-			})
+		userSignup, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+			Update(userSignup.Name,
+				func(us *toolchainv1alpha1.UserSignup) {
+					states.SetApprovedManually(us, true)
+				})
 		require.NoError(t, err)
 		t.Logf("user signup '%s' approved", userSignup.Name)
 
@@ -793,8 +798,11 @@ func TestActivationCodeVerification(t *testing.T) {
 				Status: corev1.ConditionTrue,
 			})) // need to reload event
 			require.NoError(t, err)
-			event.Status.ActivationCount = event.Spec.MaxAttendees // activation count identical to `MaxAttendees`
-			err = hostAwait.Client.Status().Update(context.TODO(), event)
+			event, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.SocialEvent{}).
+				UpdateStatus(event.Name,
+					func(ev *toolchainv1alpha1.SocialEvent) {
+						ev.Status.ActivationCount = event.Spec.MaxAttendees // activation count identical to `MaxAttendees`
+					})
 			require.NoError(t, err)
 
 			userSignup, token := signup(t, hostAwait)

test/e2e/parallel/socialevent_test.go

@@ -1,7 +1,6 @@
 package parallel
 
 import (
-	"context"
 	"testing"
 	"time"
 
@@ -75,11 +74,12 @@ func TestCreateSocialEvent(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Run("update with valid tier name", func(t *testing.T) {
-			// given
-			event.Spec.UserTier = "deactivate30"
-
 			// when
-			err := hostAwait.Client.Update(context.TODO(), event)
+			event, err = For(t, hostAwait.Awaitility, &toolchainv1alpha1.SocialEvent{}).
+				Update(event.Name,
+					func(ev *toolchainv1alpha1.SocialEvent) {
+						ev.Spec.UserTier = "deactivate30"
+					})
 
 			// then
 			require.NoError(t, err)
@@ -111,11 +111,12 @@ func TestCreateSocialEvent(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Run("update with valid tier name", func(t *testing.T) {
-			// given
-			event.Spec.SpaceTier = "base"
-
 			// when
-			err := hostAwait.Client.Update(context.TODO(), event)
+			event, err = For(t, hostAwait.Awaitility, &toolchainv1alpha1.SocialEvent{}).
+				Update(event.Name,
+					func(ev *toolchainv1alpha1.SocialEvent) {
+						ev.Spec.SpaceTier = "base"
+					})
 
 			// then
 			require.NoError(t, err)

test/e2e/parallel/space_cleanup_test.go

@@ -49,10 +49,11 @@ func TestSpaceAndSpaceBindingCleanup(t *testing.T) {
 
 			// when
 			// deactivate the UserSignup so that the MUR will be deleted
-			userSignup, err := hostAwait.UpdateUserSignup(t, userSignup.Name,
-				func(us *toolchainv1alpha1.UserSignup) {
-					states.SetDeactivated(us, true)
-				})
+			userSignup, err := wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+				Update(userSignup.Name,
+					func(us *toolchainv1alpha1.UserSignup) {
+						states.SetDeactivated(us, true)
+					})
 			require.NoError(t, err)
 			t.Logf("user signup '%s' set to deactivated", userSignup.Name)
 
@@ -74,10 +75,11 @@ func TestSpaceAndSpaceBindingCleanup(t *testing.T) {
 
 			// when
 			// we deactivate the UserSignup so that the MUR will be deleted
-			userSignup, err = hostAwait.UpdateUserSignup(t, userSignup.Name,
-				func(us *toolchainv1alpha1.UserSignup) {
-					states.SetDeactivated(us, true)
-				})
+			userSignup, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+				Update(userSignup.Name,
+					func(us *toolchainv1alpha1.UserSignup) {
+						states.SetDeactivated(us, true)
+					})
 			require.NoError(t, err)
 			t.Logf("user signup '%s' set to deactivated", userSignup.Name)
 

test/e2e/parallel/space_test.go

@@ -203,11 +203,11 @@ func TestSpaceRoles(t *testing.T) {
 	})
 
 	t.Run("set owner user as maintainer instead", func(t *testing.T) {
-		// given an appstudio space with `owner` user as an admin of it
-		ownerBinding.Spec.SpaceRole = "maintainer"
-
 		// when
-		err = hostAwait.Client.Update(context.TODO(), ownerBinding)
+		ownerBinding, err = hostAwait.UpdateSpaceBinding(t, ownerBinding.Name, func(sb *toolchainv1alpha1.SpaceBinding) {
+			// given an appstudio space with `owner` user as an admin of it
+			sb.Spec.SpaceRole = "maintainer"
+		})
 		require.NoError(t, err)
 
 		// then
@@ -222,11 +222,11 @@ func TestSpaceRoles(t *testing.T) {
 	})
 
 	t.Run("set owner user as contributor instead", func(t *testing.T) {
-		// given an appstudio space with `owner` user as an admin of it
-		ownerBinding.Spec.SpaceRole = "contributor"
-
 		// when
-		err := hostAwait.Client.Update(context.TODO(), ownerBinding)
+		ownerBinding, err = hostAwait.UpdateSpaceBinding(t, ownerBinding.Name, func(sb *toolchainv1alpha1.SpaceBinding) {
+			// given an appstudio space with `owner` user as an admin of it
+			sb.Spec.SpaceRole = "contributor"
+		})
 
 		// then
 		require.NoError(t, err)
@@ -335,13 +335,12 @@ func TestSubSpaces(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Run("we update role in parentSpaceBinding and expect change to be reflected in subSpaces", func(t *testing.T) {
-			// given
-			// the parentSpace role was "downgraded" to maintainer
-			parentSpaceBindings.Spec.SpaceRole = "maintainer"
-
 			// when
 			// we update the parentSpace bindings
-			err := hostAwait.Client.Update(context.TODO(), parentSpaceBindings)
+			parentSpaceBindings, err = hostAwait.UpdateSpaceBinding(t, parentSpaceBindings.Name, func(sb *toolchainv1alpha1.SpaceBinding) {
+				// the parentSpace role was "downgraded" to maintainer
+				sb.Spec.SpaceRole = "maintainer"
+			})
 
 			// then
 			// downgrade of the usernames is done in parentSpace

test/e2e/parallel/usersignup_test.go

@@ -66,9 +66,10 @@ func TestTransformUsernameWithSpaceConflict(t *testing.T) {
 		}()
 
 		// now deactivate the usersignup
-		_, err = hostAwait.UpdateUserSignup(t, userSignup.Name, func(us *toolchainv1alpha1.UserSignup) {
-			states.SetDeactivated(us, true)
-		})
+		_, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+			Update(userSignup.Name, func(us *toolchainv1alpha1.UserSignup) {
+				states.SetDeactivated(us, true)
+			})
 		require.NoError(t, err)
 
 		// wait until it is deactivated, SpaceBinding is gone, and Space is in terminating state
@@ -81,9 +82,10 @@ func TestTransformUsernameWithSpaceConflict(t *testing.T) {
 		require.NoError(t, err)
 
 		// when
-		userSignup, err = hostAwait.UpdateUserSignup(t, userSignup.Name, func(us *toolchainv1alpha1.UserSignup) {
-			states.SetApprovedManually(us, true)
-		})
+		userSignup, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.UserSignup{}).
+			Update(userSignup.Name, func(us *toolchainv1alpha1.UserSignup) {
+				states.SetApprovedManually(us, true)
+			})
 		require.NoError(t, err)
 
 		// then