From 3a15de68de4a96f814850b71ff6d10e27bffaa18 Mon Sep 17 00:00:00 2001
From: MJ Palanker <mj.palanker@conductorone.com>
Date: Sat, 1 Nov 2025 23:14:01 -0700
Subject: [PATCH] new option to skip grant expand

---
 pkg/synccompactor/compactor.go | 78 +++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/pkg/synccompactor/compactor.go b/pkg/synccompactor/compactor.go
index 7dac81f02..371b1fa1e 100644
--- a/pkg/synccompactor/compactor.go
+++ b/pkg/synccompactor/compactor.go
@@ -32,8 +32,9 @@ const (
 )
 
 type Compactor struct {
-	compactorType CompactorType
-	entries       []*CompactableSync
+	compactorType      CompactorType
+	entries            []*CompactableSync
+	shouldExpandGrants bool
 
 	tmpDir  string
 	destDir string
@@ -62,15 +63,22 @@ func WithCompactorType(compactorType CompactorType) Option {
 	}
 }
 
+func WithShouldExpandGrants(shouldExpandGrants bool) Option {
+	return func(c *Compactor) {
+		c.shouldExpandGrants = shouldExpandGrants
+	}
+}
+
 func NewCompactor(ctx context.Context, outputDir string, compactableSyncs []*CompactableSync, opts ...Option) (*Compactor, func() error, error) {
 	if len(compactableSyncs) < 2 {
 		return nil, nil, ErrNotEnoughFilesToCompact
 	}
 
 	c := &Compactor{
-		entries:       compactableSyncs,
-		destDir:       outputDir,
-		compactorType: CompactorTypeAttached,
+		entries:            compactableSyncs,
+		destDir:            outputDir,
+		compactorType:      CompactorTypeAttached,
+		shouldExpandGrants: true,
 	}
 	for _, opt := range opts {
 		opt(c)
@@ -113,37 +121,39 @@ func (c *Compactor) Compact(ctx context.Context) (*CompactableSync, error) {
 		}
 	}
 
-	l := ctxzap.Extract(ctx)
-	// Grant expansion doesn't use the connector interface at all, so giving syncer an empty connector is safe... for now.
-	// If that ever changes, we should implement a file connector that is a wrapper around the reader.
-	emptyConnector, err := sdk.NewEmptyConnector()
-	if err != nil {
-		l.Error("error creating empty connector", zap.Error(err))
-		return nil, err
-	}
+	if c.shouldExpandGrants {
+		l := ctxzap.Extract(ctx)
+		// Grant expansion doesn't use the connector interface at all, so giving syncer an empty connector is safe... for now.
+		// If that ever changes, we should implement a file connector that is a wrapper around the reader.
+		emptyConnector, err := sdk.NewEmptyConnector()
+		if err != nil {
+			l.Error("error creating empty connector", zap.Error(err))
+			return nil, err
+		}
 
-	// Use syncer to expand grants.
-	// TODO: Handle external resources.
-	syncer, err := sync.NewSyncer(
-		ctx,
-		emptyConnector,
-		sync.WithC1ZPath(applied.FilePath),
-		sync.WithTmpDir(c.tmpDir),
-		sync.WithSyncID(applied.SyncID),
-		sync.WithOnlyExpandGrants(),
-	)
-	if err != nil {
-		l.Error("error creating syncer", zap.Error(err))
-		return nil, err
-	}
+		// Use syncer to expand grants.
+		// TODO: Handle external resources.
+		syncer, err := sync.NewSyncer(
+			ctx,
+			emptyConnector,
+			sync.WithC1ZPath(applied.FilePath),
+			sync.WithTmpDir(c.tmpDir),
+			sync.WithSyncID(applied.SyncID),
+			sync.WithOnlyExpandGrants(),
+		)
+		if err != nil {
+			l.Error("error creating syncer", zap.Error(err))
+			return nil, err
+		}
 
-	if err := syncer.Sync(ctx); err != nil {
-		l.Error("error syncing with grant expansion", zap.Error(err))
-		return nil, err
-	}
-	if err := syncer.Close(ctx); err != nil {
-		l.Error("error closing syncer", zap.Error(err))
-		return nil, err
+		if err := syncer.Sync(ctx); err != nil {
+			l.Error("error syncing with grant expansion", zap.Error(err))
+			return nil, err
+		}
+		if err := syncer.Close(ctx); err != nil {
+			l.Error("error closing syncer", zap.Error(err))
+			return nil, err
+		}
 	}
 
 	// Move last compacted file to the destination dir