feat: add pagination for list resources

Makefile

@@ -3,7 +3,7 @@ COMMIT := $(shell git rev-parse --short HEAD)
 TAG := "$(shell git rev-list --tags --max-count=1)"
 VERSION := "$(shell git describe --tags ${TAG})-next"
 BUILD_DIR=dist
-PROTON_COMMIT := "5c19c2579d679e2a807dcde2fe4445f79233df91"
+PROTON_COMMIT := "af4704d2f660ec3943bbd61c22b1bab51a74afbb"
 
 .PHONY: all build clean test tidy vet proto setup format generate
 

api/handler/v1beta1/grpc.go

@@ -48,6 +48,7 @@ type resourceService interface {
 	Get(context.Context, *domain.ResourceIdentifier) (*domain.Resource, error)
 	Delete(context.Context, string) error
 	BatchDelete(context.Context, []string) error
+	GetResourcesTotalCount(context.Context, domain.ListResourcesFilter) (int64, error)
 }
 
 //go:generate mockery --name=activityService --exported --with-expecter

api/handler/v1beta1/resource.go

@@ -3,6 +3,7 @@ package v1beta1
 import (
 	"context"
 	"errors"
+	"golang.org/x/sync/errgroup"
 	"strings"
 
 	guardianv1beta1 "github.com/goto/guardian/api/proto/gotocompany/guardian/v1beta1"
@@ -25,31 +26,64 @@ func (s *GRPCServer) ListResources(ctx context.Context, req *guardianv1beta1.Lis
 			}
 		}
 	}
-	resources, err := s.resourceService.Find(ctx, domain.ListResourcesFilter{
+	filter := domain.ListResourcesFilter{
 		IsDeleted:    req.GetIsDeleted(),
 		ResourceType: req.GetType(),
 		ResourceURN:  req.GetUrn(),
 		ProviderType: req.GetProviderType(),
 		ProviderURN:  req.GetProviderUrn(),
 		Name:         req.GetName(),
 		Details:      details,
-	})
+		Size:         req.GetSize(),
+		Offset:       req.GetOffset(),
+	}
+
+	resources, total, err := s.listResources(ctx, filter)
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get resource list: %v", err)
+		return nil, err
 	}
 
-	resourceProtos := []*guardianv1beta1.Resource{}
-	for _, r := range resources {
-		resourceProto, err := s.adapter.ToResourceProto(r)
+	return &guardianv1beta1.ListResourcesResponse{
+		Resources: resources,
+		Total:     uint32(total),
+	}, nil
+}
+
+func (s *GRPCServer) listResources(ctx context.Context, filter domain.ListResourcesFilter) ([]*guardianv1beta1.Resource, int64, error) {
+	eg, ctx := errgroup.WithContext(ctx)
+	var resources []*domain.Resource
+	var total int64
+
+	eg.Go(func() error {
+		resourceRecords, err := s.resourceService.Find(ctx, filter)
+		if err != nil {
+			return status.Errorf(codes.Internal, "failed to get resource list: %s", err)
+		}
+		resources = resourceRecords
+		return nil
+	})
+	eg.Go(func() error {
+		totalRecord, err := s.resourceService.GetResourcesTotalCount(ctx, filter)
+		if err != nil {
+			return status.Errorf(codes.Internal, "failed to get resource total count: %s", err)
+		}
+		total = totalRecord
+		return nil
+	})
+
+	if err := eg.Wait(); err != nil {
+		return nil, 0, err
+	}
+	var resourceProtos []*guardianv1beta1.Resource
+	for i, r := range resources {
+		resourceProto, err := s.adapter.ToResourceProto(resources[i])
 		if err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to parse resource %v: %v", r.Name, err)
+			return nil, 0, status.Errorf(codes.Internal, "failed to parse resource %v: %v", r.Name, err)
 		}
 		resourceProtos = append(resourceProtos, resourceProto)
 	}
 
-	return &guardianv1beta1.ListResourcesResponse{
-		Resources: resourceProtos,
-	}, nil
+	return resourceProtos, total, nil
 }
 
 func (s *GRPCServer) GetResource(ctx context.Context, req *guardianv1beta1.GetResourceRequest) (*guardianv1beta1.GetResourceResponse, error) {

api/handler/v1beta1/resource_test.go

@@ -20,8 +20,6 @@ func (s *GrpcHandlersSuite) TestListResources() {
 		s.setup()
 		timeNow := time.Now()
 
-		ctx := context.Background()
-
 		req := &guardianv1beta1.ListResourcesRequest{
 			IsDeleted:    true,
 			Type:         "test-type",
@@ -85,9 +83,10 @@ func (s *GrpcHandlersSuite) TestListResources() {
 				Details:      expectedDetails,
 			},
 		}
-		s.resourceService.EXPECT().Find(ctx, expectedFilters).Return(dummyResources, nil)
-
-		res, err := s.grpcServer.ListResources(ctx, req)
+		s.resourceService.EXPECT().Find(mock.AnythingOfType("*context.cancelCtx"), expectedFilters).Return(dummyResources, nil)
+		s.resourceService.EXPECT().GetResourcesTotalCount(mock.AnythingOfType("*context.cancelCtx"),
+			expectedFilters).Return(0, nil).Once()
+		res, err := s.grpcServer.ListResources(context.Background(), req)
 
 		s.NoError(err)
 		s.Equal(expectedResponse, res)
@@ -98,7 +97,10 @@ func (s *GrpcHandlersSuite) TestListResources() {
 		s.setup()
 
 		expectedError := errors.New("random error")
-		s.resourceService.EXPECT().Find(mock.AnythingOfType("*context.emptyCtx"), mock.Anything).Return(nil, expectedError).Once()
+		s.resourceService.EXPECT().Find(mock.AnythingOfType("*context.cancelCtx"),
+			mock.AnythingOfType("domain.ListResourcesFilter")).Return(nil, expectedError).Once()
+		s.resourceService.EXPECT().GetResourcesTotalCount(mock.AnythingOfType("*context.cancelCtx"),
+			mock.AnythingOfType("domain.ListResourcesFilter")).Return(0, nil).Once()
 
 		req := &guardianv1beta1.ListResourcesRequest{}
 		res, err := s.grpcServer.ListResources(context.Background(), req)
@@ -118,7 +120,10 @@ func (s *GrpcHandlersSuite) TestListResources() {
 				},
 			},
 		}
-		s.resourceService.EXPECT().Find(mock.AnythingOfType("*context.emptyCtx"), mock.Anything).Return(invalidResources, nil).Once()
+		s.resourceService.EXPECT().Find(mock.AnythingOfType("*context.cancelCtx"),
+			mock.AnythingOfType("domain.ListResourcesFilter")).Return(invalidResources, nil).Once()
+		s.resourceService.EXPECT().GetResourcesTotalCount(mock.AnythingOfType("*context.cancelCtx"),
+			mock.AnythingOfType("domain.ListResourcesFilter")).Return(0, nil).Once()
 
 		req := &guardianv1beta1.ListResourcesRequest{}
 		res, err := s.grpcServer.ListResources(context.Background(), req)