fix

fmenezes · fmenezes · commit 0fabf9a90054 · 2025-03-24T16:51:58.000Z
diff --git a/test/e2e/access_lists_test.go b/test/e2e/access_lists_test.go
@@ -33,7 +33,7 @@ func TestAccessList(t *testing.T) {
 	g := newAtlasE2ETestGenerator(t)
 	g.generateProject("accessList")
 
-	n := memory(t, "rand", must(RandInt(255)))
+	n := memoryRand(t, "rand", 255)
 	req := require.New(t)
 
 	entry := fmt.Sprintf("192.168.0.%d", n)
diff --git a/test/e2e/alert_settings_test.go b/test/e2e/alert_settings_test.go
@@ -146,7 +146,7 @@ func TestAlertConfig(t *testing.T) {
 	})
 
 	t.Run("Update Setting using file input", func(t *testing.T) {
-		n := memory(t, "rand", must(RandInt(1000)))
+		n := memoryRand(t, "rand", 1000)
 		fileName := fmt.Sprintf("%d_alerts.json", n.Int64())
 		fileContent := fmt.Sprintf(`{
 			"eventTypeName": %q,
diff --git a/test/e2e/atlas_org_api_key_access_list_test.go b/test/e2e/atlas_org_api_key_access_list_test.go
@@ -40,7 +40,7 @@ func TestAtlasOrgAPIKeyAccessList(t *testing.T) {
 		require.NoError(t, deleteOrgAPIKey(apiKeyID))
 	})
 
-	n := memory(t, "rand", must(RandInt(255)))
+	n := memoryRand(t, "rand", 255)
 	entry := fmt.Sprintf("192.168.0.%d", n)
 
 	t.Run("Create", func(t *testing.T) {
diff --git a/test/e2e/atlas_org_invitations_test.go b/test/e2e/atlas_org_invitations_test.go
@@ -32,7 +32,7 @@ func TestAtlasOrgInvitations(t *testing.T) {
 	cliPath, err := AtlasCLIBin()
 	require.NoError(t, err)
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 
 	emailOrg := fmt.Sprintf("test-%v@mongodb.com", n)
 	var orgInvitationID string
diff --git a/test/e2e/atlas_orgs_test.go b/test/e2e/atlas_orgs_test.go
@@ -81,7 +81,7 @@ func TestAtlasOrgs(t *testing.T) {
 	})
 	require.NotEmpty(t, userID)
 
-	n := memory(t, "rand", must(RandInt(255)))
+	n := memoryRand(t, "rand", 255)
 	require.NoError(t, err)
 	orgName := fmt.Sprintf("e2e-org-%v", n)
 	var (
diff --git a/test/e2e/atlas_project_invitations_test.go b/test/e2e/atlas_project_invitations_test.go
@@ -36,7 +36,7 @@ func TestAtlasProjectInvitations(t *testing.T) {
 	g.generateProject("invitations")
 
 	var invitationID string
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 	require.NoError(t, err)
 
 	emailProject := fmt.Sprintf("test-%v@mongodb.com", n)
diff --git a/test/e2e/atlas_project_teams_test.go b/test/e2e/atlas_project_teams_test.go
@@ -36,7 +36,7 @@ func TestAtlasProjectTeams(t *testing.T) {
 	g := newAtlasE2ETestGenerator(t)
 	g.generateProject("teams")
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 	teamName := fmt.Sprintf("e2e-teams-%v", n)
 	teamID, err := createTeam(teamName)
 	require.NoError(t, err)
diff --git a/test/e2e/atlas_projects_test.go b/test/e2e/atlas_projects_test.go
@@ -36,7 +36,7 @@ func TestAtlasProjects(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 	projectName := fmt.Sprintf("e2e-proj-%d", n)
 
 	var projectID string
diff --git a/test/e2e/atlas_team_users_test.go b/test/e2e/atlas_team_users_test.go
@@ -33,7 +33,7 @@ func TestAtlasTeamUsers(t *testing.T) {
 	cliPath, err := AtlasCLIBin()
 	require.NoError(t, err)
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 
 	teamName := fmt.Sprintf("teams%v", n)
 	teamID, err := createTeam(teamName)
diff --git a/test/e2e/atlas_teams_test.go b/test/e2e/atlas_teams_test.go
@@ -35,7 +35,7 @@ func TestAtlasTeams(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 
 	teamName := fmt.Sprintf("teams%v", n)
 	var teamID string
diff --git a/test/e2e/atlas_users_test.go b/test/e2e/atlas_users_test.go
@@ -95,7 +95,7 @@ func TestAtlasUsers(t *testing.T) {
 	})
 
 	t.Run("Invite", func(t *testing.T) {
-		n := memory(t, "rand", must(RandInt(10000)))
+		n := memoryRand(t, "rand", 10000)
 		emailUser := fmt.Sprintf("cli-test-%v@moongodb.com", n)
 		if revision, ok := os.LookupEnv("revision"); ok {
 			emailUser = fmt.Sprintf("cli-test-%v-%s@moongodb.com", n, revision)
diff --git a/test/e2e/custom_db_roles_test.go b/test/e2e/custom_db_roles_test.go
@@ -40,7 +40,7 @@ const (
 
 func TestDBRoles(t *testing.T) {
 	setup(t)
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 
 	roleName := fmt.Sprintf("role-%v", n)
 
diff --git a/test/e2e/data_federation_db_test.go b/test/e2e/data_federation_db_test.go
@@ -36,7 +36,7 @@ func TestDataFederation(t *testing.T) {
 	r := require.New(t)
 	r.NoError(err)
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 
 	dataFederationName := fmt.Sprintf("e2e-data-federation-%v", n)
 	testBucket := os.Getenv("E2E_TEST_BUCKET")
diff --git a/test/e2e/data_federation_private_endpoint_test.go b/test/e2e/data_federation_private_endpoint_test.go
@@ -35,7 +35,7 @@ func TestDataFederationPrivateEndpointsAWS(t *testing.T) {
 	cliPath, err := AtlasCLIBin()
 	require.NoError(t, err)
 
-	n := memory(t, "rand", must(RandInt(int64(8000))))
+	n := memoryRand(t, "rand", int64(8000))
 	vpcID := fmt.Sprintf("vpce-0fcd9d80bbafe%d", 1000+n.Int64())
 
 	t.Run("Create", func(t *testing.T) {
diff --git a/test/e2e/data_federation_query_limit_test.go b/test/e2e/data_federation_query_limit_test.go
@@ -33,7 +33,7 @@ func TestDataFederationQueryLimit(t *testing.T) {
 	r := require.New(t)
 	r.NoError(err)
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 	dataFederationName := fmt.Sprintf("e2e-data-federation-%v", n)
 	testBucket := os.Getenv("E2E_TEST_BUCKET")
 	r.NotEmpty(testBucket)
diff --git a/test/e2e/dbusers_certs_test.go b/test/e2e/dbusers_certs_test.go
@@ -30,7 +30,7 @@ import (
 
 func TestDBUserCerts(t *testing.T) {
 	setup(t)
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 	username := fmt.Sprintf("user%v", n)
 
 	cliPath, err := AtlasCLIBin()
diff --git a/test/e2e/integrations_test.go b/test/e2e/integrations_test.go
@@ -32,14 +32,14 @@ func TestIntegrations(t *testing.T) {
 	g := newAtlasE2ETestGenerator(t)
 	g.generateProject("integrations")
 
-	n := memory(t, "rand", must(RandInt(255)))
+	n := memoryRand(t, "rand", 255)
 	key := "51c0ef87e9951c3e147accf0e12" + n.String()
 
 	cliPath, err := AtlasCLIBin()
 	require.NoError(t, err)
 
 	t.Run("Create DATADOG", func(t *testing.T) {
-		n := memory(t, "rand", must(RandInt(9)))
+		n := memoryRand(t, "rand", 9)
 		datadogKey := "000000000000000000000000000000" + n.String() + n.String()
 		if IsGov() {
 			t.Skip("Skipping DATADOG integration test, cloudgov does not have an available datadog region")
@@ -64,7 +64,7 @@ func TestIntegrations(t *testing.T) {
 	})
 
 	t.Run("Create OPSGENIE", func(t *testing.T) {
-		n := memory(t, "rand", must(RandInt(9)))
+		n := memoryRand(t, "rand", 9)
 		opsGenieKey := "00000000-aaaa-2222-bbbb-3333333333" + n.String() + n.String()
 		cmd := exec.Command(cliPath,
 			integrationsEntity,
@@ -87,7 +87,7 @@ func TestIntegrations(t *testing.T) {
 	})
 
 	t.Run("Create PAGER_DUTY", func(t *testing.T) {
-		n := memory(t, "rand", must(RandInt(9)))
+		n := memoryRand(t, "rand", 9)
 		pagerDutyKey := "000000000000000000000000000000" + n.String() + n.String()
 		cmd := exec.Command(cliPath,
 			integrationsEntity,
@@ -110,7 +110,7 @@ func TestIntegrations(t *testing.T) {
 	})
 
 	t.Run("Create VICTOR_OPS", func(t *testing.T) {
-		n := memory(t, "rand", must(RandInt(9)))
+		n := memoryRand(t, "rand", 9)
 		victorOpsKey := "fa07bbc8-eab2-4085-81af-daed47dc1c" + n.String() + n.String()
 		cmd := exec.Command(cliPath,
 			integrationsEntity,
diff --git a/test/e2e/private_endpoint_test.go b/test/e2e/private_endpoint_test.go
@@ -42,7 +42,7 @@ func TestPrivateEndpointsAWS(t *testing.T) {
 	g := newAtlasE2ETestGenerator(t)
 	g.generateProject("privateEndpointsAWS")
 
-	n := memory(t, "rand", must(RandInt(int64(len(regionsAWS)))))
+	n := memoryRand(t, "rand", int64(len(regionsAWS)))
 
 	cliPath, err := AtlasCLIBin()
 	require.NoError(t, err)
@@ -162,7 +162,7 @@ func TestPrivateEndpointsAzure(t *testing.T) {
 	g := newAtlasE2ETestGenerator(t)
 	g.generateProject("privateEndpointsAzure")
 
-	n := memory(t, "rand", must(RandInt(int64(len(regionsAzure)))))
+	n := memoryRand(t, "rand", int64(len(regionsAzure)))
 
 	cliPath, err := AtlasCLIBin()
 	require.NoError(t, err)
@@ -291,7 +291,7 @@ func TestPrivateEndpointsGCP(t *testing.T) {
 	g := newAtlasE2ETestGenerator(t)
 	g.generateProject("privateEndpointsGPC")
 
-	n := memory(t, "rand", must(RandInt(int64(len(regionsGCP)))))
+	n := memoryRand(t, "rand", int64(len(regionsGCP)))
 
 	region := regionsGCP[n.Int64()]
 
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
@@ -40,7 +40,7 @@ func TestSearch(t *testing.T) {
 	cliPath, err := AtlasCLIBin()
 	r.NoError(err)
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 	indexName := fmt.Sprintf("index-%v", n)
 	var indexID string
 
@@ -367,7 +367,7 @@ func TestSearch(t *testing.T) {
 	})
 
 	t.Run("Create array mapping", func(t *testing.T) {
-		n := memory(t, "rand", must(RandInt(1000)))
+		n := memoryRand(t, "rand", 1000)
 		r.NoError(err)
 		indexName := fmt.Sprintf("index-array-%v", n)
 		fileName := fmt.Sprintf("create_index_search_test-array-%v.json", n)
@@ -456,7 +456,7 @@ func TestSearchDeprecated(t *testing.T) {
 	cliPath, err := AtlasCLIBin()
 	r.NoError(err)
 
-	n := memory(t, "rand", must(RandInt(1000)))
+	n := memoryRand(t, "rand", 1000)
 	indexName := fmt.Sprintf("index-%v", n)
 	var indexID string
 
@@ -775,7 +775,7 @@ func TestSearchDeprecated(t *testing.T) {
 	})
 
 	t.Run("Create array mapping", func(t *testing.T) {
-		n := memory(t, "rand", must(RandInt(1000)))
+		n := memoryRand(t, "rand", 1000)
 		r.NoError(err)
 		indexName := fmt.Sprintf("index-array-%v", n)
 		fileName := fmt.Sprintf("create_index_search_test-array-%v.json", n)
diff --git a/test/e2e/snapshot_test.go b/test/e2e/snapshot_test.go
@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"math/big"
 	"net/http"
 	"net/http/httptest"
 	"net/http/httputil"
@@ -37,15 +38,17 @@ var memoryMap = map[string]map[string]any{}
 func snapshotDir(t *testing.T) string {
 	t.Helper()
 
+	testName, _ := splitTestName(t)
+
 	dir, err := os.Getwd()
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	if strings.HasSuffix(dir, "test/e2e") {
-		dir = path.Join(dir, ".snapshots", t.Name())
+		dir = path.Join(dir, ".snapshots", testName)
 	} else {
-		dir = path.Join(dir, "test/e2e/.snapshots", t.Name())
+		dir = path.Join(dir, "test/e2e/.snapshots", testName)
 	}
 
 	if err := enforceSnapshotDir(dir); err != nil {
@@ -73,14 +76,16 @@ func snapshotName(t *testing.T, r *http.Request) string {
 
 	dir := snapshotDir(t)
 
+	testName, _ := splitTestName(t)
+
 	filename := fmt.Sprintf("%s/%s_%s", dir, r.Method, strings.ReplaceAll(strings.ReplaceAll(r.URL.Path, "/", "_"), ":", "_"))
 
-	if fileIDs[t.Name()] == nil {
-		fileIDs[t.Name()] = map[string]int{}
+	if fileIDs[testName] == nil {
+		fileIDs[testName] = map[string]int{}
 	}
-	fileIDs[t.Name()][filename]++
+	fileIDs[testName][filename]++
 
-	id := fileIDs[t.Name()][filename]
+	id := fileIDs[testName][filename]
 
 	return fmt.Sprintf("%s_%d.json", filename, id)
 }
@@ -242,17 +247,32 @@ func snapshotServer(t *testing.T) {
 	t.Setenv("MONGODB_ATLAS_OPS_MANAGER_URL", server.URL)
 }
 
+func splitTestName(t *testing.T) (string, string) {
+	t.Helper()
+
+	parts := strings.SplitN(t.Name(), "/", 2)
+	if len(parts) == 1 {
+		return parts[0], ""
+	}
+	return parts[0], parts[1]
+}
+
 func memory[T any](t *testing.T, key string, value T) T {
 	t.Helper()
 
-	if memoryMap[t.Name()] == nil {
-		memoryMap[t.Name()] = map[string]any{}
+	testName, subTestName := splitTestName(t)
+	if subTestName != "" {
+		key = subTestName + "/" + key
+	}
+
+	if memoryMap[testName] == nil {
+		memoryMap[testName] = map[string]any{}
 	}
 	if updateSnapshots() {
-		memoryMap[t.Name()][key] = value
+		memoryMap[testName][key] = value
 		return value
 	}
-	data, ok := memoryMap[t.Name()][key]
+	data, ok := memoryMap[testName][key]
 	if !ok {
 		t.Fatalf("memory key %q not found", key)
 	}
@@ -263,6 +283,49 @@ func memory[T any](t *testing.T, key string, value T) T {
 	return r
 }
 
+func memoryFunc[T any](t *testing.T, key string, value T, marshal func(value T) ([]byte, error), unmarshal func([]byte) (T, error)) T {
+	t.Helper()
+
+	testName, subTestName := splitTestName(t)
+	if subTestName != "" {
+		key = subTestName + "/" + key
+	}
+	if memoryMap[testName] == nil {
+		memoryMap[testName] = map[string]any{}
+	}
+	if updateSnapshots() {
+		data, err := marshal(value)
+		if err != nil {
+			t.Fatalf("marshal: %v", err)
+		}
+		memoryMap[testName][key] = base64.StdEncoding.EncodeToString(data)
+		return value
+	}
+	data, ok := memoryMap[testName][key]
+	if !ok {
+		t.Fatalf("memory key %q not found", key)
+	}
+	buf, err := base64.StdEncoding.DecodeString(data.(string))
+	if err != nil {
+		t.Fatalf("decode: %v", err)
+	}
+	r, err := unmarshal(buf)
+	if err != nil {
+		t.Fatalf("unmarshal: %v", err)
+	}
+	return r
+}
+
+func memoryRand(t *testing.T, key string, n int64) *big.Int { //nolint:unparam // in case there are more than one random values in the same test
+	t.Helper()
+
+	return memoryFunc(t, key, must(RandInt(n)), func(value *big.Int) ([]byte, error) {
+		return value.Bytes(), nil
+	}, func(data []byte) (*big.Int, error) {
+		return new(big.Int).SetBytes(data), nil
+	})
+}
+
 func setup(t *testing.T) {
 	t.Helper()
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func TestAtlasProjects(t *testing.T) {`
`36`	`36`	`t.Fatalf("unexpected error: %v", err)`
`37`	`37`	`}`
`38`	`38`
`39`		`- n := memory(t, "rand", must(RandInt(1000)))`
	`39`	`+ n := memoryRand(t, "rand", 1000)`
`40`	`40`	`projectName := fmt.Sprintf("e2e-proj-%d", n)`
`41`	`41`
`42`	`42`	`var projectID string`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func TestAtlasTeams(t *testing.T) {`
`35`	`35`	`t.Fatalf("unexpected error: %v", err)`
`36`	`36`	`}`
`37`	`37`
`38`		`- n := memory(t, "rand", must(RandInt(1000)))`
	`38`	`+ n := memoryRand(t, "rand", 1000)`
`39`	`39`
`40`	`40`	`teamName := fmt.Sprintf("teams%v", n)`
`41`	`41`	`var teamID string`