[pat] Remove description field

Author: easyCZ

components/gitpod-db/go/dbtest/personal_access_token.go

@@ -26,7 +26,6 @@ func NewPersonalAccessToken(t *testing.T, record db.PersonalAccessToken) db.Pers
 		UserID:         uuid.New(),
 		Hash:           "some-secure-hash",
 		Name:           "some-name",
-		Description:    "some-description",
 		Scopes:         []string{"read", "write"},
 		ExpirationTime: now.Add(5 * time.Hour),
 		CreatedAt:      now,
@@ -49,10 +48,6 @@ func NewPersonalAccessToken(t *testing.T, record db.PersonalAccessToken) db.Pers
 		result.Name = record.Name
 	}
 
-	if record.Description != "" {
-		result.Description = record.Description
-	}
-
 	if len(record.Scopes) == 0 {
 		result.Scopes = record.Scopes
 	}

components/gitpod-db/go/personal_access_token.go

@@ -21,7 +21,6 @@ type PersonalAccessToken struct {
 	UserID         uuid.UUID `gorm:"column:userId;type:varchar;size:255;" json:"userId"`
 	Hash           string    `gorm:"column:hash;type:varchar;size:255;" json:"hash"`
 	Name           string    `gorm:"column:name;type:varchar;size:255;" json:"name"`
-	Description    string    `gorm:"column:description;type:varchar;size:255;" json:"description"`
 	Scopes         Scopes    `gorm:"column:scopes;type:text;size:65535;" json:"scopes"`
 	ExpirationTime time.Time `gorm:"column:expirationTime;type:timestamp;" json:"expirationTime"`
 	CreatedAt      time.Time `gorm:"column:createdAt;type:timestamp;default:CURRENT_TIMESTAMP(6);" json:"createdAt"`
@@ -72,7 +71,6 @@ func CreatePersonalAccessToken(ctx context.Context, conn *gorm.DB, req PersonalA
 		UserID:         req.UserID,
 		Hash:           req.Hash,
 		Name:           req.Name,
-		Description:    req.Description,
 		Scopes:         req.Scopes,
 		ExpirationTime: req.ExpirationTime,
 		CreatedAt:      now,

components/gitpod-db/go/personal_access_token_test.go

@@ -61,7 +61,6 @@ func TestPersonalAccessToken_Create(t *testing.T) {
 		UserID:         uuid.New(),
 		Hash:           "another-secure-hash",
 		Name:           "another-name",
-		Description:    "another-description",
 		Scopes:         []string{"read", "write"},
 		ExpirationTime: time.Now().Add(5),
 		CreatedAt:      time.Now(),
@@ -112,7 +111,6 @@ func TestPersonalAccessToken_UpdateHash(t *testing.T) {
 		require.Equal(t, token.UserID, returned.UserID)
 		require.Equal(t, newHash, returned.Hash)
 		require.Equal(t, token.Name, returned.Name)
-		require.Equal(t, token.Description, returned.Description)
 		require.Equal(t, token.Scopes, returned.Scopes)
 		require.Equal(t, newExpirationTime, returned.ExpirationTime)
 		require.Equal(t, token.CreatedAt, returned.CreatedAt)

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

@@ -50,8 +50,6 @@ func (s *TokensService) CreatePersonalAccessToken(ctx context.Context, req *conn
 		return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("Token Name is a required parameter."))
 	}
 
-	description := strings.TrimSpace(tokenReq.GetDescription())
-
 	expiry := tokenReq.GetExpirationTime()
 	if !expiry.IsValid() {
 		return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("Received invalid Expiration Time, it is a required parameter."))
@@ -88,7 +86,6 @@ func (s *TokensService) CreatePersonalAccessToken(ctx context.Context, req *conn
 		UserID:         userID,
 		Hash:           hash,
 		Name:           name,
-		Description:    description,
 		Scopes:         scopes,
 		ExpirationTime: expiry.AsTime().UTC(),
 	})
@@ -326,7 +323,6 @@ func personalAccessTokenToAPI(t db.PersonalAccessToken, value string) *v1.Person
 		// value is only present when the token is first created, or regenerated. It's empty for all subsequent requests.
 		Value:          value,
 		Name:           t.Name,
-		Description:    t.Description,
 		Scopes:         t.Scopes,
 		ExpirationTime: timestamppb.New(t.ExpirationTime),
 		CreatedAt:      timestamppb.New(t.CreatedAt),

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

@@ -106,7 +106,6 @@ func TestTokensService_CreatePersonalAccessTokenWithoutFeatureFlag(t *testing.T)
 
 		token := &v1.PersonalAccessToken{
 			Name:           "my-token",
-			Description:    "my description",
 			ExpirationTime: timestamppb.Now(),
 		}
 
@@ -122,7 +121,6 @@ func TestTokensService_CreatePersonalAccessTokenWithoutFeatureFlag(t *testing.T)
 
 		require.NotEmpty(t, created.GetId())
 		require.Equal(t, token.Name, created.GetName())
-		require.Equal(t, token.Description, created.GetDescription())
 		require.Equal(t, token.Scopes, created.GetScopes())
 		requireEqualProto(t, token.GetExpirationTime(), created.GetExpirationTime())
 
@@ -425,7 +423,6 @@ func TestTokensService_RegeneratePersonalAccessToken(t *testing.T) {
 		require.Equal(t, origResponse.Msg.Token.Id, response.Msg.Token.Id)
 		require.NotEqual(t, "", response.Msg.Token.Value)
 		require.Equal(t, origResponse.Msg.Token.Name, response.Msg.Token.Name)
-		require.Equal(t, origResponse.Msg.Token.Description, response.Msg.Token.Description)
 		require.Equal(t, origResponse.Msg.Token.Scopes, response.Msg.Token.Scopes)
 		require.Equal(t, newTimestamp.AsTime(), response.Msg.Token.ExpirationTime.AsTime())
 		require.Equal(t, origResponse.Msg.Token.CreatedAt, response.Msg.Token.CreatedAt)

components/public-api/gitpod/experimental/v1/tokens.proto

@@ -22,20 +22,17 @@ message PersonalAccessToken {
     // name is the name of the token for humans, set by the user
     string name = 3;
 
-    // description is the description of the token set by the user
-    string description = 4;
-
     // expiration_time is the time when the token expires
     // Read only.
-    google.protobuf.Timestamp expiration_time = 5;
+    google.protobuf.Timestamp expiration_time = 4;
 
     // scopes are the permission scopes attached to this token.
     // By default, no scopes are attached and therefore no access is granted to this token.
     // Specifying '*' grants all permissions the owner of the token has.
-    repeated string scopes = 6;
+    repeated string scopes = 5;
 
     // created_time is the time when the token was first created.
-    google.protobuf.Timestamp created_at = 7;
+    google.protobuf.Timestamp created_at = 6;
 }
 
 service TokensService {