Skip entitlements (#568)

* feat: add skip entitlements

* remove cli option to skip entitlements

Author: MarcusGoldschmidt

pb/c1/connector/v2/annotation_resource_tree.pb.go

@@ -356,6 +356,7 @@ func MakeMainCommand[T field.Configurable](
 		}
 
 		opts = append(opts, connectorrunner.WithSkipEntitlementsAndGrants(v.GetBool("skip-entitlements-and-grants")))
+
 		if v.GetBool("skip-grants") {
 			opts = append(opts, connectorrunner.WithSkipGrants(v.GetBool("skip-grants")))
 		}

pb/c1/connector/v2/annotation_resource_tree.pb.validate.go

@@ -109,6 +109,7 @@ var (
 		WithExportTarget(ExportTargetNone),
 		WithHidden(true),
 	)
+
 	syncResourceTypeIDs = StringSliceField("sync-resource-types",
 		WithDescription("The resource type IDs to sync"),
 		WithPersistent(true),

pb/c1/connector/v2/annotation_resource_tree_protoopaque.pb.go

@@ -169,6 +169,7 @@ type serializedToken struct {
 	ShouldFetchRelatedResources     bool                     `json:"should_fetch_related_resources,omitempty"`
 	ShouldSkipEntitlementsAndGrants bool                     `json:"should_skip_entitlements_and_grants,omitempty"`
 	ShouldSkipGrants                bool                     `json:"should_skip_grants,omitempty"`
+	ShouldSkipEntitlements          bool                     `json:"should_skip_entitlements,omitempty"`
 }
 
 // push adds a new action to the stack. If there is no current state, the action is directly set to current, else

pkg/cli/commands.go

@@ -215,6 +215,7 @@ type syncer struct {
 	dontExpandGrants                    bool
 	syncID                              string
 	skipEGForResourceType               map[string]bool
+	skipEntitlementsForResourceType     map[string]bool
 	skipEntitlementsAndGrants           bool
 	skipGrants                          bool
 	resourceTypeTraits                  map[string][]v2.ResourceType_Trait
@@ -549,7 +550,9 @@ func (s *syncer) Sync(ctx context.Context) error {
 				if !s.state.ShouldSkipGrants() {
 					s.state.PushAction(ctx, Action{Op: SyncGrantsOp})
 				}
+
 				s.state.PushAction(ctx, Action{Op: SyncEntitlementsOp})
+
 				s.state.PushAction(ctx, Action{Op: SyncStaticEntitlementsOp})
 			}
 			s.state.PushAction(ctx, Action{Op: SyncResourcesOp})
@@ -949,7 +952,7 @@ func (s *syncer) SyncTargetedResource(ctx context.Context) error {
 		})
 	}
 
-	shouldSkipEnts, err := s.shouldSkipEntitlementsAndGrants(ctx, resource)
+	shouldSkipEnts, err := s.shouldSkipEntitlements(ctx, resource)
 	if err != nil {
 		return err
 	}
@@ -1189,6 +1192,43 @@ func (s *syncer) shouldSkipGrants(ctx context.Context, r *v2.Resource) (bool, er
 	return s.shouldSkipEntitlementsAndGrants(ctx, r)
 }
 
+func (s *syncer) shouldSkipEntitlements(ctx context.Context, r *v2.Resource) (bool, error) {
+	ctx, span := tracer.Start(ctx, "syncer.shouldSkipEntitlements")
+	defer span.End()
+
+	ok, err := s.shouldSkipEntitlementsAndGrants(ctx, r)
+	if err != nil {
+		return false, err
+	}
+
+	if ok {
+		return true, nil
+	}
+
+	rAnnos := annotations.Annotations(r.GetAnnotations())
+	if rAnnos.Contains(&v2.SkipEntitlements{}) || rAnnos.Contains(&v2.SkipEntitlementsAndGrants{}) {
+		return true, nil
+	}
+
+	if skip, ok := s.skipEntitlementsForResourceType[r.GetId().GetResourceType()]; ok {
+		return skip, nil
+	}
+
+	rt, err := s.store.GetResourceType(ctx, reader_v2.ResourceTypesReaderServiceGetResourceTypeRequest_builder{
+		ResourceTypeId: r.GetId().GetResourceType(),
+	}.Build())
+	if err != nil {
+		return false, err
+	}
+
+	rtAnnos := annotations.Annotations(rt.GetResourceType().GetAnnotations())
+
+	skipEntitlements := rtAnnos.Contains(&v2.SkipEntitlements{}) || rtAnnos.Contains(&v2.SkipEntitlementsAndGrants{})
+	s.skipEntitlementsForResourceType[r.GetId().GetResourceType()] = skipEntitlements
+
+	return skipEntitlements, nil
+}
+
 // SyncEntitlements fetches the entitlements from the connector. It first lists each resource from the datastore,
 // and pushes an action to fetch the entitlements for each resource.
 func (s *syncer) SyncEntitlements(ctx context.Context) error {
@@ -1219,7 +1259,7 @@ func (s *syncer) SyncEntitlements(ctx context.Context) error {
 		}
 
 		for _, r := range resp.GetList() {
-			shouldSkipEntitlements, err := s.shouldSkipEntitlementsAndGrants(ctx, r)
+			shouldSkipEntitlements, err := s.shouldSkipEntitlements(ctx, r)
 			if err != nil {
 				return err
 			}
@@ -3165,11 +3205,12 @@ func WithSkipGrants(skip bool) SyncOpt {
 // NewSyncer returns a new syncer object.
 func NewSyncer(ctx context.Context, c types.ConnectorClient, opts ...SyncOpt) (Syncer, error) {
 	s := &syncer{
-		connector:             c,
-		skipEGForResourceType: make(map[string]bool),
-		resourceTypeTraits:    make(map[string][]v2.ResourceType_Trait),
-		counts:                NewProgressCounts(),
-		syncType:              connectorstore.SyncTypeFull,
+		connector:                       c,
+		skipEGForResourceType:           make(map[string]bool),
+		skipEntitlementsForResourceType: make(map[string]bool),
+		resourceTypeTraits:              make(map[string][]v2.ResourceType_Trait),
+		counts:                          NewProgressCounts(),
+		syncType:                        connectorstore.SyncTypeFull,
 	}
 
 	for _, o := range opts {

pkg/field/defaults.go

@@ -11,3 +11,5 @@ message ChildResourceType {
 message SkipEntitlementsAndGrants {}
 
 message SkipGrants {}
+
+message SkipEntitlements {}