refactor: rename lowlevel package to uploadrevision

Author: paulrosca-snyk

internal/fileupload/client.go

@@ -13,26 +13,24 @@ import (
 	"github.com/puzpuzpuz/xsync"
 
 	listsources "github.com/snyk/cli-extension-os-flows/internal/files"
-	"github.com/snyk/cli-extension-os-flows/internal/fileupload/lowlevel"
+	"github.com/snyk/cli-extension-os-flows/internal/fileupload/uploadrevision"
 )
 
 // Config contains configuration for the file upload client.
 type Config struct {
 	BaseURL string
-	OrgID   uuid.UUID
+	OrgID   OrgID
 }
 
 // Client provides high-level file upload functionality.
 type Client struct {
 	httpClient *http.Client
-	lowlevel   lowlevel.SealableClient
+	lowlevel   uploadrevision.SealableClient
 	cfg        Config
 	filters    Filters
 }
 
 // NewClient creates a new high-level file upload client.
-// For production use, consumers only need to provide Config.
-// For testing, use WithLowLevelClient option to inject a mock.
 func NewClient(httpClient *http.Client, cfg Config, opts ...Option) *Client {
 	client := &Client{
 		httpClient: httpClient,
@@ -48,9 +46,9 @@ func NewClient(httpClient *http.Client, cfg Config, opts ...Option) *Client {
 	}
 
 	if client.lowlevel == nil {
-		client.lowlevel = lowlevel.NewClient(lowlevel.Config{
+		client.lowlevel = uploadrevision.NewClient(uploadrevision.Config{
 			BaseURL: cfg.BaseURL,
-		}, lowlevel.WithHTTPClient(httpClient))
+		}, uploadrevision.WithHTTPClient(httpClient))
 	}
 
 	return client
@@ -71,9 +69,10 @@ func (c *Client) getDeeproxyFilters(ctx context.Context) (FiltersResponse, error
 	if err != nil {
 		return filtersResp, fmt.Errorf("error making deeproxy filters request: %w", err)
 	}
+	defer resp.Body.Close()
 
 	if resp.StatusCode < 200 || resp.StatusCode > 299 {
-		return filtersResp, fmt.Errorf("unexpected response code: %s (%s)", resp.Status, resp.Body)
+		return filtersResp, fmt.Errorf("unexpected response code: %s", resp.Status)
 	}
 
 	if err := json.NewDecoder(resp.Body).Decode(&filtersResp); err != nil {
@@ -108,11 +107,7 @@ func (c *Client) loadFilters(ctx context.Context) error {
 
 // createFileFilter creates a filter function based on the current filtering configuration.
 // Returns nil if filtering should be skipped, otherwise returns a function that evaluates files.
-func (c *Client) createFileFilter(ctx context.Context, opts UploadOptions) (func(string) bool, error) {
-	if opts.SkipFiltering {
-		return nil, nil
-	}
-
+func (c *Client) createFileFilter(ctx context.Context) (func(string) bool, error) {
 	if err := c.loadFilters(ctx); err != nil {
 		return nil, fmt.Errorf("failed to load deeproxy filters: %w", err)
 	}
@@ -127,7 +122,7 @@ func (c *Client) createFileFilter(ctx context.Context, opts UploadOptions) (func
 }
 
 func (c *Client) uploadPaths(ctx context.Context, revID RevisionID, rootPath string, paths []string) error {
-	files := make([]lowlevel.UploadFile, 0, c.lowlevel.GetLimits().FileCountLimit)
+	files := make([]uploadrevision.UploadFile, 0, c.lowlevel.GetLimits().FileCountLimit)
 	defer func() {
 		for _, file := range files {
 			file.File.Close()
@@ -137,40 +132,40 @@ func (c *Client) uploadPaths(ctx context.Context, revID RevisionID, rootPath str
 	for _, pth := range paths {
 		relPth, err := filepath.Rel(rootPath, pth)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to get relative path for %s: %w", pth, err)
 		}
 
 		f, err := os.Open(pth)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to open file %s: %w", pth, err)
 		}
 
-		files = append(files, lowlevel.UploadFile{
+		files = append(files, uploadrevision.UploadFile{
 			Path: relPth,
 			File: f,
 		})
 	}
 
 	err := c.lowlevel.UploadFiles(ctx, c.cfg.OrgID, revID, files)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to upload files: %w", err)
 	}
 
 	return nil
 }
 
 // addPathsToRevision adds multiple file paths to an existing revision.
 func (c *Client) addPathsToRevision(ctx context.Context, revisionID RevisionID, rootPath string, pathsChan <-chan string, opts UploadOptions) error {
-	filter, err := c.createFileFilter(ctx, opts)
-	if err != nil {
-		return err
-	}
-
 	var chunks <-chan []string
-	if filter != nil {
-		chunks = chunkChanFiltered(pathsChan, c.lowlevel.GetLimits().FileCountLimit, filter)
-	} else {
+
+	if opts.SkipFiltering {
 		chunks = chunkChan(pathsChan, c.lowlevel.GetLimits().FileCountLimit)
+	} else {
+		filter, err := c.createFileFilter(ctx)
+		if err != nil {
+			return err
+		}
+		chunks = chunkChanFiltered(pathsChan, c.lowlevel.GetLimits().FileCountLimit, filter)
 	}
 
 	for chunk := range chunks {
@@ -205,7 +200,7 @@ func (c *Client) AddFileToRevision(ctx context.Context, revisionID RevisionID, f
 func (c *Client) AddDirToRevision(ctx context.Context, revisionID RevisionID, dirPath string, opts UploadOptions) error {
 	sources, err := listsources.ForPath(dirPath, nil, runtime.NumCPU())
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to list files in directory %s: %w", dirPath, err)
 	}
 
 	return c.addPathsToRevision(ctx, revisionID, dirPath, sources, opts)