Skip to content

chore: move all e2e tests into a single package #3759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 21, 2025
Merged

chore: move all e2e tests into a single package #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4351c16
chore: move all e2e tests into a single package
fmenezes Mar 21, 2025
568b489
move helper functions
fmenezes Mar 21, 2025
dea0ca6
fix
fmenezes Mar 21, 2025
bf909cd
remove om60 references
fmenezes Mar 21, 2025
37eaab2
fix
fmenezes Mar 21, 2025
3360680
fix
fmenezes Mar 21, 2025
72a10f6
fix
fmenezes Mar 21, 2025
6ec4561
fix
fmenezes Mar 21, 2025
c542132
fix
fmenezes Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ATLAS_INSTALL_PATH="${GOPATH}/bin/$(ATLAS_BINARY_NAME)"

LOCALDEV_IMAGE?=docker.io/mongodb/mongodb-atlas-local
LINKER_FLAGS=-s -w -X github.com/mongodb/mongodb-atlas-cli/atlascli/internal/version.GitCommit=${GIT_SHA} -X github.com/mongodb/mongodb-atlas-cli/atlascli/internal/version.Version=${ATLAS_VERSION} -X github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options.LocalDevImage=${LOCALDEV_IMAGE}
ATLAS_E2E_BINARY?=../../../bin/${ATLAS_BINARY_NAME}
ATLAS_E2E_BINARY?=../../bin/${ATLAS_BINARY_NAME}

DEBUG_FLAGS=all=-N -l

Expand Down
23 changes: 11 additions & 12 deletions test/e2e/atlas/access_lists_test.go → test/e2e/access_lists_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.
//go:build e2e || (atlas && generic)

package atlas_test
package e2e_test

import (
"encoding/json"
Expand All @@ -23,7 +23,6 @@ import (
"testing"
"time"

"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
atlasv2 "go.mongodb.org/atlas-sdk/v20250219001/admin"
Expand All @@ -33,14 +32,14 @@ func TestAccessList(t *testing.T) {
g := newAtlasE2ETestGenerator(t)
g.generateProject("accessList")

n, err := e2e.RandInt(255)
n, err := RandInt(255)
req := require.New(t)
req.NoError(err)

entry := fmt.Sprintf("192.168.0.%d", n)
currentIPEntry := ""

cliPath, err := e2e.AtlasCLIBin()
cliPath, err := AtlasCLIBin()
req.NoError(err)

t.Run("Create Forever", func(t *testing.T) {
Expand All @@ -53,7 +52,7 @@ func TestAccessList(t *testing.T) {
g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err)

var entries *atlasv2.PaginatedNetworkAccess
Expand All @@ -78,7 +77,7 @@ func TestAccessList(t *testing.T) {
g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var entries *atlasv2.PaginatedNetworkAccess
require.NoError(t, json.Unmarshal(resp, &entries))
Expand All @@ -93,7 +92,7 @@ func TestAccessList(t *testing.T) {
g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var entry *atlasv2.NetworkPermissionEntry
require.NoError(t, json.Unmarshal(resp, &entry))
Expand All @@ -108,7 +107,7 @@ func TestAccessList(t *testing.T) {
g.projectID,
"--force")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))

expected := fmt.Sprintf("Project access list entry '%s' deleted\n", entry)
Expand All @@ -126,7 +125,7 @@ func TestAccessList(t *testing.T) {
g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))

var entries *atlasv2.PaginatedNetworkAccess
Expand All @@ -151,7 +150,7 @@ func TestAccessList(t *testing.T) {
g.projectID,
"--force")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))

expected := fmt.Sprintf("Project access list entry '%s' deleted\n", entry)
Expand All @@ -168,7 +167,7 @@ func TestAccessList(t *testing.T) {
g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))

var entries *atlasv2.PaginatedNetworkAccess
Expand All @@ -190,7 +189,7 @@ func TestAccessList(t *testing.T) {
g.projectID,
"--force")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))

expected := fmt.Sprintf("Project access list entry '%s' deleted\n", currentIPEntry)
Expand Down
9 changes: 4 additions & 5 deletions test/e2e/atlas/access_logs_test.go → test/e2e/access_logs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@
// limitations under the License.
//go:build e2e || (atlas && logs)

package atlas_test
package e2e_test

import (
"encoding/json"
"os"
"os/exec"
"testing"

"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
"github.com/stretchr/testify/require"
atlasv2 "go.mongodb.org/atlas-sdk/v20250219001/admin"
)
Expand All @@ -35,7 +34,7 @@ func TestAccessLogs(t *testing.T) {
h, err := g.getHostname()
req.NoError(err)

cliPath, err := e2e.AtlasCLIBin()
cliPath, err := AtlasCLIBin()
req.NoError(err)

t.Run("List by clusterName", func(t *testing.T) {
Expand All @@ -46,7 +45,7 @@ func TestAccessLogs(t *testing.T) {
"--projectId", g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var entries *atlasv2.MongoDBAccessLogsList
require.NoError(t, json.Unmarshal(resp, &entries))
Expand All @@ -60,7 +59,7 @@ func TestAccessLogs(t *testing.T) {
"--projectId", g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var entries *atlasv2.MongoDBAccessLogsList
require.NoError(t, json.Unmarshal(resp, &entries))
Expand Down
9 changes: 4 additions & 5 deletions test/e2e/atlas/access_roles_test.go → test/e2e/access_roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@
// limitations under the License.
//go:build e2e || (atlas && generic)

package atlas_test
package e2e_test

import (
"encoding/json"
"os"
"os/exec"
"testing"

"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
atlasv2 "go.mongodb.org/atlas-sdk/v20250219001/admin"
Expand All @@ -33,7 +32,7 @@ func TestAccessRoles(t *testing.T) {
g := newAtlasE2ETestGenerator(t)
g.generateProject("accessRoles")

cliPath, err := e2e.AtlasCLIBin()
cliPath, err := AtlasCLIBin()
require.NoError(t, err)

t.Run("Create", func(t *testing.T) {
Expand All @@ -46,7 +45,7 @@ func TestAccessRoles(t *testing.T) {
g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))

var iamRole atlasv2.CloudProviderAccessRole
Expand All @@ -63,7 +62,7 @@ func TestAccessRoles(t *testing.T) {
g.projectID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var roles atlasv2.CloudProviderAccessRoles
require.NoError(t, json.Unmarshal(resp, &roles))
Expand Down
39 changes: 19 additions & 20 deletions test/e2e/atlas/alert_settings_test.go → test/e2e/alert_settings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

//go:build e2e || (atlas && generic)

package atlas_test
package e2e_test

import (
"encoding/json"
Expand All @@ -24,7 +24,6 @@ import (
"strconv"
"testing"

"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.mongodb.org/atlas-sdk/v20250219001/admin"
Expand All @@ -33,13 +32,13 @@ import (
func TestAlertConfig(t *testing.T) {
var alertID string

cliPath, err := e2e.AtlasCLIBin()
cliPath, err := AtlasCLIBin()
require.NoError(t, err)

t.Run("Create", func(t *testing.T) {
cmd := exec.Command(cliPath,
alertsEntity,
configEntity,
settingsEntity,
"create",
"--event",
eventTypeName,
Expand All @@ -54,7 +53,7 @@ func TestAlertConfig(t *testing.T) {
"--notificationEmailEnabled=true",
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var alert admin.GroupAlertsConfig
require.NoError(t, json.Unmarshal(resp, &alert))
Expand All @@ -74,12 +73,12 @@ func TestAlertConfig(t *testing.T) {
t.Run("Describe", func(t *testing.T) {
cmd := exec.Command(cliPath,
alertsEntity,
configEntity,
settingsEntity,
"get",
alertID,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var config admin.GroupAlertsConfig
require.NoError(t, json.Unmarshal(resp, &config))
Expand All @@ -89,11 +88,11 @@ func TestAlertConfig(t *testing.T) {
t.Run("List", func(t *testing.T) {
cmd := exec.Command(cliPath,
alertsEntity,
configEntity,
settingsEntity,
"ls",
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var config admin.PaginatedAlertConfig
require.NoError(t, json.Unmarshal(resp, &config))
Expand All @@ -103,12 +102,12 @@ func TestAlertConfig(t *testing.T) {
t.Run("List Compact", func(t *testing.T) {
cmd := exec.Command(cliPath,
alertsEntity,
configEntity,
settingsEntity,
"ls",
"-c",
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
var config []admin.GroupAlertsConfig
require.NoError(t, json.Unmarshal(resp, &config))
Expand All @@ -118,7 +117,7 @@ func TestAlertConfig(t *testing.T) {
t.Run("Update", func(t *testing.T) {
cmd := exec.Command(cliPath,
alertsEntity,
configEntity,
settingsEntity,
"update",
alertID,
"--event",
Expand All @@ -133,7 +132,7 @@ func TestAlertConfig(t *testing.T) {
"--notificationEmailEnabled=true",
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)

a := assert.New(t)
require.NoError(t, err, string(resp))
Expand All @@ -146,7 +145,7 @@ func TestAlertConfig(t *testing.T) {
})

t.Run("Update Setting using file input", func(t *testing.T) {
n, err := e2e.RandInt(1000)
n, err := RandInt(1000)
require.NoError(t, err)
fileName := fmt.Sprintf("%d_alerts.json", n.Int64())
fileContent := fmt.Sprintf(`{
Expand All @@ -169,13 +168,13 @@ func TestAlertConfig(t *testing.T) {

cmd := exec.Command(cliPath,
alertsEntity,
configEntity,
settingsEntity,
"update",
alertID,
"--file", fileName,
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)

a := assert.New(t)
require.NoError(t, err, string(resp))
Expand All @@ -188,21 +187,21 @@ func TestAlertConfig(t *testing.T) {
})

t.Run("Delete", func(t *testing.T) {
cmd := exec.Command(cliPath, alertsEntity, configEntity, "delete", alertID, "--force")
cmd := exec.Command(cliPath, alertsEntity, settingsEntity, "delete", alertID, "--force")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))
})

t.Run("List Matcher Fields", func(t *testing.T) {
cmd := exec.Command(cliPath,
alertsEntity,
configEntity,
settingsEntity,
"fields",
"type",
"-o=json")
cmd.Env = os.Environ()
resp, err := e2e.RunAndGetStdOut(cmd)
resp, err := RunAndGetStdOut(cmd)
require.NoError(t, err, string(resp))

var fields []string
Expand Down
Loading
Loading