fix: lint issues

Author: anjaliagg9791

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 := "f0424ed17b623940d4bfea0b047f5a0f40c475e6"
+PROTON_COMMIT := "4d9863b2c10279d6512ddeac5c5a37b9c2e6228b"
 
 .PHONY: all build clean test tidy vet proto setup format generate
 

api/handler/v1beta1/adapter.go

@@ -270,6 +270,13 @@ func (a *adapter) FromPolicyProto(p *guardianv1beta1.Policy) *domain.Policy {
 		policy.Steps = steps
 	}
 
+	if cs := p.GetCustomSteps(); cs != nil {
+		policy.CustomSteps = &domain.CustomSteps{
+			Type:   cs.GetType(),
+			Config: cs.GetConfig(),
+		}
+	}
+
 	if p.GetRequirements() != nil {
 		var requirements []*domain.Requirement
 		for _, r := range p.GetRequirements() {
@@ -337,6 +344,7 @@ func (a *adapter) FromPolicyProto(p *guardianv1beta1.Policy) *domain.Policy {
 		var durationOptions []domain.AppealDurationOption
 		var questions []domain.Question
 		var metadataSources map[string]*domain.AppealMetadataSource
+
 		for _, d := range p.GetAppeal().GetDurationOptions() {
 			option := domain.AppealDurationOption{
 				Name:  d.GetName(),

api/handler/v1beta1/grant.go

@@ -15,24 +15,24 @@ import (
 
 func (s *GRPCServer) ListGrants(ctx context.Context, req *guardianv1beta1.ListGrantsRequest) (*guardianv1beta1.ListGrantsResponse, error) {
 	filter := domain.ListGrantsFilter{
-		Q:                      req.GetQ(),
-		Statuses:               req.GetStatuses(),
-		AccountIDs:             req.GetAccountIds(),
-		AccountTypes:           req.GetAccountTypes(),
-		GroupIDs:               req.GetGroupIds(),
-		GroupTypes:             req.GetGroupTypes(),
-		ResourceIDs:            req.GetResourceIds(),
-		Roles:                  req.GetRoles(),
-		ProviderTypes:          req.GetProviderTypes(),
-		ProviderURNs:           req.GetProviderUrns(),
-		ResourceTypes:          req.GetResourceTypes(),
-		ResourceURNs:           req.GetResourceUrns(),
-		CreatedBy:              req.GetCreatedBy(),
-		Owner:                  req.GetOwner(),
-		OrderBy:                req.GetOrderBy(),
-		Size:                   int(req.GetSize()),
-		Offset:                 int(req.GetOffset()),
-		IncludeApprovalDetails: bool(req.IncludeApprovalDetails),
+		Q:             req.GetQ(),
+		Statuses:      req.GetStatuses(),
+		AccountIDs:    req.GetAccountIds(),
+		AccountTypes:  req.GetAccountTypes(),
+		GroupIDs:      req.GetGroupIds(),
+		GroupTypes:    req.GetGroupTypes(),
+		ResourceIDs:   req.GetResourceIds(),
+		Roles:         req.GetRoles(),
+		ProviderTypes: req.GetProviderTypes(),
+		ProviderURNs:  req.GetProviderUrns(),
+		ResourceTypes: req.GetResourceTypes(),
+		ResourceURNs:  req.GetResourceUrns(),
+		CreatedBy:     req.GetCreatedBy(),
+		Owner:         req.GetOwner(),
+		OrderBy:       req.GetOrderBy(),
+		Size:          int(req.GetSize()),
+		Offset:        int(req.GetOffset()),
+		WithApprovals: req.WithApprovals,
 	}
 	grants, total, err := s.listGrants(ctx, filter)
 	if err != nil {