From aed9eb1d91cf172b7fbb770e445333d33a2f6630 Mon Sep 17 00:00:00 2001 From: Dustin Decker Date: Thu, 21 Aug 2025 16:06:07 -0700 Subject: [PATCH] whitespace changes --- pkg/sources/s3/s3.go | 6 +++--- pkg/sources/s3/s3_test.go | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/sources/s3/s3.go b/pkg/sources/s3/s3.go index af9a61281..2eac9588a 100644 --- a/pkg/sources/s3/s3.go +++ b/pkg/sources/s3/s3.go @@ -395,7 +395,7 @@ func (s *Source) scanBuckets( // Chunks emits chunks of bytes over a channel. func (s *Source) Chunks(ctx context.Context, chunksChan chan *sources.Chunk, targets ...sources.ChunkingTarget) error { chunksReporter := sources.ChanReporter{Ch: chunksChan} - + // If targets are provided, we're only scanning the data in those targets. // Otherwise, we're scanning all data. // This allows us to only scan the specific S3 object where a secret was found for reverification. @@ -504,7 +504,7 @@ func (s *Source) getClientForBucket(ctx context.Context, bucket string) (*s3.Cli // For targeted scanning, we need to handle bucket access through the configured roles // We'll try to get a client that can access this bucket var lastErr error - + // Try each configured role to find one that can access this bucket for _, role := range s.conn.GetRoles() { client, err := s.newClient(ctx, defaultAWSRegion, role) @@ -532,7 +532,7 @@ func (s *Source) getClientForBucket(ctx context.Context, bucket string) (*s3.Cli return regionalClient, nil } - + // If no roles worked, try with the default (no role) client, err := s.newClient(ctx, defaultAWSRegion, "") if err != nil { diff --git a/pkg/sources/s3/s3_test.go b/pkg/sources/s3/s3_test.go index d567ef9f8..5ef5ce11b 100644 --- a/pkg/sources/s3/s3_test.go +++ b/pkg/sources/s3/s3_test.go @@ -199,36 +199,36 @@ func TestSource_Chunks_TargetedScanning(t *testing.T) { var actualBucket string var actualKey string var actualData []byte - + // Run a quick scan to discover available objects tempChunksCh := make(chan *sources.Chunk, 1) go func() { defer close(tempChunksCh) _ = s.Chunks(ctx, tempChunksCh) }() - + // Get the first chunk to extract actual S3 metadata select { case <-ctx.Done(): t.Fatal("Failed to get sample chunk for S3 metadata") case chunk, ok := <-tempChunksCh: require.True(t, ok, "Should receive at least one chunk from regular scan") - + // Extract the S3 metadata from the chunk s3Meta, ok := chunk.SourceMetadata.GetData().(*source_metadatapb.MetaData_S3) require.True(t, ok, "First chunk should have S3 metadata") - + actualBucket = s3Meta.S3.GetBucket() actualKey = s3Meta.S3.GetFile() actualData = chunk.Data - + t.Logf("Found S3 object: bucket=%s, key=%s, size=%d bytes", actualBucket, actualKey, len(actualData)) - + // Drain remaining chunks for range tempChunksCh { } } - + require.NotEmpty(t, actualBucket, "Should have found a bucket") require.NotEmpty(t, actualKey, "Should have found a key") require.NotEmpty(t, actualData, "Should have found data") @@ -262,14 +262,14 @@ func TestSource_Chunks_TargetedScanning(t *testing.T) { t.Fatal("TestSource_Chunks_TargetedScanning timed out") case chunk, ok := <-chunksCh: require.True(t, ok, "Should receive at least one chunk") - + // Verify the chunk has the right properties assert.Equal(t, SourceType, chunk.SourceType) assert.Equal(t, sources.SourceID(0), chunk.SourceID) assert.Equal(t, sources.JobID(0), chunk.JobID) assert.Equal(t, int64(12345), chunk.SecretID) assert.False(t, chunk.Verify) - + // Verify the metadata require.NotNil(t, chunk.SourceMetadata) s3Meta, ok := chunk.SourceMetadata.GetData().(*source_metadatapb.MetaData_S3) @@ -278,11 +278,11 @@ func TestSource_Chunks_TargetedScanning(t *testing.T) { assert.Equal(t, actualKey, s3Meta.S3.GetFile()) assert.Equal(t, fmt.Sprintf("s3://%s/%s", actualBucket, actualKey), s3Meta.S3.GetLink()) assert.Equal(t, "test@trufflesecurity.com", s3Meta.S3.GetEmail()) - + // Verify the chunk has data (should match the content we discovered from regular scan) assert.Equal(t, actualData, chunk.Data, "Chunk data should match the S3 object content from targeted scan") - - t.Logf("Successfully received targeted chunk: bucket=%s, key=%s, size=%d bytes", + + t.Logf("Successfully received targeted chunk: bucket=%s, key=%s, size=%d bytes", s3Meta.S3.GetBucket(), s3Meta.S3.GetFile(), len(chunk.Data)) } }