fmt

Author: easyCZ

components/public-api-server/pkg/apiv1/oidc.go

@@ -90,7 +90,7 @@ func (s *OIDCService) CreateClientConfig(ctx context.Context, req *connect.Reque
 	}
 
 	log.AddFields(ctx, logrus.Fields{
-		"oidc_client_config_id": created.ID.String(),
+		"oidcClientConfigId": created.ID.String(),
 	})
 
 	converted, err := dbOIDCClientConfigToAPI(created, s.cipher)
@@ -248,9 +248,7 @@ func (s *OIDCService) getUser(ctx context.Context, conn protocol.APIInterface) (
 	}
 
 	log.AddFields(ctx, logrus.Fields{
-		"user.id":        user.ID,
-		"user.blocked":   user.Blocked,
-		"user.prividged": user.Privileged,
+		"userId": user.ID,
 	})
 
 	if !s.isFeatureEnabled(ctx, conn, user) {

components/public-api-server/pkg/apiv1/team.go

@@ -270,7 +270,7 @@ func (s *TeamService) DeleteTeamMember(ctx context.Context, req *connect.Request
 }
 
 func (s *TeamService) toTeamAPIResponse(ctx context.Context, conn protocol.APIInterface, team *protocol.Team) (*v1.Team, error) {
-	logger := log.Extract(ctx).WithField("team.id", team.ID)
+	logger := log.Extract(ctx).WithField("teamId", team.ID)
 	members, err := conn.GetTeamMembers(ctx, team.ID)
 	if err != nil {
 		logger.WithError(err).Error("Failed to get team members.")

components/public-api-server/pkg/apiv1/tokens.go

@@ -303,9 +303,7 @@ func (s *TokensService) getUser(ctx context.Context, conn protocol.APIInterface)
 	}
 
 	log.AddFields(ctx, logrus.Fields{
-		"user.id":        user.ID,
-		"user.blocked":   user.Blocked,
-		"user.prividged": user.Privileged,
+		"userId": user.ID,
 	})
 
 	if !s.isFeatureEnabled(ctx, conn, user) {

components/public-api-server/pkg/apiv1/user.go

@@ -41,7 +41,7 @@ func (s *UserService) GetAuthenticatedUser(ctx context.Context, req *connect.Req
 		return nil, proxy.ConvertError(err)
 	}
 	log.AddFields(ctx, logrus.Fields{
-		"user.id": user.ID,
+		"userId": user.ID,
 	})
 
 	response := userToAPIResponse(user)

components/public-api-server/pkg/apiv1/validation.go

@@ -23,7 +23,7 @@ import (
 
 func validateTeamID(ctx context.Context, id string) (uuid.UUID, error) {
 	log.AddFields(ctx, logrus.Fields{
-		"team.id": id,
+		"teamId": id,
 	})
 	teamID, err := validateUUID(id)
 	if err != nil {
@@ -51,7 +51,7 @@ func parseGitpodTimestamp(input string) (*timestamppb.Timestamp, error) {
 
 func validateWorkspaceID(ctx context.Context, id string) (string, error) {
 	log.AddFields(ctx, logrus.Fields{
-		"workspace.id": id,
+		"workspaceId": id,
 	})
 	if id == "" {
 		return "", connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("Empty workspace id specified"))
@@ -67,7 +67,7 @@ func validateWorkspaceID(ctx context.Context, id string) (string, error) {
 
 func validateProjectID(ctx context.Context, id string) (uuid.UUID, error) {
 	log.AddFields(ctx, logrus.Fields{
-		"project.id": id,
+		"projectId": id,
 	})
 	projectID, err := validateUUID(id)
 	if err != nil {
@@ -79,7 +79,7 @@ func validateProjectID(ctx context.Context, id string) (uuid.UUID, error) {
 
 func validatePersonalAccessTokenID(ctx context.Context, id string) (uuid.UUID, error) {
 	log.AddFields(ctx, logrus.Fields{
-		"pat.id": id,
+		"patId": id,
 	})
 	tokenID, err := validateUUID(id)
 	if err != nil {
@@ -100,7 +100,7 @@ func validateOrganizationID(ctx context.Context, id string) (uuid.UUID, error) {
 }
 
 func validateOIDCClientConfigID(ctx context.Context, id string) (uuid.UUID, error) {
-	log.AddFields(ctx, logrus.Fields{"oidc_client_cfg.id": id})
+	log.AddFields(ctx, logrus.Fields{"oidcClientConfigId": id})
 	oidcClientConfigID, err := validateUUID(id)
 	if err != nil {
 		return uuid.Nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("OIDC Client Config ID must be a valid UUID"))

components/public-api-server/pkg/server/logs.go

@@ -6,6 +6,7 @@ package server
 
 import (
 	"context"
+
 	"github.com/gitpod-io/gitpod/common-go/log"
 
 	"github.com/bufbuild/connect-go"
@@ -18,24 +19,24 @@ func NewLogInterceptor(entry *logrus.Entry) connect.UnaryInterceptorFunc {
 			ctx = log.ToContext(ctx, entry.WithContext(ctx))
 
 			log.AddFields(ctx, logrus.Fields{
-				"request.protocol":    "connect",
-				"request.procedure":   req.Spec().Procedure,
-				"address":             req.Peer().Addr,
-				"request.stream_type": streamType(req.Spec().StreamType),
-				"request.headers":     req.Header(),
+				"requestProtocol":   "connect",
+				"requestProcedure":  req.Spec().Procedure,
+				"address":           req.Peer().Addr,
+				"requestStreamType": streamType(req.Spec().StreamType),
+				"requestHeaders":    req.Header(),
 			})
 			log.Extract(ctx).Debugf("Handling request for %s", req.Spec().Procedure)
 
 			resp, err := next(ctx, req)
 
 			// Retrieve the logger from the context again, in case it's been updated.
 			code := codeOf(err)
-			log.AddFields(ctx, logrus.Fields{"response.code": code})
+			log.AddFields(ctx, logrus.Fields{"responseCode": code})
 
 			if err != nil {
 				log.AddFields(ctx, logrus.Fields{logrus.ErrorKey: err})
 			} else {
-				log.AddFields(ctx, logrus.Fields{"response.body": resp.Any()})
+				log.AddFields(ctx, logrus.Fields{"responseBody": resp.Any()})
 			}
 
 			if req.Spec().IsClient {