feat: grant dormancy check

goto · Jul 26, 2023 · 7fbb898 · 7fbb898
1 parent e206ed2
commit 7fbb898
Show file tree

Hide file tree

Showing 33 changed files with 1,361 additions and 237 deletions.
diff --git a/api/handler/v1beta1/activity.go b/api/handler/v1beta1/activity.go
@@ -66,7 +66,7 @@ func (s *GRPCServer) ListActivities(ctx context.Context, req *guardianv1beta1.Li
 }
 
 func (s *GRPCServer) ImportActivities(ctx context.Context, req *guardianv1beta1.ImportActivitiesRequest) (*guardianv1beta1.ImportActivitiesResponse, error) {
-	filter := domain.ImportActivitiesFilter{
+	filter := domain.ListActivitiesFilter{
 		ProviderID:  req.GetProviderId(),
 		ResourceIDs: req.GetResourceIds(),
 		AccountIDs:  req.GetAccountIds(),

diff --git a/api/handler/v1beta1/grpc.go b/api/handler/v1beta1/grpc.go
@@ -54,7 +54,7 @@ type resourceService interface {
 type activityService interface {
 	GetOne(context.Context, string) (*domain.Activity, error)
 	Find(context.Context, domain.ListProviderActivitiesFilter) ([]*domain.Activity, error)
-	Import(context.Context, domain.ImportActivitiesFilter) ([]*domain.Activity, error)
+	Import(context.Context, domain.ListActivitiesFilter) ([]*domain.Activity, error)
 }
 
 //go:generate mockery --name=providerService --exported --with-expecter

diff --git a/api/handler/v1beta1/mocks/activityService.go b/api/handler/v1beta1/mocks/activityService.go
diff --git a/api/handler/v1beta1/mocks/providerActivityService.go b/api/handler/v1beta1/mocks/providerActivityService.go
diff --git a/cli/job.go b/cli/job.go
@@ -43,13 +43,15 @@ func runJobCmd() *cobra.Command {
 			$ guardian job run expiring_grant_notification
 			$ guardian job run revoke_expired_grants
 			$ guardian job run revoke_grants_by_user_criteria
+			$ guardian job run grant_dormancy_check
 		`),
 		Args: cobra.ExactValidArgs(1),
 		ValidArgs: []string{
 			string(jobs.TypeFetchResources),
 			string(jobs.TypeExpiringGrantNotification),
 			string(jobs.TypeRevokeExpiredGrants),
 			string(jobs.TypeRevokeGrantsByUserCriteria),
+			string(jobs.TypeGrantDormancyCheck),
 
 			string(jobs.TypeRevokeExpiredAccess),
 			string(jobs.TypeExpiringAccessNotification),
@@ -112,6 +114,10 @@ func runJobCmd() *cobra.Command {
 					handler: handler.RevokeGrantsByUserCriteria,
 					config:  config.Jobs.RevokeGrantsByUserCriteria.Config,
 				},
+				jobs.TypeGrantDormancyCheck: {
+					handler: handler.GrantDormancyCheck,
+					config:  config.Jobs.GrantDormancyCheck.Config,
+				},
 
 				// deprecated job names
 				jobs.TypeExpiringAccessNotification: {

diff --git a/core/activity/mocks/providerService.go b/core/activity/mocks/providerService.go
diff --git a/core/activity/service.go b/core/activity/service.go
@@ -18,7 +18,7 @@ type repository interface {
 
 //go:generate mockery --name=providerService --exported --with-expecter
 type providerService interface {
-	ImportActivities(context.Context, domain.ImportActivitiesFilter) ([]*domain.Activity, error)
+	ImportActivities(context.Context, domain.ListActivitiesFilter) ([]*domain.Activity, error)
 }
 
 //go:generate mockery --name=auditLogger --exported --with-expecter
@@ -61,7 +61,7 @@ func (s *Service) Find(ctx context.Context, filter domain.ListProviderActivities
 	return s.repo.Find(ctx, filter)
 }
 
-func (s *Service) Import(ctx context.Context, filter domain.ImportActivitiesFilter) ([]*domain.Activity, error) {
+func (s *Service) Import(ctx context.Context, filter domain.ListActivitiesFilter) ([]*domain.Activity, error) {
 	activities, err := s.providerService.ImportActivities(ctx, filter)
 	if err != nil {
 		return nil, err

diff --git a/core/grant/mocks/providerService.go b/core/grant/mocks/providerService.go