fix: handle pagination properly for events (#2550)

Author: Gustavo Bazan

internal/cli/atlas/events/list.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package events
 
 import (
@@ -78,32 +79,39 @@ func (opts *ListOpts) NewOrgListOptions() admin.ListOrganizationEventsApiParams
 	if len(opts.EventType) > 0 {
 		eventType = &opts.EventType
 	}
-	listEventsAPIParams := admin.ListOrganizationEventsApiParams{
-		OrgId:        opts.orgID,
-		ItemsPerPage: &opts.ItemsPerPage,
-		PageNum:      &opts.PageNum,
-		EventType:    eventType,
-		IncludeRaw:   new(bool),
-		MaxDate:      pointer.StringToTimePointer(opts.MaxDate),
-		MinDate:      pointer.StringToTimePointer(opts.MinDate),
+	p := admin.ListOrganizationEventsApiParams{
+		OrgId:     opts.orgID,
+		EventType: eventType,
+		MaxDate:   pointer.StringToTimePointer(opts.MaxDate),
+		MinDate:   pointer.StringToTimePointer(opts.MinDate),
+	}
+	if opts.ItemsPerPage > 0 {
+		p.ItemsPerPage = &opts.ItemsPerPage
+	}
+	if opts.PageNum > 0 {
+		p.PageNum = &opts.PageNum
 	}
-	return listEventsAPIParams
+	return p
 }
 
 func (opts *ListOpts) NewProjectListOptions() admin.ListProjectEventsApiParams {
 	var eventType *[]string
 	if len(opts.EventType) > 0 {
 		eventType = &opts.EventType
 	}
-	listEventsAPIParams := admin.ListProjectEventsApiParams{
-		GroupId:      opts.projectID,
-		ItemsPerPage: &opts.ItemsPerPage,
-		PageNum:      &opts.PageNum,
-		EventType:    eventType,
-		MaxDate:      pointer.StringToTimePointer(opts.MaxDate),
-		MinDate:      pointer.StringToTimePointer(opts.MinDate),
+	p := admin.ListProjectEventsApiParams{
+		GroupId:   opts.projectID,
+		EventType: eventType,
+		MaxDate:   pointer.StringToTimePointer(opts.MaxDate),
+		MinDate:   pointer.StringToTimePointer(opts.MinDate),
+	}
+	if opts.ItemsPerPage > 0 {
+		p.ItemsPerPage = &opts.ItemsPerPage
+	}
+	if opts.PageNum > 0 {
+		p.PageNum = &opts.PageNum
 	}
-	return listEventsAPIParams
+	return p
 }
 
 // ListBuilder
@@ -125,10 +133,10 @@ func ListBuilder() *cobra.Command {
 		Long:  fmt.Sprintf(usage.RequiredRole, "Project Read Only"),
 		Deprecated: `  
   To return project events prefer
-  mongocli atlas|ops-manager|cloud-manager events projects list [--projectId <projectId>]
+  atlas events projects list [--projectId <projectId>]
 
   To return organization events prefer
-  mongocli atlas|ops-manager|cloud-manager events organizations list [--orgId <orgId>]
+  atlas events organizations list [--orgId <orgId>]
 `,
 		Aliases: []string{"ls"},
 		Args:    require.NoArgs,

internal/cli/atlas/events/orgs_list.go

@@ -61,15 +61,19 @@ func (opts *orgListOpts) NewOrgListOptions() admin.ListOrganizationEventsApiPara
 	if len(opts.EventType) > 0 {
 		eventType = &opts.EventType
 	}
-	listEventsAPIParams := admin.ListOrganizationEventsApiParams{
-		OrgId:        opts.ConfigOrgID(),
-		ItemsPerPage: &opts.ItemsPerPage,
-		PageNum:      &opts.PageNum,
-		EventType:    eventType,
-		MaxDate:      pointer.StringToTimePointer(opts.MaxDate),
-		MinDate:      pointer.StringToTimePointer(opts.MinDate),
+	p := admin.ListOrganizationEventsApiParams{
+		OrgId:     opts.ConfigOrgID(),
+		EventType: eventType,
+		MaxDate:   pointer.StringToTimePointer(opts.MaxDate),
+		MinDate:   pointer.StringToTimePointer(opts.MinDate),
 	}
-	return listEventsAPIParams
+	if opts.ItemsPerPage > 0 {
+		p.ItemsPerPage = &opts.ItemsPerPage
+	}
+	if opts.PageNum > 0 {
+		p.PageNum = &opts.PageNum
+	}
+	return p
 }
 
 // OrgListBuilder

internal/cli/atlas/events/projects_list.go

@@ -65,15 +65,20 @@ func (opts *projectListOpts) NewProjectListOptions() admin.ListProjectEventsApiP
 	if len(opts.EventType) > 0 {
 		eventType = &opts.EventType
 	}
-	listEventsAPIParams := admin.ListProjectEventsApiParams{
-		GroupId:      opts.ConfigProjectID(),
-		ItemsPerPage: &opts.ItemsPerPage,
-		PageNum:      &opts.PageNum,
-		EventType:    eventType,
-		MaxDate:      pointer.StringToTimePointer(opts.MaxDate),
-		MinDate:      pointer.StringToTimePointer(opts.MinDate),
+	p := admin.ListProjectEventsApiParams{
+		GroupId:   opts.ConfigProjectID(),
+		EventType: eventType,
+		MaxDate:   pointer.StringToTimePointer(opts.MaxDate),
+		MinDate:   pointer.StringToTimePointer(opts.MinDate),
 	}
-	return listEventsAPIParams
+
+	if opts.ItemsPerPage > 0 {
+		p.ItemsPerPage = &opts.ItemsPerPage
+	}
+	if opts.PageNum > 0 {
+		p.PageNum = &opts.PageNum
+	}
+	return p
 }
 
 // ProjectListBuilder

test/e2e/atlas/events_test.go

@@ -23,14 +23,14 @@ import (
 	"time"
 
 	"github.com/mongodb/mongodb-atlas-cli/test/e2e"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.mongodb.org/atlas-sdk/v20231115002/admin"
 )
 
 func TestEvents(t *testing.T) {
 	cliPath, err := e2e.AtlasCLIBin()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
+	require.NoError(t, err)
 	t.Run("List Project Events", func(t *testing.T) {
 		cmd := exec.Command(cliPath,
 			eventsEntity,
@@ -41,18 +41,10 @@ func TestEvents(t *testing.T) {
 
 		cmd.Env = os.Environ()
 		resp, err := cmd.CombinedOutput()
-		if err != nil {
-			t.Fatalf("unexpected error: %v, resp: %v", err, string(resp))
-		}
-
+		require.NoError(t, err)
 		var events admin.GroupPaginatedEvent
-		if err := json.Unmarshal(resp, &events); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-
-		if len(events.Results) == 0 {
-			t.Errorf("got=%#v\nwant>0\n", len(events.Results))
-		}
+		require.NoError(t, json.Unmarshal(resp, &events))
+		assert.NotEmpty(t, events.Results)
 	})
 
 	t.Run("List Organization Events", func(t *testing.T) {
@@ -66,17 +58,9 @@ func TestEvents(t *testing.T) {
 
 		cmd.Env = os.Environ()
 		resp, err := cmd.CombinedOutput()
-		if err != nil {
-			t.Fatalf("unexpected error: %v, resp: %v", err, string(resp))
-		}
-
+		require.NoError(t, err)
 		var events admin.OrgPaginatedEvent
-		if err := json.Unmarshal(resp, &events); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-
-		if len(events.Results) == 0 {
-			t.Errorf("got=%#v\nwant>0\n", len(events.Results))
-		}
+		require.NoError(t, json.Unmarshal(resp, &events))
+		assert.NotEmpty(t, events.Results)
 	})
 }