Skip to content

Commit 8fec786

Browse files
committed
fix
1 parent 2453726 commit 8fec786

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

test/e2e/atlas_e2e_test_generator_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (g *atlasE2ETestGenerator) generateClusterWithPrefix(prefix string) {
145145
g.mDBVer = mdbVersion
146146
}
147147

148-
g.clusterName = memory(g.t, prefix+"GenerateClusterName", prefix+must(RandClusterName()))
148+
g.clusterName = memory(g.t, prefix+"GenerateClusterName", must(RandClusterNameWithPrefix(prefix)))
149149

150150
g.clusterRegion, err = deployClusterForProject(g.projectID, g.clusterName, g.tier, g.mDBVer, g.enableBackup)
151151
if err != nil {
@@ -168,7 +168,7 @@ func (g *atlasE2ETestGenerator) generateClusterWithPrefix(prefix string) {
168168

169169
// generateCluster generates a new cluster and also registers its deletion on test cleanup.
170170
func (g *atlasE2ETestGenerator) generateCluster() {
171-
g.generateClusterWithPrefix("")
171+
g.generateClusterWithPrefix("cluster")
172172
}
173173

174174
// generateProjectAndCluster calls both generateProject and generateCluster.

test/e2e/helper_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,14 +542,18 @@ func newAvailableRegion(projectID, tier, provider string) (string, error) {
542542
}
543543

544544
func RandClusterName() (string, error) {
545+
return RandClusterNameWithPrefix("cluster")
546+
}
547+
548+
func RandClusterNameWithPrefix(prefix string) (string, error) {
545549
n, err := RandInt(1000)
546550
if err != nil {
547551
return "", err
548552
}
549553
if revision, ok := os.LookupEnv("revision"); ok {
550-
return fmt.Sprintf("cluster-%v-%s", n, revision), nil
554+
return fmt.Sprintf("%s-%v-%s", prefix, n, revision), nil
551555
}
552-
return fmt.Sprintf("cluster-%v", n), nil
556+
return fmt.Sprintf("%s-%v", prefix, n), nil
553557
}
554558

555559
func RandIdentityProviderName() (string, error) {

0 commit comments

Comments
 (0)