Skip to content

Commit 4351c16

Browse files
fmenezesfmenezes
committed
chore: move all e2e tests into a single package
1 parent 76d09fe commit 4351c16

File tree

119 files changed

+878
-1123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+878
-1123
lines changed

‎test/e2e/atlas/access_lists_test.go‎ renamed to ‎test/e2e/access_lists_test.go‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414
//go:build e2e || (atlas && generic)
1515

16-
package atlas_test
16+
package e2e_test
1717

1818
import (
1919
"encoding/json"
@@ -23,7 +23,6 @@ import (
2323
"testing"
2424
"time"
2525

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

36-
n, err := e2e.RandInt(255)
35+
n, err := RandInt(255)
3736
req := require.New(t)
3837
req.NoError(err)
3938

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

43-
cliPath, err := e2e.AtlasCLIBin()
42+
cliPath, err := AtlasCLIBin()
4443
req.NoError(err)
4544

4645
t.Run("Create Forever", func(t *testing.T) {
@@ -53,7 +52,7 @@ func TestAccessList(t *testing.T) {
5352
g.projectID,
5453
"-o=json")
5554
cmd.Env = os.Environ()
56-
resp, err := e2e.RunAndGetStdOut(cmd)
55+
resp, err := RunAndGetStdOut(cmd)
5756
require.NoError(t, err)
5857

5958
var entries *atlasv2.PaginatedNetworkAccess
@@ -78,7 +77,7 @@ func TestAccessList(t *testing.T) {
7877
g.projectID,
7978
"-o=json")
8079
cmd.Env = os.Environ()
81-
resp, err := e2e.RunAndGetStdOut(cmd)
80+
resp, err := RunAndGetStdOut(cmd)
8281
require.NoError(t, err, string(resp))
8382
var entries *atlasv2.PaginatedNetworkAccess
8483
require.NoError(t, json.Unmarshal(resp, &entries))
@@ -93,7 +92,7 @@ func TestAccessList(t *testing.T) {
9392
g.projectID,
9493
"-o=json")
9594
cmd.Env = os.Environ()
96-
resp, err := e2e.RunAndGetStdOut(cmd)
95+
resp, err := RunAndGetStdOut(cmd)
9796
require.NoError(t, err, string(resp))
9897
var entry *atlasv2.NetworkPermissionEntry
9998
require.NoError(t, json.Unmarshal(resp, &entry))
@@ -108,7 +107,7 @@ func TestAccessList(t *testing.T) {
108107
g.projectID,
109108
"--force")
110109
cmd.Env = os.Environ()
111-
resp, err := e2e.RunAndGetStdOut(cmd)
110+
resp, err := RunAndGetStdOut(cmd)
112111
require.NoError(t, err, string(resp))
113112

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

132131
var entries *atlasv2.PaginatedNetworkAccess
@@ -151,7 +150,7 @@ func TestAccessList(t *testing.T) {
151150
g.projectID,
152151
"--force")
153152
cmd.Env = os.Environ()
154-
resp, err := e2e.RunAndGetStdOut(cmd)
153+
resp, err := RunAndGetStdOut(cmd)
155154
require.NoError(t, err, string(resp))
156155

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

174173
var entries *atlasv2.PaginatedNetworkAccess
@@ -190,7 +189,7 @@ func TestAccessList(t *testing.T) {
190189
g.projectID,
191190
"--force")
192191
cmd.Env = os.Environ()
193-
resp, err := e2e.RunAndGetStdOut(cmd)
192+
resp, err := RunAndGetStdOut(cmd)
194193
require.NoError(t, err, string(resp))
195194

196195
expected := fmt.Sprintf("Project access list entry '%s' deleted\n", currentIPEntry)

‎test/e2e/atlas/access_logs_test.go‎ renamed to ‎test/e2e/access_logs_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
// limitations under the License.
1414
//go:build e2e || (atlas && logs)
1515

16-
package atlas_test
16+
package e2e_test
1717

1818
import (
1919
"encoding/json"
2020
"os"
2121
"os/exec"
2222
"testing"
2323

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

38-
cliPath, err := e2e.AtlasCLIBin()
37+
cliPath, err := AtlasCLIBin()
3938
req.NoError(err)
4039

4140
t.Run("List by clusterName", func(t *testing.T) {
@@ -46,7 +45,7 @@ func TestAccessLogs(t *testing.T) {
4645
"--projectId", g.projectID,
4746
"-o=json")
4847
cmd.Env = os.Environ()
49-
resp, err := e2e.RunAndGetStdOut(cmd)
48+
resp, err := RunAndGetStdOut(cmd)
5049
require.NoError(t, err, string(resp))
5150
var entries *atlasv2.MongoDBAccessLogsList
5251
require.NoError(t, json.Unmarshal(resp, &entries))
@@ -60,7 +59,7 @@ func TestAccessLogs(t *testing.T) {
6059
"--projectId", g.projectID,
6160
"-o=json")
6261
cmd.Env = os.Environ()
63-
resp, err := e2e.RunAndGetStdOut(cmd)
62+
resp, err := RunAndGetStdOut(cmd)
6463
require.NoError(t, err, string(resp))
6564
var entries *atlasv2.MongoDBAccessLogsList
6665
require.NoError(t, json.Unmarshal(resp, &entries))

‎test/e2e/atlas/access_roles_test.go‎ renamed to ‎test/e2e/access_roles_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
// limitations under the License.
1414
//go:build e2e || (atlas && generic)
1515

16-
package atlas_test
16+
package e2e_test
1717

1818
import (
1919
"encoding/json"
2020
"os"
2121
"os/exec"
2222
"testing"
2323

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

36-
cliPath, err := e2e.AtlasCLIBin()
35+
cliPath, err := AtlasCLIBin()
3736
require.NoError(t, err)
3837

3938
t.Run("Create", func(t *testing.T) {
@@ -46,7 +45,7 @@ func TestAccessRoles(t *testing.T) {
4645
g.projectID,
4746
"-o=json")
4847
cmd.Env = os.Environ()
49-
resp, err := e2e.RunAndGetStdOut(cmd)
48+
resp, err := RunAndGetStdOut(cmd)
5049
require.NoError(t, err, string(resp))
5150

5251
var iamRole atlasv2.CloudProviderAccessRole
@@ -63,7 +62,7 @@ func TestAccessRoles(t *testing.T) {
6362
g.projectID,
6463
"-o=json")
6564
cmd.Env = os.Environ()
66-
resp, err := e2e.RunAndGetStdOut(cmd)
65+
resp, err := RunAndGetStdOut(cmd)
6766
require.NoError(t, err, string(resp))
6867
var roles atlasv2.CloudProviderAccessRoles
6968
require.NoError(t, json.Unmarshal(resp, &roles))

‎test/e2e/atlas/alert_settings_test.go‎ renamed to ‎test/e2e/alert_settings_test.go‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

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

17-
package atlas_test
17+
package e2e_test
1818

1919
import (
2020
"encoding/json"
@@ -24,7 +24,6 @@ import (
2424
"strconv"
2525
"testing"
2626

27-
"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
2827
"github.com/stretchr/testify/assert"
2928
"github.com/stretchr/testify/require"
3029
"go.mongodb.org/atlas-sdk/v20250219001/admin"
@@ -33,7 +32,7 @@ import (
3332
func TestAlertConfig(t *testing.T) {
3433
var alertID string
3534

36-
cliPath, err := e2e.AtlasCLIBin()
35+
cliPath, err := AtlasCLIBin()
3736
require.NoError(t, err)
3837

3938
t.Run("Create", func(t *testing.T) {
@@ -54,7 +53,7 @@ func TestAlertConfig(t *testing.T) {
5453
"--notificationEmailEnabled=true",
5554
"-o=json")
5655
cmd.Env = os.Environ()
57-
resp, err := e2e.RunAndGetStdOut(cmd)
56+
resp, err := RunAndGetStdOut(cmd)
5857
require.NoError(t, err, string(resp))
5958
var alert admin.GroupAlertsConfig
6059
require.NoError(t, json.Unmarshal(resp, &alert))
@@ -79,7 +78,7 @@ func TestAlertConfig(t *testing.T) {
7978
alertID,
8079
"-o=json")
8180
cmd.Env = os.Environ()
82-
resp, err := e2e.RunAndGetStdOut(cmd)
81+
resp, err := RunAndGetStdOut(cmd)
8382
require.NoError(t, err, string(resp))
8483
var config admin.GroupAlertsConfig
8584
require.NoError(t, json.Unmarshal(resp, &config))
@@ -93,7 +92,7 @@ func TestAlertConfig(t *testing.T) {
9392
"ls",
9493
"-o=json")
9594
cmd.Env = os.Environ()
96-
resp, err := e2e.RunAndGetStdOut(cmd)
95+
resp, err := RunAndGetStdOut(cmd)
9796
require.NoError(t, err, string(resp))
9897
var config admin.PaginatedAlertConfig
9998
require.NoError(t, json.Unmarshal(resp, &config))
@@ -108,7 +107,7 @@ func TestAlertConfig(t *testing.T) {
108107
"-c",
109108
"-o=json")
110109
cmd.Env = os.Environ()
111-
resp, err := e2e.RunAndGetStdOut(cmd)
110+
resp, err := RunAndGetStdOut(cmd)
112111
require.NoError(t, err, string(resp))
113112
var config []admin.GroupAlertsConfig
114113
require.NoError(t, json.Unmarshal(resp, &config))
@@ -133,7 +132,7 @@ func TestAlertConfig(t *testing.T) {
133132
"--notificationEmailEnabled=true",
134133
"-o=json")
135134
cmd.Env = os.Environ()
136-
resp, err := e2e.RunAndGetStdOut(cmd)
135+
resp, err := RunAndGetStdOut(cmd)
137136

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

148147
t.Run("Update Setting using file input", func(t *testing.T) {
149-
n, err := e2e.RandInt(1000)
148+
n, err := RandInt(1000)
150149
require.NoError(t, err)
151150
fileName := fmt.Sprintf("%d_alerts.json", n.Int64())
152151
fileContent := fmt.Sprintf(`{
@@ -175,7 +174,7 @@ func TestAlertConfig(t *testing.T) {
175174
"--file", fileName,
176175
"-o=json")
177176
cmd.Env = os.Environ()
178-
resp, err := e2e.RunAndGetStdOut(cmd)
177+
resp, err := RunAndGetStdOut(cmd)
179178

180179
a := assert.New(t)
181180
require.NoError(t, err, string(resp))
@@ -190,7 +189,7 @@ func TestAlertConfig(t *testing.T) {
190189
t.Run("Delete", func(t *testing.T) {
191190
cmd := exec.Command(cliPath, alertsEntity, configEntity, "delete", alertID, "--force")
192191
cmd.Env = os.Environ()
193-
resp, err := e2e.RunAndGetStdOut(cmd)
192+
resp, err := RunAndGetStdOut(cmd)
194193
require.NoError(t, err, string(resp))
195194
})
196195

@@ -202,7 +201,7 @@ func TestAlertConfig(t *testing.T) {
202201
"type",
203202
"-o=json")
204203
cmd.Env = os.Environ()
205-
resp, err := e2e.RunAndGetStdOut(cmd)
204+
resp, err := RunAndGetStdOut(cmd)
206205
require.NoError(t, err, string(resp))
207206

208207
var fields []string

‎test/e2e/atlas/alerts_test.go‎ renamed to ‎test/e2e/alerts_test.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414
//go:build e2e || (atlas && generic)
1515

16-
package atlas_test
16+
package e2e_test
1717

1818
import (
1919
"encoding/json"
@@ -22,7 +22,6 @@ import (
2222
"testing"
2323
"time"
2424

25-
"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
2625
"github.com/stretchr/testify/assert"
2726
"github.com/stretchr/testify/require"
2827
atlasv2 "go.mongodb.org/atlas-sdk/v20250219001/admin"
@@ -33,7 +32,7 @@ const (
3332
)
3433

3534
func TestAlerts(t *testing.T) {
36-
cliPath, err := e2e.AtlasCLIBin()
35+
cliPath, err := AtlasCLIBin()
3736
require.NoError(t, err)
3837
var alertID string
3938
// This test should be run before all other tests to grab an alert ID for all others tests
@@ -47,7 +46,7 @@ func TestAlerts(t *testing.T) {
4746
)
4847

4948
cmd.Env = os.Environ()
50-
resp, err := e2e.RunAndGetStdOut(cmd)
49+
resp, err := RunAndGetStdOut(cmd)
5150
require.NoError(t, err, string(resp))
5251
var alerts atlasv2.PaginatedAlert
5352
require.NoError(t, json.Unmarshal(resp, &alerts))
@@ -66,7 +65,7 @@ func TestAlerts(t *testing.T) {
6665
)
6766

6867
cmd.Env = os.Environ()
69-
resp, err := e2e.RunAndGetStdOut(cmd)
68+
resp, err := RunAndGetStdOut(cmd)
7069
require.NoError(t, err, string(resp))
7170
})
7271

@@ -78,7 +77,7 @@ func TestAlerts(t *testing.T) {
7877
)
7978

8079
cmd.Env = os.Environ()
81-
resp, err := e2e.RunAndGetStdOut(cmd)
80+
resp, err := RunAndGetStdOut(cmd)
8281
require.NoError(t, err, string(resp))
8382
})
8483

@@ -94,7 +93,7 @@ func TestAlerts(t *testing.T) {
9493
)
9594

9695
cmd.Env = os.Environ()
97-
resp, err := e2e.RunAndGetStdOut(cmd)
96+
resp, err := RunAndGetStdOut(cmd)
9897
a := assert.New(t)
9998
require.NoError(t, err, string(resp))
10099
var alert atlasv2.AlertViewForNdsGroup
@@ -116,7 +115,7 @@ func TestAlerts(t *testing.T) {
116115
"-o=json")
117116

118117
cmd.Env = os.Environ()
119-
resp, err := e2e.RunAndGetStdOut(cmd)
118+
resp, err := RunAndGetStdOut(cmd)
120119
require.NoError(t, err, string(resp))
121120
var alert atlasv2.AlertViewForNdsGroup
122121
require.NoError(t, json.Unmarshal(resp, &alert))
@@ -135,7 +134,7 @@ func TestAlerts(t *testing.T) {
135134
"-o=json")
136135

137136
cmd.Env = os.Environ()
138-
resp, err := e2e.RunAndGetStdOut(cmd)
137+
resp, err := RunAndGetStdOut(cmd)
139138
require.NoError(t, err, string(resp))
140139
var alert atlasv2.AlertViewForNdsGroup
141140
require.NoError(t, json.Unmarshal(resp, &alert))
@@ -153,7 +152,7 @@ func TestAlerts(t *testing.T) {
153152
"-o=json")
154153

155154
cmd.Env = os.Environ()
156-
resp, err := e2e.RunAndGetStdOut(cmd)
155+
resp, err := RunAndGetStdOut(cmd)
157156
a := assert.New(t)
158157
require.NoError(t, err, string(resp))
159158
var alert atlasv2.AlertViewForNdsGroup

0 commit comments

Comments
 (0)