fix: pagination fix for ipAcessList

Author: andrpac

internal/kubernetes/operator/project/ipaccesslist.go

@@ -40,18 +40,20 @@ func BuildIPAccessList(
 	provider store.ProjectIPAccessListLister,
 	request IPAccessListRequest,
 ) (*akov2.AtlasIPAccessList, bool, error) {
-	ipAccessLists, err := provider.ProjectIPAccessLists(request.ProjectID, &store.ListOptions{ItemsPerPage: MaxItems})
+	pages, err := provider.ProjectIPAccessLists(request.ProjectID)
 	if err != nil {
 		return nil, false, err
 	}
 
-	if len(ipAccessLists.GetResults()) == 0 {
-		return nil, true, nil
+	var entries []akov2.IPAccessEntry
+	for _, page := range pages {
+		for _, ipAccessList := range page.GetResults() {
+			entries = append(entries, fromAtlas(ipAccessList))
+		}
 	}
 
-	entries := make([]akov2.IPAccessEntry, 0, len(ipAccessLists.GetResults()))
-	for _, ipAccessList := range ipAccessLists.GetResults() {
-		entries = append(entries, fromAtlas(ipAccessList))
+	if len(entries) == 0 {
+		return nil, true, nil
 	}
 
 	resource := akov2.AtlasIPAccessList{

internal/kubernetes/operator/project/ipaccesslist_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/kubernetes/operator/resources"
 	"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/mocks"
 	"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/pointer"
-	"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/store"
 	akoapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
 	akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
 	akov2common "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"
@@ -177,8 +176,11 @@ func TestBuildIPAccessList(t *testing.T) {
 			ialStore := mocks.NewMockProjectIPAccessListLister(ctl)
 			dictionary := resources.AtlasNameToKubernetesName()
 
-			ialStore.EXPECT().ProjectIPAccessLists(projectID, &store.ListOptions{ItemsPerPage: MaxItems}).
-				Return(&admin.PaginatedNetworkAccess{Results: &tt.ipAccessList}, nil)
+			ialStore.EXPECT().
+				ProjectIPAccessLists(projectID).
+				Return([]*admin.PaginatedNetworkAccess{
+					&admin.PaginatedNetworkAccess{Results: &tt.ipAccessList},
+				}, nil)
 
 			atlasIPAccessList, isEmpty, err := BuildIPAccessList(
 				ialStore,

internal/kubernetes/operator/project/project.go

@@ -322,29 +322,31 @@ func projectBuildCustomRoles(crProvider store.DatabaseRoleLister, projectID stri
 }
 
 func buildAccessLists(accessListProvider store.ProjectIPAccessListLister, projectID string) ([]akov2project.IPAccessList, error) {
-	// pagination not required, max 200 entries can be configured via API
-	accessLists, err := accessListProvider.ProjectIPAccessLists(projectID, &store.ListOptions{ItemsPerPage: MaxItems})
+	pages, err := accessListProvider.ProjectIPAccessLists(projectID)
 	if err != nil {
 		return nil, err
 	}
 
-	result := make([]akov2project.IPAccessList, 0, len(accessLists.GetResults()))
-	for _, list := range accessLists.GetResults() {
-		if strings.HasSuffix(list.GetCidrBlock(), cidrException) && list.GetIpAddress() != "" {
-			list.CidrBlock = pointer.Get("")
-		}
-		deleteAfterDate := ""
-		if !list.GetDeleteAfterDate().IsZero() {
-			deleteAfterDate = list.GetDeleteAfterDate().String()
+	var result []akov2project.IPAccessList
+	for _, page := range pages {
+		for _, ipAccessList := range page.GetResults() {
+			if strings.HasSuffix(ipAccessList.GetCidrBlock(), cidrException) && ipAccessList.GetIpAddress() != "" {
+				ipAccessList.CidrBlock = pointer.Get("")
+			}
+			deleteAfterDate := ""
+			if !ipAccessList.GetDeleteAfterDate().IsZero() {
+				deleteAfterDate = ipAccessList.GetDeleteAfterDate().String()
+			}
+			result = append(result, akov2project.IPAccessList{
+				AwsSecurityGroup: ipAccessList.GetAwsSecurityGroup(),
+				CIDRBlock:        ipAccessList.GetCidrBlock(),
+				Comment:          ipAccessList.GetComment(),
+				DeleteAfterDate:  deleteAfterDate,
+				IPAddress:        ipAccessList.GetIpAddress(),
+			})
 		}
-		result = append(result, akov2project.IPAccessList{
-			AwsSecurityGroup: list.GetAwsSecurityGroup(),
-			CIDRBlock:        list.GetCidrBlock(),
-			Comment:          list.GetComment(),
-			DeleteAfterDate:  deleteAfterDate,
-			IPAddress:        list.GetIpAddress(),
-		})
 	}
+
 	return result, nil
 }
 

internal/kubernetes/operator/project/project_test.go

@@ -63,19 +63,21 @@ func TestBuildAtlasProject(t *testing.T) {
 		WithDefaultAlertsSettings: pointer.Get(false),
 	}
 
-	ipAccessLists := &atlasv2.PaginatedNetworkAccess{
-		Links: nil,
-		Results: &[]atlasv2.NetworkPermissionEntry{
-			{
-				AwsSecurityGroup: pointer.Get("TestSecurity group"),
-				CidrBlock:        pointer.Get("0.0.0.0/0"),
-				Comment:          pointer.Get("Allow everyone"),
-				DeleteAfterDate:  pointer.Get(time.Now()),
-				GroupId:          pointer.Get("TestGroupID"),
-				IpAddress:        pointer.Get("0.0.0.0"),
+	ipAccessLists := []*atlasv2.PaginatedNetworkAccess{
+		{
+			Links: nil,
+			Results: &[]atlasv2.NetworkPermissionEntry{
+				{
+					AwsSecurityGroup: pointer.Get("TestSecurity group"),
+					CidrBlock:        pointer.Get("0.0.0.0/0"),
+					Comment:          pointer.Get("Allow everyone"),
+					DeleteAfterDate:  pointer.Get(time.Now()),
+					GroupId:          pointer.Get("TestGroupID"),
+					IpAddress:        pointer.Get("0.0.0.0"),
+				},
 			},
+			TotalCount: pointer.Get(1),
 		},
-		TotalCount: pointer.Get(1),
 	}
 
 	auditing := &atlasv2.AuditLog{
@@ -436,11 +438,11 @@ func TestBuildAtlasProject(t *testing.T) {
 					},
 					ProjectIPAccessList: []akov2project.IPAccessList{
 						{
-							AwsSecurityGroup: ipAccessLists.GetResults()[0].GetAwsSecurityGroup(),
-							CIDRBlock:        ipAccessLists.GetResults()[0].GetCidrBlock(),
-							Comment:          ipAccessLists.GetResults()[0].GetComment(),
-							DeleteAfterDate:  ipAccessLists.GetResults()[0].GetDeleteAfterDate().String(),
-							IPAddress:        ipAccessLists.GetResults()[0].GetIpAddress(),
+							AwsSecurityGroup: ipAccessLists[0].GetResults()[0].GetAwsSecurityGroup(),
+							CIDRBlock:        ipAccessLists[0].GetResults()[0].GetCidrBlock(),
+							Comment:          ipAccessLists[0].GetResults()[0].GetComment(),
+							DeleteAfterDate:  ipAccessLists[0].GetResults()[0].GetDeleteAfterDate().String(),
+							IPAddress:        ipAccessLists[0].GetResults()[0].GetIpAddress(),
 						},
 					},
 					MaintenanceWindow: akov2project.MaintenanceWindow{
@@ -687,7 +689,7 @@ func TestBuildAtlasProject(t *testing.T) {
 			projectStore.EXPECT().DescribeCompliancePolicy(projectID).Return(bcp, nil)
 			tt.privateEndpointMock(projectStore)
 			if !tt.independentResource {
-				projectStore.EXPECT().ProjectIPAccessLists(projectID, listOption).Return(ipAccessLists, nil)
+				projectStore.EXPECT().ProjectIPAccessLists(projectID).Return(ipAccessLists, nil)
 				projectStore.EXPECT().DatabaseRoles(projectID).Return(customRoles, nil)
 				projectStore.EXPECT().PeeringConnections(projectID).Return(peeringConnections, nil)
 				projectStore.EXPECT().Integrations(projectID).Return(thirdPartyIntegrations, nil)
@@ -817,24 +819,24 @@ func Test_buildAccessLists(t *testing.T) {
 
 	alProvider := mocks.NewMockProjectIPAccessListLister(ctl)
 	t.Run("Can convert Access Lists", func(t *testing.T) {
-		data := &atlasv2.PaginatedNetworkAccess{
-			Links: nil,
-			Results: &[]atlasv2.NetworkPermissionEntry{
-				{
-					AwsSecurityGroup: pointer.Get("TestSecGroup"),
-					CidrBlock:        pointer.Get("0.0.0.0/0"),
-					Comment:          pointer.Get("TestComment"),
-					DeleteAfterDate:  pointer.Get(time.Now()),
-					GroupId:          pointer.Get("TestGroupID"),
-					IpAddress:        pointer.Get("0.0.0.0"),
+		data := []*atlasv2.PaginatedNetworkAccess{
+			{
+				Links: nil,
+				Results: &[]atlasv2.NetworkPermissionEntry{
+					{
+						AwsSecurityGroup: pointer.Get("TestSecGroup"),
+						CidrBlock:        pointer.Get("0.0.0.0/0"),
+						Comment:          pointer.Get("TestComment"),
+						DeleteAfterDate:  pointer.Get(time.Now()),
+						GroupId:          pointer.Get("TestGroupID"),
+						IpAddress:        pointer.Get("0.0.0.0"),
+					},
 				},
+				TotalCount: pointer.Get(1),
 			},
-			TotalCount: pointer.Get(1),
 		}
 
-		listOptions := &store.ListOptions{ItemsPerPage: MaxItems}
-
-		alProvider.EXPECT().ProjectIPAccessLists(projectID, listOptions).Return(data, nil)
+		alProvider.EXPECT().ProjectIPAccessLists(projectID).Return(data, nil)
 
 		got, err := buildAccessLists(alProvider, projectID)
 		if err != nil {
@@ -843,11 +845,11 @@ func Test_buildAccessLists(t *testing.T) {
 
 		expected := []akov2project.IPAccessList{
 			{
-				AwsSecurityGroup: data.GetResults()[0].GetAwsSecurityGroup(),
-				CIDRBlock:        data.GetResults()[0].GetCidrBlock(),
-				Comment:          data.GetResults()[0].GetComment(),
-				DeleteAfterDate:  data.GetResults()[0].GetDeleteAfterDate().String(),
-				IPAddress:        data.GetResults()[0].GetIpAddress(),
+				AwsSecurityGroup: data[0].GetResults()[0].GetAwsSecurityGroup(),
+				CIDRBlock:        data[0].GetResults()[0].GetCidrBlock(),
+				Comment:          data[0].GetResults()[0].GetComment(),
+				DeleteAfterDate:  data[0].GetResults()[0].GetDeleteAfterDate().String(),
+				IPAddress:        data[0].GetResults()[0].GetIpAddress(),
 			},
 		}
 

internal/mocks/mock_atlas_generic_store.go

@@ -15,21 +15,30 @@
 package store
 
 import (
+	"fmt"
+
 	atlasv2 "go.mongodb.org/atlas-sdk/v20241113004/admin"
 )
 
 //go:generate mockgen -destination=../mocks/mock_project_ip_access_lists.go -package=mocks github.com/mongodb/atlas-cli-plugin-kubernetes/internal/store ProjectIPAccessListLister
 
 type ProjectIPAccessListLister interface {
-	ProjectIPAccessLists(string, *ListOptions) (*atlasv2.PaginatedNetworkAccess, error)
+	ProjectIPAccessLists(string) ([]*atlasv2.PaginatedNetworkAccess, error)
 }
 
 // ProjectIPAccessLists encapsulate the logic to manage different cloud providers.
-func (s *Store) ProjectIPAccessLists(projectID string, opts *ListOptions) (*atlasv2.PaginatedNetworkAccess, error) {
-	res := s.clientv2.ProjectIPAccessListApi.ListProjectIpAccessLists(s.ctx, projectID)
-	if opts != nil {
-		res = res.PageNum(opts.PageNum).ItemsPerPage(fixPageSize(opts.ItemsPerPage)).IncludeCount(opts.IncludeCount)
-	}
-	result, _, err := res.Execute()
-	return result, err
+func (s *Store) ProjectIPAccessLists(projectID string) ([]*atlasv2.PaginatedNetworkAccess, error) {
+	return AllPages(func(pageNum, itemsPerPage int) ([]*atlasv2.PaginatedNetworkAccess, error) {
+		req := s.clientv2.ProjectIPAccessListApi.ListProjectIpAccessLists(s.ctx, projectID).
+			PageNum(pageNum).
+			ItemsPerPage(itemsPerPage)
+
+		page, _, err := req.Execute()
+		if err != nil {
+			return nil, fmt.Errorf("failed to list project IP access lists: %w", err)
+		}
+
+		fmt.Printf("Page %d results: %+v\n", pageNum, page.GetResults())
+		return []*atlasv2.PaginatedNetworkAccess{page}, nil
+	})
 }