Fix the bucket for presigns: it's always "Parquet"

Author: elffjs

internal/graph/base.resolvers.go

@@ -71,17 +71,20 @@ func New(chConn clickhouse.Conn, objGetter ObjectGetter, presigner Presigner, pa
 	}
 }
 
-// PresignBlobURL returns a short-lived presigned GET URL for the given S3 key and bucket.
-func (s *Service) PresignBlobURL(ctx context.Context, key, bucket string) (string, error) {
+// PresignBlobURL returns a short-lived presigned GET URL for the given S3 key in the parquet bucket.
+func (s *Service) PresignBlobURL(ctx context.Context, key string) (string, error) {
 	if s.presigner == nil {
 		return "", fmt.Errorf("presigner not configured")
 	}
+	if s.parquetBucket == "" {
+		return "", fmt.Errorf("parquet bucket not configured")
+	}
 	req, err := s.presigner.PresignGetObject(ctx, &s3.GetObjectInput{
-		Bucket: aws.String(bucket),
+		Bucket: aws.String(s.parquetBucket),
 		Key:    aws.String(key),
 	}, s3.WithPresignExpires(presignTTL))
 	if err != nil {
-		return "", fmt.Errorf("presign %s/%s: %w", bucket, key, err)
+		return "", fmt.Errorf("presign %s/%s: %w", s.parquetBucket, key, err)
 	}
 	return req.URL, nil
 }

pkg/eventrepo/eventrepo.go

@@ -20,14 +20,14 @@ func TestPresignBlobURL(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockPresigner := NewMockPresigner(ctrl)
 
-	svc := eventrepo.New(nil, nil, mockPresigner, "")
-
 	const (
 		bucket      = "test-bucket"
 		key         = "cloudevent/blobs/some-scan.bin"
 		expectedURL = "https://s3.amazonaws.com/test-bucket/cloudevent/blobs/some-scan.bin?X-Amz-Signature=abc123"
 	)
 
+	svc := eventrepo.New(nil, nil, mockPresigner, bucket)
+
 	mockPresigner.EXPECT().
 		PresignGetObject(gomock.Any(), gomock.Any(), gomock.Any()).
 		DoAndReturn(func(_ context.Context, params *s3.GetObjectInput, optFns ...func(*s3.PresignOptions)) (*v4.PresignedHTTPRequest, error) {
@@ -44,7 +44,7 @@ func TestPresignBlobURL(t *testing.T) {
 			return &v4.PresignedHTTPRequest{URL: expectedURL}, nil
 		})
 
-	url, err := svc.PresignBlobURL(context.Background(), key, bucket)
+	url, err := svc.PresignBlobURL(context.Background(), key)
 	require.NoError(t, err)
 	assert.Equal(t, expectedURL, url)
 }
@@ -54,21 +54,33 @@ func TestPresignBlobURL_PresignerError(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockPresigner := NewMockPresigner(ctrl)
 
-	svc := eventrepo.New(nil, nil, mockPresigner, "")
+	svc := eventrepo.New(nil, nil, mockPresigner, "test-bucket")
 
 	mockPresigner.EXPECT().
 		PresignGetObject(gomock.Any(), gomock.Any(), gomock.Any()).
 		Return(nil, fmt.Errorf("signing failure"))
 
-	_, err := svc.PresignBlobURL(context.Background(), "cloudevent/blobs/test.bin", "test-bucket")
+	_, err := svc.PresignBlobURL(context.Background(), "cloudevent/blobs/test.bin")
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "signing failure")
 }
 
 func TestPresignBlobURL_NilPresigner(t *testing.T) {
 	t.Parallel()
-	svc := eventrepo.New(nil, nil, nil, "")
+	svc := eventrepo.New(nil, nil, nil, "test-bucket")
+
+	_, err := svc.PresignBlobURL(context.Background(), "cloudevent/blobs/test.bin")
+	require.Error(t, err)
+}
+
+func TestPresignBlobURL_NoBucket(t *testing.T) {
+	t.Parallel()
+	ctrl := gomock.NewController(t)
+	mockPresigner := NewMockPresigner(ctrl)
+
+	svc := eventrepo.New(nil, nil, mockPresigner, "")
 
-	_, err := svc.PresignBlobURL(context.Background(), "cloudevent/blobs/test.bin", "test-bucket")
+	_, err := svc.PresignBlobURL(context.Background(), "cloudevent/blobs/test.bin")
 	require.Error(t, err)
+	assert.Contains(t, err.Error(), "parquet bucket not configured")
 }