Merge branch 'master' into sbrcleanup

test/e2e/e2e_test.go

@@ -12,6 +12,7 @@ import (
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
 	testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/spacebinding"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/tiers"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 

test/e2e/nstemplatetier_test.go

@@ -11,6 +11,7 @@ import (
 	testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config"
 	testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/tiers"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"

test/e2e/parallel/serviceaccount_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/codeready-toolchain/api/api/v1alpha1"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/tiers"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 	"github.com/stretchr/testify/assert"

test/e2e/parallel/space_cleanup_test.go

@@ -9,6 +9,8 @@ import (
 	"github.com/codeready-toolchain/toolchain-common/pkg/states"
 	testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
+	testsupportsb "github.com/codeready-toolchain/toolchain-e2e/testsupport/spacebinding"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 	"k8s.io/apimachinery/pkg/types"
 
@@ -208,7 +210,7 @@ func setupForSpaceBindingCleanupTest(t *testing.T, awaitilities wait.Awaitilitie
 		EnsureMUR().
 		RequireConditions(wait.ConditionSet(wait.Default(), wait.ApprovedByAdmin())...).
 		Execute(t).Resources()
-	spaceBinding := CreateSpaceBinding(t, awaitilities.Host(), mur, space, "admin")
+	spaceBinding := testsupportsb.CreateSpaceBinding(t, awaitilities.Host(), mur, space, "admin")
 	appstudioTier, err := awaitilities.Host().WaitForNSTemplateTier(t, "appstudio")
 	require.NoError(t, err)
 	// make sure that the NSTemplateSet associated with the Space was updated after the space binding was created (new entry in the `spec.SpaceRoles`)

test/e2e/parallel/space_test.go

@@ -8,6 +8,8 @@ import (
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
 	testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
+	testsupportsb "github.com/codeready-toolchain/toolchain-e2e/testsupport/spacebinding"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/tiers"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 
@@ -169,7 +171,7 @@ func TestSpaceRoles(t *testing.T) {
 			Resources()
 
 		// when the `spaceguest` user is bound to the space as an admin
-		guestBinding := CreateSpaceBinding(t, hostAwait, guestMUR, s, "admin")
+		guestBinding := testsupportsb.CreateSpaceBinding(t, hostAwait, guestMUR, s, "admin")
 
 		// then
 		require.NoError(t, err)
@@ -432,7 +434,7 @@ func TestSubSpaces(t *testing.T) {
 					// when
 					// we create spaceBinding for subSpace
 					// override the parentMUR and give him admin role (was maintainer previously)
-					CreateSpaceBinding(t, awaitilities.Host(), parentMUR, subSpace, "admin")
+					testsupportsb.CreateSpaceBinding(t, awaitilities.Host(), parentMUR, subSpace, "admin")
 
 					// then
 					// subSpace should have usernames and roles from parentSpaceBindings+subSpaceBindings

test/e2e/parallel/spacebindingrequest_test.go

@@ -14,6 +14,8 @@ import (
 
 	testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	testsupportspace "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/spacebinding"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/types"
@@ -97,7 +99,7 @@ func TestCreateSpaceBindingRequest(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		t.Run("unable create space binding request with invalid SpaceRole", func(t *testing.T) {
-			space, _, _ := CreateSpace(t, awaitilities, testspace.WithTierName("appstudio"), testspace.WithSpecTargetCluster(memberAwait.ClusterName))
+			space, _, _ := testsupportspace.CreateSpace(t, awaitilities, testspace.WithTierName("appstudio"), testspace.WithSpecTargetCluster(memberAwait.ClusterName))
 			// wait for the namespace to be provisioned since we will be creating the SpaceBindingRequest into it.
 			space, err := hostAwait.WaitForSpace(t, space.Name, UntilSpaceHasAnyProvisionedNamespaces())
 			require.NoError(t, err)
@@ -115,7 +117,7 @@ func TestCreateSpaceBindingRequest(t *testing.T) {
 			spaceBindingRequest := CreateSpaceBindingRequest(t, awaitilities, memberAwait.ClusterName,
 				WithSpecSpaceRole("invalid"), // set invalid spacerole
 				WithSpecMasterUserRecord(mur.GetName()),
-				WithNamespace(GetDefaultNamespace(space.Status.ProvisionedNamespaces)),
+				WithNamespace(testsupportspace.GetDefaultNamespace(space.Status.ProvisionedNamespaces)),
 			)
 
 			// then
@@ -131,15 +133,15 @@ func TestCreateSpaceBindingRequest(t *testing.T) {
 		})
 
 		t.Run("unable create space binding request with invalid MasterUserRecord", func(t *testing.T) {
-			space, _, _ := CreateSpace(t, awaitilities, testspace.WithTierName("appstudio"), testspace.WithSpecTargetCluster(memberAwait.ClusterName))
+			space, _, _ := testsupportspace.CreateSpace(t, awaitilities, testspace.WithTierName("appstudio"), testspace.WithSpecTargetCluster(memberAwait.ClusterName))
 			// wait for the namespace to be provisioned since we will be creating the SpaceBindingRequest into it.
 			space, err := hostAwait.WaitForSpace(t, space.Name, UntilSpaceHasAnyProvisionedNamespaces())
 			require.NoError(t, err)
 			// create the spacebinding request
 			spaceBindingRequest := CreateSpaceBindingRequest(t, awaitilities, memberAwait.ClusterName,
 				WithSpecSpaceRole("admin"),
 				WithSpecMasterUserRecord("invalidMUR"), // we set an invalid MUR
-				WithNamespace(GetDefaultNamespace(space.Status.ProvisionedNamespaces)),
+				WithNamespace(testsupportspace.GetDefaultNamespace(space.Status.ProvisionedNamespaces)),
 			)
 
 			// then
@@ -231,7 +233,7 @@ func TestUpdateSpaceBindingRequest(t *testing.T) {
 }
 
 func NewSpaceBindingRequest(t *testing.T, awaitilities Awaitilities, memberAwait *MemberAwaitility, hostAwait *HostAwaitility, spaceRole string) (*toolchainv1alpha1.Space, *toolchainv1alpha1.SpaceBindingRequest, *toolchainv1alpha1.SpaceBinding) {
-	space, firstUserSignup, _ := CreateSpace(t, awaitilities, testspace.WithTierName("appstudio"), testspace.WithSpecTargetCluster(memberAwait.ClusterName))
+	space, firstUserSignup, _ := testsupportspace.CreateSpace(t, awaitilities, testspace.WithTierName("appstudio"), testspace.WithSpecTargetCluster(memberAwait.ClusterName))
 	// wait for the namespace to be provisioned since we will be creating the SpaceBindingRequest into it.
 	space, err := hostAwait.WaitForSpace(t, space.Name, UntilSpaceHasAnyProvisionedNamespaces())
 	require.NoError(t, err)
@@ -249,7 +251,7 @@ func NewSpaceBindingRequest(t *testing.T, awaitilities Awaitilities, memberAwait
 	spaceBindingRequest := CreateSpaceBindingRequest(t, awaitilities, memberAwait.ClusterName,
 		WithSpecSpaceRole(spaceRole),
 		WithSpecMasterUserRecord(secondUserMUR.GetName()),
-		WithNamespace(GetDefaultNamespace(space.Status.ProvisionedNamespaces)),
+		WithNamespace(testsupportspace.GetDefaultNamespace(space.Status.ProvisionedNamespaces)),
 	)
 
 	// then
@@ -283,6 +285,6 @@ func NewSpaceBindingRequest(t *testing.T, awaitilities Awaitilities, memberAwait
 				SpaceRole(tier.Spec.SpaceRoles[spaceRole].TemplateRef, secondUserMUR.Name)))
 		require.NoError(t, err)
 	}
-	VerifyResourcesProvisionedForSpace(t, awaitilities, space.Name)
+	testsupportspace.VerifyResourcesProvisionedForSpace(t, awaitilities, space.Name)
 	return space, spaceBindingRequest, spaceBinding
 }

test/e2e/parallel/spacerequest_test.go

@@ -7,6 +7,7 @@ import (
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
 	"github.com/codeready-toolchain/toolchain-common/pkg/cluster"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/types"

test/e2e/proxy_test.go

@@ -23,6 +23,7 @@ import (
 	testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
 	appstudiov1 "github.com/codeready-toolchain/toolchain-e2e/testsupport/appstudio/api/v1alpha1"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/spacebinding"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client"

test/e2e/space_autocompletion_test.go

@@ -9,6 +9,7 @@ import (
 	testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config"
 	testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 
 	"github.com/stretchr/testify/assert"

test/migration/setup_runner.go

@@ -11,6 +11,7 @@ import (
 	testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/cleanup"
+	tsspace "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/tiers"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 
@@ -70,7 +71,7 @@ func (r *SetupMigrationRunner) createAndWaitForSpace(t *testing.T, name, tierNam
 	err := hostAwait.Client.Create(context.TODO(), space)
 	require.NoError(t, err)
 
-	_, _, binding := testsupport.CreateMurWithAdminSpaceBindingForSpace(t, r.Awaitilities, space, r.WithCleanup)
+	_, _, binding := tsspace.CreateMurWithAdminSpaceBindingForSpace(t, r.Awaitilities, space, r.WithCleanup)
 
 	tier, err := hostAwait.WaitForNSTemplateTier(t, tierName)
 	require.NoError(t, err)

test/migration/verify/verify_migration_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/codeready-toolchain/toolchain-e2e/test/migration"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/cleanup"
+	. "github.com/codeready-toolchain/toolchain-e2e/testsupport/space"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 
 	"github.com/stretchr/testify/require"

testsupport/space.go → testsupport/space/space.go

@@ -1,4 +1,4 @@
-package testsupport
+package space
 
 import (
 	"fmt"
@@ -8,7 +8,10 @@ import (
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
 	testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space"
 	testtier "github.com/codeready-toolchain/toolchain-common/pkg/test/tier"
+	"github.com/codeready-toolchain/toolchain-e2e/testsupport"
+	testsupportsb "github.com/codeready-toolchain/toolchain-e2e/testsupport/spacebinding"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/tiers"
+	"github.com/codeready-toolchain/toolchain-e2e/testsupport/util"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 
 	"github.com/gofrs/uuid"
@@ -21,7 +24,7 @@ import (
 func CreateSpace(t *testing.T, awaitilities wait.Awaitilities, opts ...testspace.Option) (*toolchainv1alpha1.Space, *toolchainv1alpha1.UserSignup, *toolchainv1alpha1.SpaceBinding) {
 	// we need to create a MUR & SpaceBinding, otherwise, the Space could be automatically deleted by the SpaceCleanup controller
 	username := uuid.Must(uuid.NewV4()).String()
-	signup, mur := NewSignupRequest(awaitilities).
+	signup, mur := testsupport.NewSignupRequest(awaitilities).
 		Username(username).
 		Email(username + "@acme.com").
 		ManuallyApprove().
@@ -31,7 +34,7 @@ func CreateSpace(t *testing.T, awaitilities wait.Awaitilities, opts ...testspace
 	t.Logf("The UserSignup %s and MUR %s were created", signup.Name, mur.Name)
 
 	// create the actual space
-	space := testspace.NewSpaceWithGeneratedName(awaitilities.Host().Namespace, NewObjectNamePrefix(t), opts...)
+	space := testspace.NewSpaceWithGeneratedName(awaitilities.Host().Namespace, util.NewObjectNamePrefix(t), opts...)
 	space, _, err := awaitilities.Host().CreateSpaceAndSpaceBinding(t, mur, space, "admin")
 	require.NoError(t, err)
 	space, err = awaitilities.Host().WaitForSpace(t, space.Name,
@@ -63,20 +66,20 @@ func CreateSpace(t *testing.T, awaitilities wait.Awaitilities, opts ...testspace
 // CreateSpaceWithBinding initializes a new Space object using the NewSpace function, and then creates it in the cluster
 // It also automatically creates SpaceBinding for it and for the given MasterUserRecord
 func CreateSpaceWithBinding(t *testing.T, awaitilities wait.Awaitilities, mur *toolchainv1alpha1.MasterUserRecord, opts ...testspace.Option) (*toolchainv1alpha1.Space, *toolchainv1alpha1.SpaceBinding) {
-	space := testspace.NewSpaceWithGeneratedName(awaitilities.Host().Namespace, NewObjectNamePrefix(t), opts...)
+	space := testspace.NewSpaceWithGeneratedName(awaitilities.Host().Namespace, util.NewObjectNamePrefix(t), opts...)
 
 	err := awaitilities.Host().CreateWithCleanup(t, space)
 	require.NoError(t, err)
 
 	// we need to  create the SpaceBinding, otherwise, the Space could be automatically deleted by the SpaceCleanup controller
-	spaceBinding := CreateSpaceBinding(t, awaitilities.Host(), mur, space, "admin")
+	spaceBinding := testsupportsb.CreateSpaceBinding(t, awaitilities.Host(), mur, space, "admin")
 
 	return space, spaceBinding
 }
 
 // CreateSubSpace initializes a new Space object using the NewSpace function, and sets the parentSpace field value accordingly.
 func CreateSubSpace(t *testing.T, awaitilities wait.Awaitilities, opts ...testspace.Option) *toolchainv1alpha1.Space {
-	space := testspace.NewSpaceWithGeneratedName(awaitilities.Host().Namespace, NewObjectNamePrefix(t), opts...)
+	space := testspace.NewSpaceWithGeneratedName(awaitilities.Host().Namespace, util.NewObjectNamePrefix(t), opts...)
 
 	err := awaitilities.Host().CreateWithCleanup(t, space)
 	require.NoError(t, err)
@@ -164,7 +167,7 @@ func verifyResourcesProvisionedForSpace(t *testing.T, hostAwait *wait.HostAwaiti
 
 func CreateMurWithAdminSpaceBindingForSpace(t *testing.T, awaitilities wait.Awaitilities, space *toolchainv1alpha1.Space, cleanup bool) (*toolchainv1alpha1.UserSignup, *toolchainv1alpha1.MasterUserRecord, *toolchainv1alpha1.SpaceBinding) {
 	username := space.Name
-	builder := NewSignupRequest(awaitilities).
+	builder := testsupport.NewSignupRequest(awaitilities).
 		Username(username).
 		Email(username + "@acme.com").
 		ManuallyApprove().
@@ -178,9 +181,9 @@ func CreateMurWithAdminSpaceBindingForSpace(t *testing.T, awaitilities wait.Awai
 	t.Logf("The UserSignup %s and MUR %s were created", signup.Name, mur.Name)
 	var binding *toolchainv1alpha1.SpaceBinding
 	if cleanup {
-		binding = CreateSpaceBinding(t, awaitilities.Host(), mur, space, "admin")
+		binding = testsupportsb.CreateSpaceBinding(t, awaitilities.Host(), mur, space, "admin")
 	} else {
-		binding = CreateSpaceBindingWithoutCleanup(t, awaitilities.Host(), mur, space, "admin")
+		binding = testsupportsb.CreateSpaceBindingWithoutCleanup(t, awaitilities.Host(), mur, space, "admin")
 	}
 	t.Logf("The SpaceBinding %s was created", binding.Name)
 	return signup, mur, binding

testsupport/spacerequest.go → testsupport/space/spacerequest.go

@@ -1,11 +1,12 @@
-package testsupport
+package space
 
 import (
 	"context"
 	"testing"
 
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
 	testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space"
+	"github.com/codeready-toolchain/toolchain-e2e/testsupport/util"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 
 	"github.com/stretchr/testify/assert"
@@ -20,7 +21,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-type SpaceRequestOption func(request *toolchainv1alpha1.SpaceRequest)
+type SpaceRequestOption func(request *toolchainv1alpha1.SpaceRequest) // nolint:revive
 
 func WithSpecTargetClusterRoles(clusterRoles []string) SpaceRequestOption {
 	return func(s *toolchainv1alpha1.SpaceRequest) {
@@ -34,7 +35,7 @@ func WithSpecTierName(tierName string) SpaceRequestOption {
 	}
 }
 
-func InNamespace(namespace string) SpaceRequestOption {
+func WithNamespace(namespace string) SpaceRequestOption {
 	return func(s *toolchainv1alpha1.SpaceRequest) {
 		s.ObjectMeta.Namespace = namespace
 	}
@@ -50,7 +51,7 @@ func CreateSpaceRequest(t *testing.T, awaitilities wait.Awaitilities, memberName
 	require.NoError(t, err)
 
 	// create the space request in the "default" namespace provisioned by the parentSpace
-	spaceRequest := NewSpaceRequest(t, append(opts, InNamespace(GetDefaultNamespace(parentSpace.Status.ProvisionedNamespaces)))...)
+	spaceRequest := NewSpaceRequest(t, append(opts, WithNamespace(GetDefaultNamespace(parentSpace.Status.ProvisionedNamespaces)))...)
 	require.NotEmpty(t, spaceRequest)
 	err = memberAwait.CreateWithCleanup(t, spaceRequest)
 	require.NoError(t, err)
@@ -61,7 +62,7 @@ func CreateSpaceRequest(t *testing.T, awaitilities wait.Awaitilities, memberName
 // NewSpaceRequest initializes a new SpaceRequest object with the given options.
 // By default sets appstudio tier and tenant roles for the cluster to use
 func NewSpaceRequest(t *testing.T, opts ...SpaceRequestOption) *toolchainv1alpha1.SpaceRequest {
-	namePrefix := NewObjectNamePrefix(t)
+	namePrefix := util.NewObjectNamePrefix(t)
 
 	spaceRequest := &toolchainv1alpha1.SpaceRequest{
 		ObjectMeta: metav1.ObjectMeta{

testsupport/spacebinding.go → testsupport/spacebinding/spacebinding.go

@@ -1,4 +1,4 @@
-package testsupport
+package spacebinding
 
 import (
 	"context"

testsupport/spacebindingrequest.go → testsupport/spacebinding/spacebindingrequest.go

@@ -1,16 +1,17 @@
-package testsupport
+package spacebinding
 
 import (
 	"testing"
 
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
+	"github.com/codeready-toolchain/toolchain-e2e/testsupport/util"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type SpaceBindingRequestOption func(request *toolchainv1alpha1.SpaceBindingRequest)
+type SpaceBindingRequestOption func(request *toolchainv1alpha1.SpaceBindingRequest) //nolint:revive
 
 func WithSpecSpaceRole(spaceRole string) SpaceBindingRequestOption {
 	return func(s *toolchainv1alpha1.SpaceBindingRequest) {
@@ -33,7 +34,7 @@ func WithNamespace(ns string) SpaceBindingRequestOption {
 func CreateSpaceBindingRequest(t *testing.T, awaitilities wait.Awaitilities, memberName string, opts ...SpaceBindingRequestOption) *toolchainv1alpha1.SpaceBindingRequest {
 	memberAwait, err := awaitilities.Member(memberName)
 	require.NoError(t, err)
-	namePrefix := NewObjectNamePrefix(t)
+	namePrefix := util.NewObjectNamePrefix(t)
 
 	spaceBindingRequest := &toolchainv1alpha1.SpaceBindingRequest{
 		ObjectMeta: metav1.ObjectMeta{