Atlas Operator Import: Added E2E tests (#1544)

Author: igor-karpukhin

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0
 	github.com/Masterminds/semver/v3 v3.2.0
 	github.com/PaesslerAG/jsonpath v0.1.1
-	github.com/aws/aws-sdk-go v1.44.146
+	github.com/aws/aws-sdk-go v1.44.151
 	github.com/briandowns/spinner v1.19.0
 	github.com/evergreen-ci/shrub v0.0.0-20220520145438-44fbdf0045c8
 	github.com/gemalto/kmip-go v0.0.6-0.20210426170211-84e83580888d
@@ -22,7 +22,7 @@ require (
 	github.com/mattn/go-isatty v0.0.16
 	github.com/mongodb-forks/digest v1.0.4
 	github.com/mongodb-labs/cobra2snooty v0.12.2
-	github.com/mongodb/mongodb-atlas-kubernetes v1.4.2-0.20221201111116-f392310fe252
+	github.com/mongodb/mongodb-atlas-kubernetes v1.5.0
 	github.com/openlyinc/pointy v1.2.0
 	github.com/pelletier/go-toml v1.9.5
 	github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4
@@ -102,10 +102,10 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.23.0 // indirect
-	golang.org/x/net v0.1.0 // indirect
+	golang.org/x/net v0.2.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
-	golang.org/x/sys v0.1.0 // indirect
-	golang.org/x/term v0.1.0 // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/term v0.2.0 // indirect
 	golang.org/x/text v0.4.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect

go.sum

@@ -78,8 +78,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko
 github.com/ansel1/merry v1.5.0/go.mod h1:wUy/yW0JX0ix9GYvUbciq+bi3jW/vlKPlbpI7qdZpOw=
 github.com/ansel1/merry v1.5.1 h1:/MlZd3Irx2HQsUlOcXTTYev7N1t1Rsdnxwg6xkOVJp4=
 github.com/ansel1/merry v1.5.1/go.mod h1:wUy/yW0JX0ix9GYvUbciq+bi3jW/vlKPlbpI7qdZpOw=
-github.com/aws/aws-sdk-go v1.44.146 h1:7YdGgPxDPRJu/yYffzZp/H7yHzQ6AqmuNFZPYraaN8I=
-github.com/aws/aws-sdk-go v1.44.146/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.151 h1:2FrJZm3kTcyTtfpE7LEQT9XW+jkoi4KEvBhFWqHEZmo=
+github.com/aws/aws-sdk-go v1.44.151/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/briandowns/spinner v1.19.0 h1:s8aq38H+Qju89yhp89b4iIiMzMm8YN3p6vGpwyh/a8E=
@@ -300,17 +300,17 @@ github.com/mongodb-forks/digest v1.0.4 h1:9FrGTc7MGAchgaQBcXBnEwUM/Oo8obW7OGWxns
 github.com/mongodb-forks/digest v1.0.4/go.mod h1:eHRfgovT+dvSFfltrOa27hy1oR/rcwyDdp5H1ZQxEMA=
 github.com/mongodb-labs/cobra2snooty v0.12.2 h1:elp0tRGcOHixj00+vAvscsGelDVLjeWKBJMwDdpg7bg=
 github.com/mongodb-labs/cobra2snooty v0.12.2/go.mod h1:35BYcRwKG+Lu+bKidg7lw1RT8W4K3zLsExyMLyTZB7U=
-github.com/mongodb/mongodb-atlas-kubernetes v1.4.2-0.20221201111116-f392310fe252 h1:t8erMun/w0rn9MGCsBzi9scSEBa+QQHI7hxc3nnKQsA=
-github.com/mongodb/mongodb-atlas-kubernetes v1.4.2-0.20221201111116-f392310fe252/go.mod h1:imHiPWtckmjn8Qte2kT/tV0rKrhnQUW5jPCiq/lH/Vs=
+github.com/mongodb/mongodb-atlas-kubernetes v1.5.0 h1:czdV5fQ0DfiZOEfeu9Mvn90b7tB/y1PVf2ck9Eq8zfI=
+github.com/mongodb/mongodb-atlas-kubernetes v1.5.0/go.mod h1:AMsM1HTofYNJlx47BXZK6ngRqMRY2Dl+q55iqSsU9D0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
-github.com/onsi/gomega v1.22.1 h1:pY8O4lBfsHKZHM/6nrxkhVPUznOlIu3quZcKP/M20KI=
+github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
+github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
 github.com/openlyinc/pointy v1.2.0 h1:vbb/WoPbshyTH8j3/XYu3enlZfv+NHxAD15qTm1zbk0=
 github.com/openlyinc/pointy v1.2.0/go.mod h1:JodZOTJoBNaAQHeU0F/SwA4PL0lg4pKF7fYFpX291P0=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
@@ -492,8 +492,9 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -566,13 +567,15 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

internal/kubernetes/operator/config_exporter.go

@@ -23,13 +23,16 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/deployment"
 	"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/project"
 	"github.com/mongodb/mongodb-atlas-cli/internal/store"
+	"go.mongodb.org/atlas/mongodbatlas"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/client-go/kubernetes/scheme"
 )
 
 const (
-	yamlSeparator = "---\r\n"
+	yamlSeparator        = "---\r\n"
+	maxClusters          = 500
+	DefaultClustersCount = 10
 )
 
 type ConfigExporter struct {
@@ -43,7 +46,9 @@ type ConfigExporter struct {
 }
 
 var (
-	ErrClusterNotFound = errors.New("cluster not found")
+	ErrClusterNotFound        = errors.New("cluster not found")
+	ErrNoOpsManagerClusters   = errors.New("can not get 'clusters' object")
+	ErrNoCloudManagerClusters = errors.New("can not get 'advanced clusters' object")
 )
 
 func NewConfigExporter(dataProvider store.AtlasOperatorGenericStore, credsProvider store.CredentialsGetter, projectID, orgID string) *ConfigExporter {
@@ -146,6 +151,14 @@ func (e *ConfigExporter) exportProject() ([]runtime.Object, string, error) {
 func (e *ConfigExporter) exportDeployments(projectName string) ([]runtime.Object, error) {
 	var result []runtime.Object
 
+	if len(e.clusters) == 0 {
+		clusters, err := fetchClusterNames(e.dataProvider, e.projectID)
+		if err != nil {
+			return nil, err
+		}
+		e.clusters = clusters
+	}
+
 	for _, deploymentName := range e.clusters {
 		// Try advanced cluster first
 		if advancedCluster, err := deployment.BuildAtlasAdvancedDeployment(e.dataProvider, e.projectID, projectName, deploymentName, e.targetNamespace); err == nil {
@@ -173,3 +186,44 @@ func (e *ConfigExporter) exportDeployments(projectName string) ([]runtime.Object
 	}
 	return result, nil
 }
+
+func fetchClusterNames(clustersProvider store.AtlasAllClustersLister, projectID string) ([]string, error) {
+	result := make([]string, 0, DefaultClustersCount)
+	response, err := clustersProvider.ProjectClusters(projectID, &mongodbatlas.ListOptions{ItemsPerPage: maxClusters})
+	if err != nil {
+		return nil, err
+	}
+
+	if clusters, ok := response.(*mongodbatlas.AdvancedClustersResponse); ok {
+		if clusters == nil {
+			return nil, ErrNoCloudManagerClusters
+		}
+
+		for i := range clusters.Results {
+			cluster := clusters.Results[i]
+			if cluster == nil {
+				continue
+			}
+			result = append(result, cluster.Name)
+		}
+	}
+
+	serverlessInstances, err := clustersProvider.ServerlessInstances(projectID, &mongodbatlas.ListOptions{ItemsPerPage: maxClusters})
+	if err != nil {
+		return nil, err
+	}
+
+	if serverlessInstances == nil {
+		return result, nil
+	}
+
+	for i := range serverlessInstances.Results {
+		cluster := serverlessInstances.Results[i]
+		if cluster == nil {
+			continue
+		}
+		result = append(result, serverlessInstances.Results[i].Name)
+	}
+
+	return result, nil
+}

internal/kubernetes/operator/deployment/deployment_test.go

@@ -40,6 +40,42 @@ type MockAtlasOperatorClusterStore struct {
 	projectIDToServerlessPrivateEndpoints map[string]map[string][]mongodbatlas.ServerlessPrivateEndpointConnection
 }
 
+func (m *MockAtlasOperatorClusterStore) ServerlessInstances(projectID string, _ *mongodbatlas.ListOptions) (*mongodbatlas.ClustersResponse, error) {
+	clusters := make([]*mongodbatlas.Cluster, 0, len(m.projectToServerlessClusters[projectID]))
+
+	for clusterName := range m.projectToServerlessClusters[projectID] {
+		clusters = append(clusters, m.projectToServerlessClusters[projectID][clusterName])
+	}
+	return &mongodbatlas.ClustersResponse{
+		Links:      nil,
+		Results:    clusters,
+		TotalCount: 0,
+	}, nil
+}
+
+func (m *MockAtlasOperatorClusterStore) ProjectClusters(projectID string, _ *mongodbatlas.ListOptions) (interface{}, error) {
+	clusterNames := make([]string, 0, len(m.projectToAdvancedClusters[projectID])+len(m.projectToServerlessClusters[projectID]))
+	for k := range m.projectToAdvancedClusters[projectID] {
+		clusterNames = append(clusterNames, m.projectToAdvancedClusters[projectID][k].Name)
+	}
+	for k := range m.projectToServerlessClusters[projectID] {
+		clusterNames = append(clusterNames, m.projectToServerlessClusters[projectID][k].Name)
+	}
+
+	clusters := make([]*mongodbatlas.AdvancedCluster, 0, len(clusterNames))
+	for i := range clusterNames {
+		clusters = append(clusters, &mongodbatlas.AdvancedCluster{
+			Name:    clusterNames[i],
+			GroupID: projectID,
+		})
+	}
+	return &mongodbatlas.AdvancedClustersResponse{
+		Links:      nil,
+		Results:    clusters,
+		TotalCount: 0,
+	}, nil
+}
+
 func (m *MockAtlasOperatorClusterStore) ServerlessPrivateEndpoints(projectID, instanceName string, _ *mongodbatlas.ListOptions) ([]mongodbatlas.ServerlessPrivateEndpointConnection, error) {
 	return m.projectIDToServerlessPrivateEndpoints[projectID][instanceName], nil
 }

internal/store/operator.go

@@ -35,13 +35,19 @@ type AtlasOperatorDBUsersStore interface {
 }
 
 type AtlasOperatorClusterStore interface {
+	AtlasAllClustersLister
 	AtlasClusterDescriber
 	AtlasClusterConfigurationOptionsDescriber
 	ScheduleDescriber
 	ServerlessInstanceDescriber
 	ServerlessPrivateEndpointsLister
 }
 
+type AtlasAllClustersLister interface {
+	ClusterLister
+	ServerlessInstanceLister
+}
+
 type AtlasOperatorTeamsStore interface {
 	TeamDescriber
 	ProjectTeamLister

test/e2e/atlas/helper_test.go

@@ -24,9 +24,12 @@ import (
 	"os"
 	"os/exec"
 	"testing"
+	"time"
 
+	"github.com/mongodb-forks/digest"
 	"github.com/mongodb/mongodb-atlas-cli/test/e2e"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.mongodb.org/atlas/mongodbatlas"
 )
 
@@ -88,6 +91,136 @@ const (
 	e2eSharedMDBVer    = "5.0"
 )
 
+const (
+	defaultTimeout   = 30 * time.Minute
+	defaultTick      = 1 * time.Minute
+	ResourceNotFound = "RESOURCE_NOT_FOUND"
+)
+
+type K8SHelper struct {
+	atlasClient *mongodbatlas.Client
+	project     *mongodbatlas.Project
+	clusters    map[string]*mongodbatlas.Cluster
+	orgID       string
+	t           *testing.T
+}
+
+func NewK8sHelper(t *testing.T) *K8SHelper {
+	t.Helper()
+
+	// These ENV variables MUST be set before running the test
+	orgID := os.Getenv("MCLI_ORG_ID")
+	privateKey := os.Getenv("MCLI_PRIVATE_API_KEY")
+	publicKey := os.Getenv("MCLI_PUBLIC_API_KEY")
+	opsManagerURL := os.Getenv("MCLI_OPS_MANAGER_URL")
+	transport := digest.NewTransport(publicKey, privateKey)
+	tClient, err := transport.Client()
+	require.NoError(t, err, "can not create transport for atlas client")
+
+	atlasClient := mongodbatlas.NewClient(tClient)
+	atlasClient.BaseURL, err = url.Parse(opsManagerURL)
+	require.NoError(t, err, "can not create atlas client")
+
+	return &K8SHelper{
+		atlasClient: atlasClient,
+		t:           t,
+		orgID:       orgID,
+		clusters:    map[string]*mongodbatlas.Cluster{},
+	}
+}
+
+func (kh *K8SHelper) NewProject(project *mongodbatlas.Project) {
+	kh.t.Helper()
+
+	createdProject, resp, err := kh.atlasClient.Projects.Create(context.Background(), project, &mongodbatlas.CreateProjectOptions{})
+	require.Nil(kh.t, err, "error while creating project", err, resp.Status)
+	kh.project = createdProject
+
+	assert.Eventually(kh.t, func() bool {
+		_, _, err := kh.atlasClient.Projects.GetOneProject(context.Background(), kh.project.ID)
+		return assert.NoError(kh.t, err, "waiting for project to be created", kh.project.ID)
+	}, defaultTimeout, defaultTick, "project should've been created")
+
+	kh.t.Cleanup(func() {
+		assert.Eventually(kh.t, func() bool {
+			_, err := kh.atlasClient.Projects.Delete(context.Background(), kh.project.ID)
+			if err != nil {
+				var apiError *mongodbatlas.ErrorResponse
+				if errors.As(err, &apiError) && (apiError.ErrorCode == "GROUP_NOT_FOUND" || apiError.ErrorCode == ResourceNotFound) {
+					return true
+				}
+				return false
+			}
+			return true
+		}, defaultTimeout, defaultTick, "project should've been deleted", project.ID)
+	})
+}
+
+func (kh *K8SHelper) NewCluster(cluster *mongodbatlas.Cluster) {
+	kh.t.Helper()
+
+	require.True(kh.t, kh.project != nil, "can not create cluster without a project")
+	createdCluster, _, err := kh.atlasClient.Clusters.Create(context.Background(), kh.project.ID, cluster)
+	require.Nil(kh.t, err, "error while creating cluster")
+
+	kh.clusters[cluster.Name] = createdCluster
+
+	assert.Eventually(kh.t, func() bool {
+		_, _, err := kh.atlasClient.Clusters.Get(context.Background(), kh.project.ID, cluster.Name)
+		return assert.NoError(kh.t, err, "waiting for cluster to be created", cluster.Name)
+	}, defaultTimeout, defaultTick, "cluster should've been created")
+
+	kh.t.Cleanup(func() {
+		assert.Eventually(kh.t, func() bool {
+			_, err := kh.atlasClient.Clusters.Delete(context.Background(), kh.project.ID, cluster.Name)
+			if !assert.NoError(kh.t, err, "can not delete test cluster", cluster.Name) {
+				return false
+			}
+			_, _, err = kh.atlasClient.Clusters.Get(context.Background(), kh.project.ID, cluster.Name)
+			if err != nil {
+				var apiError *mongodbatlas.ErrorResponse
+				if errors.As(err, &apiError) && (apiError.ErrorCode == "CLUSTER_NOT_FOUND" || apiError.ErrorCode == ResourceNotFound) {
+					return true
+				}
+				return false
+			}
+			return true
+		}, defaultTimeout, defaultTick, "cluster should've been deleted", cluster.Name, cluster.ID)
+	})
+}
+
+func (kh *K8SHelper) NewServerlessInstance(instance *mongodbatlas.ServerlessCreateRequestParams) {
+	kh.t.Helper()
+	require.True(kh.t, kh.project != nil, "can not create serverless instance without a project")
+	createdInstance, _, err := kh.atlasClient.ServerlessInstances.Create(context.Background(), kh.project.ID, instance)
+	require.Nil(kh.t, err, "error while creating serverless instance")
+
+	kh.clusters[createdInstance.Name] = createdInstance
+
+	assert.Eventually(kh.t, func() bool {
+		_, _, err := kh.atlasClient.ServerlessInstances.Get(context.Background(), kh.project.ID, createdInstance.Name)
+		return assert.NoError(kh.t, err, "waiting for serverless instance to be created", createdInstance.Name)
+	}, defaultTimeout, defaultTick, "serverless instance should've been created")
+
+	kh.t.Cleanup(func() {
+		assert.Eventually(kh.t, func() bool {
+			_, err := kh.atlasClient.ServerlessInstances.Delete(context.Background(), kh.project.ID, createdInstance.Name)
+			if !assert.NoError(kh.t, err, "can not delete test cluster", createdInstance.Name) {
+				return false
+			}
+			_, _, err = kh.atlasClient.ServerlessInstances.Get(context.Background(), kh.project.ID, createdInstance.Name)
+			if err != nil {
+				var apiError *mongodbatlas.ErrorResponse
+				if errors.As(err, &apiError) && (apiError.ErrorCode == "SERVERLESS_INSTANCE_NOT_FOUND" || apiError.ErrorCode == ResourceNotFound) {
+					return true
+				}
+				return false
+			}
+			return true
+		}, defaultTimeout, defaultTick, "serverless instance should've been deleted", createdInstance.Name, createdInstance.ID)
+	})
+}
+
 func deployClusterForProject(projectID string) (string, error) {
 	cliPath, err := e2e.AtlasCLIBin()
 	if err != nil {