Fix

Author: easyCZ

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

@@ -23,6 +23,7 @@ import (
 	"github.com/gitpod-io/gitpod/public-api-server/pkg/proxy"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/uuid"
+	"github.com/sirupsen/logrus"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"gorm.io/gorm"
@@ -99,7 +100,7 @@ func (s *TokensService) CreatePersonalAccessToken(ctx context.Context, req *conn
 }
 
 func (s *TokensService) GetPersonalAccessToken(ctx context.Context, req *connect.Request[v1.GetPersonalAccessTokenRequest]) (*connect.Response[v1.GetPersonalAccessTokenResponse], error) {
-	tokenID, err := validatePersonalAccessTokenID(req.Msg.GetId())
+	tokenID, err := validatePersonalAccessTokenID(ctx, req.Msg.GetId())
 	if err != nil {
 		return nil, err
 	}
@@ -149,7 +150,7 @@ func (s *TokensService) ListPersonalAccessTokens(ctx context.Context, req *conne
 }
 
 func (s *TokensService) RegeneratePersonalAccessToken(ctx context.Context, req *connect.Request[v1.RegeneratePersonalAccessTokenRequest]) (*connect.Response[v1.RegeneratePersonalAccessTokenResponse], error) {
-	tokenID, err := validatePersonalAccessTokenID(req.Msg.GetId())
+	tokenID, err := validatePersonalAccessTokenID(ctx, req.Msg.GetId())
 	if err != nil {
 		return nil, err
 	}
@@ -201,7 +202,7 @@ func (s *TokensService) UpdatePersonalAccessToken(ctx context.Context, req *conn
 
 	tokenReq := req.Msg.GetToken()
 
-	tokenID, err := validatePersonalAccessTokenID(tokenReq.GetId())
+	tokenID, err := validatePersonalAccessTokenID(ctx, tokenReq.GetId())
 	if err != nil {
 		return nil, err
 	}
@@ -267,7 +268,7 @@ func (s *TokensService) UpdatePersonalAccessToken(ctx context.Context, req *conn
 }
 
 func (s *TokensService) DeletePersonalAccessToken(ctx context.Context, req *connect.Request[v1.DeletePersonalAccessTokenRequest]) (*connect.Response[v1.DeletePersonalAccessTokenResponse], error) {
-	tokenID, err := validatePersonalAccessTokenID(req.Msg.GetId())
+	tokenID, err := validatePersonalAccessTokenID(ctx, req.Msg.GetId())
 	if err != nil {
 		return nil, err
 	}
@@ -301,6 +302,12 @@ func (s *TokensService) getUser(ctx context.Context, conn protocol.APIInterface)
 		return nil, uuid.Nil, proxy.ConvertError(err)
 	}
 
+	log.AddFields(ctx, logrus.Fields{
+		"user.id":        user.ID,
+		"user.blocked":   user.Blocked,
+		"user.prividged": user.Privileged,
+	})
+
 	if !s.isFeatureEnabled(ctx, conn, user) {
 		return nil, uuid.Nil, connect.NewError(connect.CodePermissionDenied, errors.New("This feature is currently in beta. If you would like to be part of the beta, please contact us."))
 	}

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

@@ -8,10 +8,12 @@ import (
 	"context"
 
 	connect "github.com/bufbuild/connect-go"
+	"github.com/gitpod-io/gitpod/common-go/log"
 	v1 "github.com/gitpod-io/gitpod/components/public-api/go/experimental/v1"
 	"github.com/gitpod-io/gitpod/components/public-api/go/experimental/v1/v1connect"
 	protocol "github.com/gitpod-io/gitpod/gitpod-protocol"
 	"github.com/gitpod-io/gitpod/public-api-server/pkg/proxy"
+	"github.com/sirupsen/logrus"
 )
 
 func NewUserService(pool proxy.ServerConnectionPool) *UserService {
@@ -38,6 +40,11 @@ func (s *UserService) GetAuthenticatedUser(ctx context.Context, req *connect.Req
 	if err != nil {
 		return nil, proxy.ConvertError(err)
 	}
+	log.AddFields(ctx, logrus.Fields{
+		"user.id":        user.ID,
+		"user.blocked":   user.Blocked,
+		"user.prividged": user.Privileged,
+	})
 
 	response := userToAPIResponse(user)
 

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

@@ -21,7 +21,10 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-func validateTeamID(id string) (uuid.UUID, error) {
+func validateTeamID(ctx context.Context, id string) (uuid.UUID, error) {
+	log.AddFields(ctx, logrus.Fields{
+		"team.id": id,
+	})
 	teamID, err := validateUUID(id)
 	if err != nil {
 		return uuid.Nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("Team ID must be a valid UUID."))
@@ -48,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,
+		"workspace.id": id,
 	})
 	if id == "" {
 		return "", connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("Empty workspace id specified"))
@@ -62,7 +65,10 @@ func validateWorkspaceID(ctx context.Context, id string) (string, error) {
 	return id, nil
 }
 
-func validateProjectID(id string) (uuid.UUID, error) {
+func validateProjectID(ctx context.Context, id string) (uuid.UUID, error) {
+	log.AddFields(ctx, logrus.Fields{
+		"project.id": id,
+	})
 	projectID, err := validateUUID(id)
 	if err != nil {
 		return uuid.Nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("Project ID must be a valid UUID."))
@@ -71,7 +77,10 @@ func validateProjectID(id string) (uuid.UUID, error) {
 	return projectID, nil
 }
 
-func validatePersonalAccessTokenID(id string) (uuid.UUID, error) {
+func validatePersonalAccessTokenID(ctx context.Context, id string) (uuid.UUID, error) {
+	log.AddFields(ctx, logrus.Fields{
+		"pat.id": id,
+	})
 	tokenID, err := validateUUID(id)
 	if err != nil {
 		return uuid.Nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("Token ID must be a valid UUID"))