Rename metaData to just metadata

internal/command/command_test.go

@@ -107,10 +107,10 @@ func TestNewLogMetadata(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
-			metaData := NewLogMetadata(tc.project, tc.username)
-			require.Equal(t, tc.project, metaData.Project)
-			require.Equal(t, tc.username, metaData.Username)
-			require.Equal(t, tc.expectedRootNamespace, metaData.RootNamespace)
+			metadata := NewLogMetadata(tc.project, tc.username)
+			require.Equal(t, tc.project, metadata.Project)
+			require.Equal(t, tc.username, metadata.Username)
+			require.Equal(t, tc.expectedRootNamespace, metadata.RootNamespace)
 		})
 	}
 }

internal/command/discover/discover.go

@@ -23,16 +23,16 @@ func (c *Command) Execute(ctx context.Context) (context.Context, error) {
 		return ctx, fmt.Errorf("Failed to get username: %v", err)
 	}
 
-	metaData := command.LogMetadata{}
+	metadata := command.LogMetadata{}
 	if response.IsAnonymous() {
-		metaData.Username = "Anonymous"
+		metadata.Username = "Anonymous"
 		fmt.Fprintf(c.ReadWriter.Out, "Welcome to GitLab, Anonymous!\n")
 	} else {
-		metaData.Username = response.Username
+		metadata.Username = response.Username
 		fmt.Fprintf(c.ReadWriter.Out, "Welcome to GitLab, @%s!\n", response.Username)
 	}
 
-	ctxWithLogMetadata := context.WithValue(ctx, "metaData", metaData)
+	ctxWithLogMetadata := context.WithValue(ctx, "metadata", metadata)
 
 	return ctxWithLogMetadata, nil
 }

internal/command/discover/discover_test.go

@@ -90,7 +90,7 @@ func TestExecute(t *testing.T) {
 
 			require.NoError(t, err)
 			require.Equal(t, expectedOutput, buffer.String())
-			require.Equal(t, expectedUsername, ctxWithLogMetadata.Value("metaData").(command.LogMetadata).Username)
+			require.Equal(t, expectedUsername, ctxWithLogMetadata.Value("metadata").(command.LogMetadata).Username)
 		})
 	}
 }

internal/command/lfsauthenticate/lfsauthenticate.go

@@ -58,11 +58,11 @@ func (c *Command) Execute(ctx context.Context) (context.Context, error) {
 		return ctx, err
 	}
 
-	metaData := command.NewLogMetadata(
+	metadata := command.NewLogMetadata(
 		accessResponse.Gitaly.Repo.GlProjectPath,
 		accessResponse.Username,
 	)
-	ctxWithLogMetadata := context.WithValue(ctx, "metaData", metaData)
+	ctxWithLogMetadata := context.WithValue(ctx, "metadata", metadata)
 
 	payload, err := c.authenticate(ctx, operation, repo, accessResponse.UserId)
 	if err != nil {

internal/command/lfsauthenticate/lfsauthenticate_test.go

@@ -157,10 +157,10 @@ func TestLfsAuthenticateRequests(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, tc.expectedOutput, output.String())
 
-			metaData := ctxWithLogMetadata.Value("metaData").(command.LogMetadata)
-			require.Equal(t, "alex-doe", metaData.Username)
-			require.Equal(t, "group/project-path", metaData.Project)
-			require.Equal(t, "group", metaData.RootNamespace)
+			metadata := ctxWithLogMetadata.Value("metadata").(command.LogMetadata)
+			require.Equal(t, "alex-doe", metadata.Username)
+			require.Equal(t, "group/project-path", metadata.Project)
+			require.Equal(t, "group", metadata.RootNamespace)
 		})
 	}
 }

internal/command/receivepack/receivepack.go

@@ -31,7 +31,7 @@ func (c *Command) Execute(ctx context.Context) (context.Context, error) {
 		return ctx, err
 	}
 
-	ctxWithLogMetadata := context.WithValue(ctx, "metaData", command.NewLogMetadata(
+	ctxWithLogMetadata := context.WithValue(ctx, "metadata", command.NewLogMetadata(
 		response.Gitaly.Repo.GlProjectPath,
 		response.Username,
 	))

internal/command/receivepack/receivepack_test.go

@@ -24,10 +24,10 @@ func TestAllowedAccess(t *testing.T) {
 	ctxWithLogMetadata, err := cmd.Execute(context.Background())
 
 	require.NoError(t, err)
-	metaData := ctxWithLogMetadata.Value("metaData").(command.LogMetadata)
-	require.Equal(t, "alex-doe", metaData.Username)
-	require.Equal(t, "group/project-path", metaData.Project)
-	require.Equal(t, "group", metaData.RootNamespace)
+	metadata := ctxWithLogMetadata.Value("metadata").(command.LogMetadata)
+	require.Equal(t, "alex-doe", metadata.Username)
+	require.Equal(t, "group/project-path", metadata.Project)
+	require.Equal(t, "group", metadata.RootNamespace)
 }
 
 func TestForbiddenAccess(t *testing.T) {

internal/command/uploadarchive/uploadarchive.go

@@ -29,11 +29,11 @@ func (c *Command) Execute(ctx context.Context) (context.Context, error) {
 		return ctx, err
 	}
 
-	metaData := command.NewLogMetadata(
+	metadata := command.NewLogMetadata(
 		response.Gitaly.Repo.GlProjectPath,
 		response.Username,
 	)
-	ctxWithLogMetadata := context.WithValue(ctx, "metaData", metaData)
+	ctxWithLogMetadata := context.WithValue(ctx, "metadata", metadata)
 
 	return ctxWithLogMetadata, c.performGitalyCall(ctx, response)
 }

internal/command/uploadarchive/uploadarchive_test.go

@@ -24,10 +24,10 @@ func TestAllowedAccess(t *testing.T) {
 	ctxWithLogMetadata, err := cmd.Execute(context.Background())
 
 	require.NoError(t, err)
-	metaData := ctxWithLogMetadata.Value("metaData").(command.LogMetadata)
-	require.Equal(t, "alex-doe", metaData.Username)
-	require.Equal(t, "group/project-path", metaData.Project)
-	require.Equal(t, "group", metaData.RootNamespace)
+	metadata := ctxWithLogMetadata.Value("metadata").(command.LogMetadata)
+	require.Equal(t, "alex-doe", metadata.Username)
+	require.Equal(t, "group/project-path", metadata.Project)
+	require.Equal(t, "group", metadata.RootNamespace)
 }
 
 func TestForbiddenAccess(t *testing.T) {

internal/command/uploadpack/uploadpack.go

@@ -30,11 +30,11 @@ func (c *Command) Execute(ctx context.Context) (context.Context, error) {
 		return ctx, err
 	}
 
-	metaData := command.NewLogMetadata(
+	metadata := command.NewLogMetadata(
 		response.Gitaly.Repo.GlProjectPath,
 		response.Username,
 	)
-	ctxWithLogMetadata := context.WithValue(ctx, "metaData", metaData)
+	ctxWithLogMetadata := context.WithValue(ctx, "metadata", metadata)
 
 	if response.IsCustomAction() {
 		customAction := customaction.Command{

internal/command/uploadpack/uploadpack_test.go

@@ -24,10 +24,10 @@ func TestAllowedAccess(t *testing.T) {
 	ctxWithLogMetadata, err := cmd.Execute(context.Background())
 
 	require.NoError(t, err)
-	metaData := ctxWithLogMetadata.Value("metaData").(command.LogMetadata)
-	require.Equal(t, "alex-doe", metaData.Username)
-	require.Equal(t, "group/project-path", metaData.Project)
-	require.Equal(t, "group", metaData.RootNamespace)
+	metadata := ctxWithLogMetadata.Value("metadata").(command.LogMetadata)
+	require.Equal(t, "alex-doe", metadata.Username)
+	require.Equal(t, "group/project-path", metadata.Project)
+	require.Equal(t, "group", metadata.RootNamespace)
 }
 
 func TestForbiddenAccess(t *testing.T) {

internal/sshd/sshd.go

@@ -230,13 +230,13 @@ func (s *Server) proxyPolicy() (proxyproto.PolicyFunc, error) {
 }
 
 func extractMetaDataFromContext(ctx context.Context) command.LogMetadata {
-	metaData := command.LogMetadata{}
+	metadata := command.LogMetadata{}
 
-	if ctx.Value("metaData") != nil {
-		metaData = ctx.Value("metaData").(command.LogMetadata)
+	if ctx.Value("metadata") != nil {
+		metadata = ctx.Value("metadata").(command.LogMetadata)
 	}
 
-	return metaData
+	return metadata
 }
 
 func staticProxyPolicy(policy proxyproto.Policy) proxyproto.PolicyFunc {

internal/sshd/sshd_test.go

@@ -353,19 +353,19 @@ func TestExtractMetaDataFromContext(t *testing.T) {
 	rootNameSpace := "flightjs"
 	project := fmt.Sprintf("%s/Flight", rootNameSpace)
 	username := "alex-doe"
-	ctxWithLogMetadata := context.WithValue(context.Background(), "metaData", command.NewLogMetadata(project, username))
+	ctxWithLogMetadata := context.WithValue(context.Background(), "metadata", command.NewLogMetadata(project, username))
 
-	metaData := extractMetaDataFromContext(ctxWithLogMetadata)
+	metadata := extractMetaDataFromContext(ctxWithLogMetadata)
 
-	require.Equal(t, command.LogMetadata{Project: project, Username: username, RootNamespace: rootNameSpace}, metaData)
+	require.Equal(t, command.LogMetadata{Project: project, Username: username, RootNamespace: rootNameSpace}, metadata)
 }
 
 func TestExtractMetaDataFromContextWithoutMetaData(t *testing.T) {
 	ctxWithLogMetadata := context.Background()
 
-	metaData := extractMetaDataFromContext(ctxWithLogMetadata)
+	metadata := extractMetaDataFromContext(ctxWithLogMetadata)
 
-	require.Equal(t, command.LogMetadata{}, metaData)
+	require.Equal(t, command.LogMetadata{}, metadata)
 }
 
 func setupServer(t *testing.T) *Server {