cmd/gitaly-lfs-smudge: Rename functions and file

Rename the smudging functions to be better prepared for when we add
support for the long-running filter process protocol. While at it, this
commit also renames the hosting file to be called `smudge.go` instead of
`lfs_smudge.go` to avoid some repetition.

3 files changed, 8 insertions, 8 deletions

diff --git a/cmd/gitaly-lfs-smudge/main.go b/cmd/gitaly-lfs-smudge/main.go
index c9b9fcc4b..7e4ba6fc2 100644
--- a/cmd/gitaly-lfs-smudge/main.go
+++ b/cmd/gitaly-lfs-smudge/main.go
@@ -72,7 +72,7 @@ func run(environment []string, out io.Writer, in io.Reader) error {
 		return fmt.Errorf("loading configuration: %w", err)
 	}
 
-	if err := smudgeContents(ctx, cfg, out, in); err != nil {
+	if err := filter(ctx, cfg, out, in); err != nil {
 		return fmt.Errorf("running smudge filter: %w", err)
 	}
 
diff --git a/cmd/gitaly-lfs-smudge/lfs_smudge.go b/cmd/gitaly-lfs-smudge/smudge.go
index 87fe38cdc..7b6d4f7cc 100644
--- a/cmd/gitaly-lfs-smudge/lfs_smudge.go
+++ b/cmd/gitaly-lfs-smudge/smudge.go
@@ -13,13 +13,13 @@ import (
 	"gitlab.com/gitlab-org/labkit/log"
 )
 
-func smudgeContents(ctx context.Context, cfg smudge.Config, to io.Writer, from io.Reader) (returnedErr error) {
+func filter(ctx context.Context, cfg smudge.Config, to io.Writer, from io.Reader) (returnedErr error) {
 	client, err := gitlab.NewHTTPClient(log.ContextLogger(ctx), cfg.Gitlab, cfg.TLS, prometheus.Config{})
 	if err != nil {
 		return fmt.Errorf("creating HTTP client: %w", err)
 	}
 
-	output, err := handleSmudge(ctx, cfg, client, from)
+	output, err := smudgeOneObject(ctx, cfg, client, from)
 	if err != nil {
 		return fmt.Errorf("smudging contents: %w", err)
 	}
@@ -36,7 +36,7 @@ func smudgeContents(ctx context.Context, cfg smudge.Config, to io.Writer, from i
 	return nil
 }
 
-func handleSmudge(ctx context.Context, cfg smudge.Config, gitlabClient *gitlab.HTTPClient, from io.Reader) (io.ReadCloser, error) {
+func smudgeOneObject(ctx context.Context, cfg smudge.Config, gitlabClient *gitlab.HTTPClient, from io.Reader) (io.ReadCloser, error) {
 	logger := log.ContextLogger(ctx)
 
 	ptr, contents, err := lfs.DecodeFrom(from)
diff --git a/cmd/gitaly-lfs-smudge/lfs_smudge_test.go b/cmd/gitaly-lfs-smudge/smudge_test.go
index b63531124..b4f8c751a 100644
--- a/cmd/gitaly-lfs-smudge/lfs_smudge_test.go
+++ b/cmd/gitaly-lfs-smudge/smudge_test.go
@@ -45,7 +45,7 @@ var defaultOptions = gitlab.TestServerOptions{
 	ServerKeyPath:    keyPath,
 }
 
-func TestSuccessfulLfsSmudge(t *testing.T) {
+func TestFilter_successful(t *testing.T) {
 	testCases := []struct {
 		desc string
 		data string
@@ -79,13 +79,13 @@ func TestSuccessfulLfsSmudge(t *testing.T) {
 				},
 			}
 
-			require.NoError(t, smudgeContents(ctx, cfg, &b, reader))
+			require.NoError(t, filter(ctx, cfg, &b, reader))
 			require.Equal(t, testData, b.String())
 		})
 	}
 }
 
-func TestUnsuccessfulLfsSmudge(t *testing.T) {
+func TestFilter_unsuccessful(t *testing.T) {
 	defaultConfig := func(t *testing.T, gitlabCfg config.Gitlab) smudge.Config {
 		return smudge.Config{
 			GlRepository: "project-1",
@@ -180,7 +180,7 @@ func TestUnsuccessfulLfsSmudge(t *testing.T) {
 			cfg := tc.setupCfg(t, gitlabCfg)
 
 			var b bytes.Buffer
-			err := smudgeContents(ctx, cfg, &b, strings.NewReader(tc.data))
+			err := filter(ctx, cfg, &b, strings.NewReader(tc.data))
 
 			if tc.expectedError {
 				require.Error(t, err)