chore: remove filter from public interface and default disable

Author: PeterSchafer

pkg/apiclients/fileupload/client.go

@@ -21,9 +21,8 @@ import (
 
 // Config contains configuration for the file upload client.
 type Config struct {
-	BaseURL   string
-	OrgID     OrgID
-	IsFedRamp bool
+	BaseURL string
+	OrgID   OrgID
 }
 
 // HTTPClient provides high-level file upload functionality.
@@ -37,9 +36,9 @@ type HTTPClient struct {
 
 // Client defines the interface for the high level file upload client.
 type Client interface {
-	CreateRevisionFromPaths(ctx context.Context, paths []string, opts UploadOptions) (UploadResult, error)
-	CreateRevisionFromDir(ctx context.Context, dirPath string, opts UploadOptions) (UploadResult, error)
-	CreateRevisionFromFile(ctx context.Context, filePath string, opts UploadOptions) (UploadResult, error)
+	CreateRevisionFromPaths(ctx context.Context, paths []string) (UploadResult, error)
+	CreateRevisionFromDir(ctx context.Context, dirPath string) (UploadResult, error)
+	CreateRevisionFromFile(ctx context.Context, filePath string) (UploadResult, error)
 }
 
 var _ Client = (*HTTPClient)(nil)
@@ -71,7 +70,7 @@ func NewClient(httpClient *http.Client, cfg Config, opts ...Option) *HTTPClient
 	if client.filtersClient == nil {
 		client.filtersClient = filters.NewDeeproxyClient(filters.Config{
 			BaseURL:   cfg.BaseURL,
-			IsFedRamp: cfg.IsFedRamp,
+			IsFedRamp: false, //cfg.IsFedRamp,
 		}, filters.WithHTTPClient(httpClient))
 	}
 
@@ -152,7 +151,7 @@ func (c *HTTPClient) addPathsToRevision(
 	revisionID RevisionID,
 	rootPath string,
 	pathsChan <-chan string,
-	opts UploadOptions,
+	opts uploadOptions,
 ) (UploadResult, error) {
 	res := UploadResult{
 		RevisionID:    revisionID,
@@ -224,7 +223,7 @@ func (c *HTTPClient) createRevision(ctx context.Context) (RevisionID, error) {
 }
 
 // addFileToRevision adds a single file to an existing revision.
-func (c *HTTPClient) addFileToRevision(ctx context.Context, revisionID RevisionID, filePath string, opts UploadOptions) (UploadResult, error) {
+func (c *HTTPClient) addFileToRevision(ctx context.Context, revisionID RevisionID, filePath string, opts uploadOptions) (UploadResult, error) {
 	writableChan := make(chan string, 1)
 	writableChan <- filePath
 	close(writableChan)
@@ -233,7 +232,7 @@ func (c *HTTPClient) addFileToRevision(ctx context.Context, revisionID RevisionI
 }
 
 // addDirToRevision adds a directory and all its contents to an existing revision.
-func (c *HTTPClient) addDirToRevision(ctx context.Context, revisionID RevisionID, dirPath string, opts UploadOptions) (UploadResult, error) {
+func (c *HTTPClient) addDirToRevision(ctx context.Context, revisionID RevisionID, dirPath string, opts uploadOptions) (UploadResult, error) {
 	sources, err := listsources.ForPath(dirPath, c.logger, runtime.NumCPU())
 	if err != nil {
 		return UploadResult{}, fmt.Errorf("failed to list files in directory %s: %w", dirPath, err)
@@ -253,7 +252,11 @@ func (c *HTTPClient) sealRevision(ctx context.Context, revisionID RevisionID) er
 
 // CreateRevisionFromPaths uploads multiple paths (files or directories), returning a revision ID.
 // This is a convenience method that creates, uploads, and seals a revision.
-func (c *HTTPClient) CreateRevisionFromPaths(ctx context.Context, paths []string, opts UploadOptions) (UploadResult, error) {
+func (c *HTTPClient) CreateRevisionFromPaths(ctx context.Context, paths []string) (UploadResult, error) {
+	opts := uploadOptions{
+		SkipDeeproxyFiltering: true,
+	}
+
 	res := UploadResult{
 		FilteredFiles: make([]FilteredFile, 0),
 	}
@@ -300,7 +303,7 @@ func (c *HTTPClient) CreateRevisionFromPaths(ctx context.Context, paths []string
 
 // CreateRevisionFromDir uploads a directory and all its contents, returning a revision ID.
 // This is a convenience method for validating the directory path and calling CreateRevisionFromPaths with a single directory path.
-func (c *HTTPClient) CreateRevisionFromDir(ctx context.Context, dirPath string, opts UploadOptions) (UploadResult, error) {
+func (c *HTTPClient) CreateRevisionFromDir(ctx context.Context, dirPath string) (UploadResult, error) {
 	info, err := os.Stat(dirPath)
 	if err != nil {
 		return UploadResult{}, uploadrevision.NewFileAccessError(dirPath, err)
@@ -310,12 +313,12 @@ func (c *HTTPClient) CreateRevisionFromDir(ctx context.Context, dirPath string,
 		return UploadResult{}, fmt.Errorf("the provided path is not a directory: %s", dirPath)
 	}
 
-	return c.CreateRevisionFromPaths(ctx, []string{dirPath}, opts)
+	return c.CreateRevisionFromPaths(ctx, []string{dirPath})
 }
 
 // CreateRevisionFromFile uploads a single file, returning a revision ID.
 // This is a convenience method for validating the file path and calling CreateRevisionFromPaths with a single file path.
-func (c *HTTPClient) CreateRevisionFromFile(ctx context.Context, filePath string, opts UploadOptions) (UploadResult, error) {
+func (c *HTTPClient) CreateRevisionFromFile(ctx context.Context, filePath string) (UploadResult, error) {
 	info, err := os.Stat(filePath)
 	if err != nil {
 		return UploadResult{}, uploadrevision.NewFileAccessError(filePath, err)
@@ -325,5 +328,5 @@ func (c *HTTPClient) CreateRevisionFromFile(ctx context.Context, filePath string
 		return UploadResult{}, fmt.Errorf("the provided path is not a regular file: %s", filePath)
 	}
 
-	return c.CreateRevisionFromPaths(ctx, []string{filePath}, opts)
+	return c.CreateRevisionFromPaths(ctx, []string{filePath})
 }

pkg/apiclients/fileupload/client_integration_test.go

@@ -9,9 +9,10 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/snyk/go-application-framework/pkg/apiclients/util"
+
 	"github.com/snyk/go-application-framework/pkg/apiclients/fileupload"
 	"github.com/snyk/go-application-framework/pkg/apiclients/fileupload/uploadrevision"
-	"github.com/snyk/go-application-framework/pkg/apiclients/util"
 )
 
 func TestUploadFileIntegration(t *testing.T) {
@@ -24,7 +25,7 @@ func TestUploadFileIntegration(t *testing.T) {
 
 	dir := util.CreateTmpFiles(t, files)
 
-	res, err := fileUploadClient.CreateRevisionFromFile(t.Context(), filepath.Join(dir.Name(), files[0].Path), fileupload.UploadOptions{})
+	res, err := fileUploadClient.CreateRevisionFromFile(t.Context(), filepath.Join(dir.Name(), files[0].Path))
 	if err != nil {
 		t.Errorf("failed to create fileupload revision: %s", err.Error())
 	}
@@ -43,7 +44,7 @@ func TestUploadDirectoryIntegration(t *testing.T) {
 
 	dir := util.CreateTmpFiles(t, files)
 
-	res, err := fileUploadClient.CreateRevisionFromDir(t.Context(), dir.Name(), fileupload.UploadOptions{})
+	res, err := fileUploadClient.CreateRevisionFromDir(t.Context(), dir.Name())
 	if err != nil {
 		t.Errorf("failed to create fileupload revision: %s", err.Error())
 	}
@@ -61,7 +62,7 @@ func TestUploadLargeFileIntegration(t *testing.T) {
 
 	dir := util.CreateTmpFiles(t, files)
 
-	res, err := fileUploadClient.CreateRevisionFromFile(t.Context(), filepath.Join(dir.Name(), files[0].Path), fileupload.UploadOptions{})
+	res, err := fileUploadClient.CreateRevisionFromFile(t.Context(), filepath.Join(dir.Name(), files[0].Path))
 	if err != nil {
 		t.Errorf("failed to create fileupload revision: %s", err.Error())
 	}

pkg/apiclients/fileupload/client_test.go

@@ -98,7 +98,7 @@ func Test_CreateRevisionFromPaths(t *testing.T) {
 			filepath.Join(dir.Name(), "README.md"), // Individual file
 		}
 
-		res, err := client.CreateRevisionFromPaths(ctx, paths, fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromPaths(ctx, paths)
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -115,25 +115,6 @@ func Test_CreateRevisionFromPaths(t *testing.T) {
 		assert.Contains(t, uploadedPaths, "README.md")
 	})
 
-	t.Run("get filters error", func(t *testing.T) {
-		allFiles := []uploadrevision.LoadedFile{
-			{Path: mainpath, Content: "package main"},
-			{Path: utilspath, Content: "package utils"},
-			{Path: "config.yaml", Content: "version: 1"},
-			{Path: "README.md", Content: "# Project"},
-		}
-
-		ctx, _, client, dir := setupTest(t, llcfg, allFiles, filters.AllowList{}, assert.AnError)
-
-		paths := []string{
-			filepath.Join(dir.Name(), "src"),       // Directory
-			filepath.Join(dir.Name(), "README.md"), // Individual file
-		}
-
-		_, err := client.CreateRevisionFromPaths(ctx, paths, fileupload.UploadOptions{})
-		require.ErrorContains(t, err, "failed to load deeproxy filters")
-	})
-
 	t.Run("error handling with better context", func(t *testing.T) {
 		ctx, _, client, _ := setupTest(t, llcfg, []uploadrevision.LoadedFile{}, allowList, nil)
 
@@ -142,7 +123,7 @@ func Test_CreateRevisionFromPaths(t *testing.T) {
 			missingpath,
 		}
 
-		_, err := client.CreateRevisionFromPaths(ctx, paths, fileupload.UploadOptions{})
+		_, err := client.CreateRevisionFromPaths(ctx, paths)
 		require.Error(t, err)
 		var fileAccessErr *uploadrevision.FileAccessError
 		assert.ErrorAs(t, err, &fileAccessErr)
@@ -178,7 +159,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 		}
 		ctx, fakeSealableClient, client, dir := setupTest(t, llcfg, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -200,7 +181,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 		}
 		ctx, fakeSealableClient, client, dir := setupTest(t, llcfg, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -234,7 +215,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 		}
 		ctx, fakeSealableClient, client, dir := setupTest(t, llcfg, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -269,7 +250,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 			},
 		}, allFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		var fileSizeErr *uploadrevision.FileSizeLimitError
@@ -312,7 +293,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 			},
 		}, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -350,7 +331,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 			},
 		}, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -394,7 +375,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 			},
 		}, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -424,7 +405,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 			},
 		}, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -433,45 +414,6 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 		expectEqualFiles(t, expectedFiles, uploadedFiles)
 	})
 
-	t.Run("uploading a directory applies filtering", func(t *testing.T) {
-		expectedFiles := []uploadrevision.LoadedFile{
-			{
-				Path:    mainpath,
-				Content: "package main\n\nfunc main() {}",
-			},
-			{
-				Path:    helperpath,
-				Content: "package utils\n\nfunc Helper() {}",
-			},
-			{
-				Path:    gomodpath,
-				Content: "foo bar",
-			},
-		}
-		additionalFiles := []uploadrevision.LoadedFile{
-			{
-				Path:    scriptpath,
-				Content: "console.log('hi')",
-			},
-			{
-				Path:    packagelockpath,
-				Content: "{}",
-			},
-		}
-		//nolint:gocritic // Not an issue for tests.
-		allFiles := append(expectedFiles, additionalFiles...)
-
-		ctx, fakeSealableClient, client, dir := setupTest(t, llcfg, allFiles, allowList, nil)
-
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{})
-		require.NoError(t, err)
-
-		assert.Len(t, res.FilteredFiles, 2)
-		uploadedFiles, err := fakeSealableClient.GetSealedRevisionFiles(res.RevisionID)
-		require.NoError(t, err)
-		expectEqualFiles(t, expectedFiles, uploadedFiles)
-	})
-
 	t.Run("uploading a directory with filtering disabled", func(t *testing.T) {
 		allFiles := []uploadrevision.LoadedFile{
 			{
@@ -498,7 +440,7 @@ func Test_CreateRevisionFromDir(t *testing.T) {
 
 		ctx, fakeSealableClient, client, dir := setupTest(t, llcfg, allFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromDir(ctx, dir.Name(), fileupload.UploadOptions{SkipDeeproxyFiltering: true})
+		res, err := client.CreateRevisionFromDir(ctx, dir.Name())
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -532,7 +474,7 @@ func Test_CreateRevisionFromFile(t *testing.T) {
 		}
 		ctx, fakeSealableClient, client, dir := setupTest(t, llcfg, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "file1.txt"), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "file1.txt"))
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)
@@ -557,7 +499,7 @@ func Test_CreateRevisionFromFile(t *testing.T) {
 			},
 		}, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "file1.txt"), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "file1.txt"))
 		require.NoError(t, err)
 
 		var fileSizeErr *uploadrevision.FileSizeLimitError
@@ -590,7 +532,7 @@ func Test_CreateRevisionFromFile(t *testing.T) {
 			},
 		}, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "file1.txt"), fileupload.UploadOptions{})
+		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "file1.txt"))
 		require.NoError(t, err)
 
 		var filePathErr *uploadrevision.FilePathLengthLimitError
@@ -606,25 +548,6 @@ func Test_CreateRevisionFromFile(t *testing.T) {
 		expectEqualFiles(t, nil, uploadedFiles)
 	})
 
-	t.Run("uploading a file applies filtering", func(t *testing.T) {
-		allFiles := []uploadrevision.LoadedFile{
-			{
-				Path:    "script.js",
-				Content: "console.log('hi')",
-			},
-		}
-
-		ctx, fakeSealableClient, client, dir := setupTest(t, llcfg, allFiles, allowList, nil)
-
-		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "script.js"), fileupload.UploadOptions{})
-		require.NoError(t, err)
-
-		assert.Len(t, res.FilteredFiles, 1)
-		uploadedFiles, err := fakeSealableClient.GetSealedRevisionFiles(res.RevisionID)
-		require.NoError(t, err)
-		expectEqualFiles(t, nil, uploadedFiles)
-	})
-
 	t.Run("uploading a file with filtering disabled", func(t *testing.T) {
 		expectedFiles := []uploadrevision.LoadedFile{
 			{
@@ -635,7 +558,7 @@ func Test_CreateRevisionFromFile(t *testing.T) {
 
 		ctx, fakeSealableClient, client, dir := setupTest(t, llcfg, expectedFiles, allowList, nil)
 
-		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "script.js"), fileupload.UploadOptions{SkipDeeproxyFiltering: true})
+		res, err := client.CreateRevisionFromFile(ctx, path.Join(dir.Name(), "script.js"))
 		require.NoError(t, err)
 
 		assert.Empty(t, res.FilteredFiles)