Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: seat guard in IAM (#19923)

ecmadao6f0b4db5b8e4
diff --git a/backend/api/directory-sync/webhook.go b/backend/api/directory-sync/webhook.go
index d4c4a5e832..4142b8584d 100644
--- a/backend/api/directory-sync/webhook.go
+++ b/backend/api/directory-sync/webhook.go
@@ -24,7 +24,6 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/store"
- "github.com/bytebase/bytebase/backend/utils"
)
const (
@@ -468,7 +467,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
members = append(members, member)
}
- group, err := utils.GetGroupByName(ctx, s.store, c.Param("workspaceID"), common.FormatGroupEmail(scimGroup.ExternalID))
+ group, err := s.store.GetGroupByName(ctx, c.Param("workspaceID"), common.FormatGroupEmail(scimGroup.ExternalID))
if err != nil {
return c.String(http.StatusInternalServerError, fmt.Sprintf(`failed to find group, error %v`, err))
}
@@ -578,7 +577,7 @@ func (s *Service) RegisterDirectorySyncRoutes(g *echo.Group) {
groupName = expr.Value
}
- group, err := utils.GetGroupByName(ctx, s.store, c.Param("workspaceID"), common.FormatGroupEmail(groupName))
+ group, err := s.store.GetGroupByName(ctx, c.Param("workspaceID"), common.FormatGroupEmail(groupName))
if err != nil {
return c.String(http.StatusInternalServerError, fmt.Sprintf(`failed to find group, error %v`, err))
}
@@ -875,7 +874,7 @@ func (s *Service) getGroup(ctx context.Context, c *echo.Context) (*store.GroupMe
if err != nil {
return nil, errors.Errorf("failed to parse group %v, error %v", c.Param("groupID"), err)
}
- group, err := utils.GetGroupByName(ctx, s.store, c.Param("workspaceID"), common.FormatGroupEmail(groupName))
+ group, err := s.store.GetGroupByName(ctx, c.Param("workspaceID"), common.FormatGroupEmail(groupName))
if err != nil {
return nil, errors.Errorf("failed to find group, error %v", err)
}
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 6b8daa2325..578f0afc6c 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -7748,6 +7748,11 @@ components:
description: |-
The default project for unassigned databases.
Format: projects/{id}
+ userCountInIam:
+ type: integer
+ title: user_count_in_iam
+ format: int32
+ description: The number of users in the workspace IAM (for seat limit display).
title: ActuatorInfo
additionalProperties: false
description: |-
diff --git a/backend/api/stripe/webhook.go b/backend/api/stripe/webhook.go
index 324a7efc27..5b9c65543f 100644
--- a/backend/api/stripe/webhook.go
+++ b/backend/api/stripe/webhook.go
@@ -348,7 +348,10 @@ func (h *WebhookHandler) updateLicense(ctx context.Context, workspace string, pa
if payload.Status == storepb.SubscriptionPayload_ACTIVE {
var expiresAt time.Time
if payload.ExpiresAt != nil {
- expiresAt = payload.ExpiresAt.AsTime()
+ // Add 24h grace period to the license to avoid service disruption
+ // from billing cycle delays. The subscription stores the real Stripe
+ // expiry; only the license JWT gets the extended time.
+ expiresAt = payload.ExpiresAt.AsTime().Add(24 * time.Hour)
}
var err error
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.go
index bfef24bd59..4902f73864 100644
--- a/backend/api/v1/actuator_service.go
+++ b/backend/api/v1/actuator_service.go
@@ -163,11 +163,23 @@ func (s *ActuatorService) getServerInfo(ctx context.Context, workspaceID string)
}
serverInfo.UnlicensedFeatures = unlicensedFeaturesString
- activeEndUserCount, err := s.store.CountActiveEndUsersPerWorkspace(ctx, workspaceID)
+ if !s.profile.SaaS {
+ activePrincipalCount, err := s.store.CountActivePrincipals(ctx)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
+ serverInfo.ActivatedUserCount = int32(activePrincipalCount)
+ }
+
+ iamPolicy, err := s.store.GetWorkspaceIamPolicy(ctx, workspaceID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- serverInfo.ActivatedUserCount = int32(activeEndUserCount)
+ userCountInIam, err := countUsersInIamPolicy(ctx, s.store, workspaceID, iamPolicy.Policy, s.profile.SaaS)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to count users in IAM policy"))
+ }
+ serverInfo.UserCountInIam = int32(userCountInIam)
// Check if sample instances are available
hasSampleInstances, _ := s.store.HasSampleInstances(ctx, workspaceID)
diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.go
index 578868f983..397d92e06b 100644
--- a/backend/api/v1/auth_service.go
+++ b/backend/api/v1/auth_service.go
@@ -150,11 +150,12 @@ func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMes
if !restriction.PasswordRestriction.GetRequireResetPasswordForFirstLogin() {
return false
}
- count, err := s.store.CountActiveEndUsersPerWorkspace(ctx, workspaceID)
+ iamPolicy, err := s.store.GetWorkspaceIamPolicy(ctx, workspaceID)
if err != nil {
- slog.Error("failed to count end users", log.BBError(err))
+ slog.Error("failed to get workspace IAM policy", log.BBError(err))
return false
}
+ count, _ := countUsersInIamPolicy(ctx, s.store, workspaceID, iamPolicy.Policy, s.profile.SaaS)
// The 1st workspace admin login don't need to reset the password
return count > 1
}
@@ -613,7 +614,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
- if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID); err != nil {
+ if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID, nil, s.profile.SaaS); err != nil {
return nil, err
}
}
@@ -679,7 +680,7 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.
}
if user.MemberDeleted {
- if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID); err != nil {
+ if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID, nil, s.profile.SaaS); err != nil {
return nil, err
}
// Undelete the user when login via SSO.
diff --git a/backend/api/v1/group_service.go b/backend/api/v1/group_service.go
index 76fa2db33f..636d51f8e2 100644
--- a/backend/api/v1/group_service.go
+++ b/backend/api/v1/group_service.go
@@ -39,7 +39,7 @@ func NewGroupService(store *store.Store, iamManager *iam.Manager, licenseService
// GetGroup gets a group.
func (s *GroupService) GetGroup(ctx context.Context, req *connect.Request[v1pb.GetGroupRequest]) (*connect.Response[v1pb.Group], error) {
- group, err := utils.GetGroupByName(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), req.Msg.Name)
+ group, err := s.store.GetGroupByName(ctx, common.GetWorkspaceIDFromContext(ctx), req.Msg.Name)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -159,7 +159,7 @@ func (s *GroupService) UpdateGroup(ctx context.Context, req *connect.Request[v1p
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
- group, err := utils.GetGroupByName(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), req.Msg.Group.Name)
+ group, err := s.store.GetGroupByName(ctx, common.GetWorkspaceIDFromContext(ctx), req.Msg.Group.Name)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -236,7 +236,7 @@ func (s *GroupService) UpdateGroup(ctx context.Context, req *connect.Request[v1p
// DeleteGroup deletes a group.
func (s *GroupService) DeleteGroup(ctx context.Context, req *connect.Request[v1pb.DeleteGroupRequest]) (*connect.Response[emptypb.Empty], error) {
- group, err := utils.GetGroupByName(ctx, s.store, common.GetWorkspaceIDFromContext(ctx), req.Msg.Name)
+ group, err := s.store.GetGroupByName(ctx, common.GetWorkspaceIDFromContext(ctx), req.Msg.Name)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.go
index 36d5267938..7d38bbade7 100644
--- a/backend/api/v1/user_service.go
+++ b/backend/api/v1/user_service.go
@@ -226,10 +226,6 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v
workspaceID := common.GetWorkspaceIDFromContext(ctx)
email := request.Msg.User.Email
- if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID); err != nil {
- return nil, err
- }
-
if err := validateEmailWithDomains(ctx, s.licenseService, s.store, workspaceID, email, false); err != nil {
return nil, err
}
@@ -578,7 +574,7 @@ func (s *UserService) hasExtraWorkspaceAdmin(ctx context.Context, policy *storep
if member == common.AllUsers && !s.profile.SaaS {
// allUsers means every user is an admin. Count all active end users
// (not just workspace members) since allUsers includes everyone.
- count, err := s.store.CountAllActivePrincipals(ctx)
+ count, err := s.store.CountActivePrincipals(ctx)
if err != nil {
return false, err
}
@@ -631,16 +627,12 @@ func (s *UserService) UndeleteUser(ctx context.Context, request *connect.Request
if !user.MemberDeleted {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("user %q is already active", email))
}
- if user.Type == storepb.PrincipalType_END_USER {
- if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID); err != nil {
- return nil, err
- }
- }
user, err = s.store.UpdateUser(ctx, user, &store.UpdateUserMessage{Delete: &undeletePatch})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
+
v1User, err := convertToUser(ctx, s.iamManager, user)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))
@@ -859,15 +851,55 @@ func generateRecoveryCodes(n int) ([]string, error) {
return recoveryCodes, nil
}
-func userCountGuard(ctx context.Context, store *store.Store, licenseService *enterprise.LicenseService, workspaceID string) error {
- userLimit := licenseService.GetUserLimit(ctx, workspaceID)
+// countUsersInIamPolicy counts distinct user members in an IAM policy,
+// expanding group memberships. When allUsers is present and not in SaaS mode,
+// returns the total active principal count instead.
+func countUsersInIamPolicy(ctx context.Context, s *store.Store, workspaceID string, policy *storepb.IamPolicy, saas bool) (int, error) {
+ emails := make(map[string]struct{})
+ var groupRefs []string
+ for _, binding := range policy.Bindings {
+ for _, member := range binding.Members {
+ if member == common.AllUsers {
+ if !saas {
+ return s.CountActivePrincipals(ctx)
+ }
+ continue
+ }
+ if strings.HasPrefix(member, "users/") {
+ emails[strings.TrimPrefix(member, "users/")] = struct{}{}
+ } else if strings.HasPrefix(member, "groups/") {
+ groupRefs = append(groupRefs, strings.TrimPrefix(member, "groups/"))
+ }
+ }
+ }
+ for _, ref := range groupRefs {
+ members, _ := s.GetGroupMembersSnapshot(ctx, workspaceID, "groups/"+ref)
+ for member := range members {
+ if strings.HasPrefix(member, "users/") {
+ emails[strings.TrimPrefix(member, "users/")] = struct{}{}
+ }
+ }
+ }
+ return len(emails), nil
+}
- count, err := store.CountActiveEndUsersPerWorkspace(ctx, workspaceID)
+// userCountGuard checks the seat limit against an IAM policy. If policy is nil,
+// reads the current workspace IAM policy.
+func userCountGuard(ctx context.Context, s *store.Store, licenseService *enterprise.LicenseService, workspaceID string, policy *storepb.IamPolicy, saas bool) error {
+ if policy == nil {
+ p, err := s.GetWorkspaceIamPolicy(ctx, workspaceID)
+ if err != nil {
+ return connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace IAM policy"))
+ }
+ policy = p.Policy
+ }
+ userLimit := licenseService.GetUserLimit(ctx, workspaceID)
+ count, err := countUsersInIamPolicy(ctx, s, workspaceID, policy, saas)
if err != nil {
- return connect.NewError(connect.CodeInternal, err)
+ return connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to count users in IAM policy"))
}
- if count >= userLimit {
- return connect.NewError(connect.CodeResourceExhausted, errors.Errorf("reached the maximum user count %d", userLimit))
+ if count > userLimit {
+ return connect.NewError(connect.CodeResourceExhausted, errors.Errorf("workspace has %d users, exceeding the limit of %d", count, userLimit))
}
return nil
}
diff --git a/backend/api/v1/workspace_service.go b/backend/api/v1/workspace_service.go
index 4ea35598ed..fce9e61a13 100644
--- a/backend/api/v1/workspace_service.go
+++ b/backend/api/v1/workspace_service.go
@@ -215,6 +215,7 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques
if err != nil {
return nil, err
}
+
users := utils.GetUsersByRoleInIAMPolicy(
ctx,
s.store,
@@ -227,6 +228,11 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("workspace must have at least one admin"))
}
+ // Guard: count members in the new policy BEFORE saving.
+ if err := userCountGuard(ctx, s.store, s.licenseService, workspaceID, iamPolicy, s.profile.SaaS); err != nil {
+ return nil, err
+ }
+
payloadBytes, err := protojson.Marshal(iamPolicy)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to marshal iam policy"))
diff --git a/backend/generated-go/v1/actuator_service.pb.go b/backend/generated-go/v1/actuator_service.pb.go
index 0178089548..ef7cfe4c50 100644
--- a/backend/generated-go/v1/actuator_service.pb.go
+++ b/backend/generated-go/v1/actuator_service.pb.go
@@ -289,6 +289,8 @@ type ActuatorInfo struct {
// The default project for unassigned databases.
// Format: projects/{id}
DefaultProject string `protobuf:"bytes,26,opt,name=default_project,json=defaultProject,proto3" json:"default_project,omitempty"`
+ // The number of users in the workspace IAM (for seat limit display).
+ UserCountInIam int32 `protobuf:"varint,27,opt,name=user_count_in_iam,json=userCountInIam,proto3" json:"user_count_in_iam,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -463,6 +465,13 @@ func (x *ActuatorInfo) GetDefaultProject() string {
return ""
}
+func (x *ActuatorInfo) GetUserCountInIam() int32 {
+ if x != nil {
+ return x.UserCountInIam
+ }
+ return 0
+}
+
var File_v1_actuator_service_proto protoreflect.FileDescriptor
const file_v1_actuator_service_proto_rawDesc = "" +
@@ -477,7 +486,7 @@ const file_v1_actuator_service_proto_rawDesc = "" +
"\vRestriction\x12,\n" +
"\x0fdisallow_signup\x18\x01 \x01(\bB\x03\xe0A\x03R\x0edisallowSignup\x12=\n" +
"\x18disallow_password_signin\x18\x02 \x01(\bB\x03\xe0A\x03R\x16disallowPasswordSignin\x12p\n" +
- "\x14password_restriction\x18\x03 \x01(\v28.bytebase.v1.WorkspaceProfileSetting.PasswordRestrictionB\x03\xe0A\x03R\x13passwordRestriction\"\x8d\a\n" +
+ "\x14password_restriction\x18\x03 \x01(\v28.bytebase.v1.WorkspaceProfileSetting.PasswordRestrictionB\x03\xe0A\x03R\x13passwordRestriction\"\xbd\a\n" +
"\fActuatorInfo\x12\x1d\n" +
"\aversion\x18\x01 \x01(\tB\x03\xe0A\x03R\aversion\x12\"\n" +
"\n" +
@@ -499,7 +508,8 @@ const file_v1_actuator_service_proto_rawDesc = "" +
"\x16external_url_from_flag\x18\x17 \x01(\bB\x03\xe0A\x03R\x13externalUrlFromFlag\x12(\n" +
"\rreplica_count\x18\x18 \x01(\x05B\x03\xe0A\x03R\freplicaCount\x12?\n" +
"\vrestriction\x18\x19 \x01(\v2\x18.bytebase.v1.RestrictionB\x03\xe0A\x03R\vrestriction\x12,\n" +
- "\x0fdefault_project\x18\x1a \x01(\tB\x03\xe0A\x03R\x0edefaultProjectJ\x04\b\t\x10\n" +
+ "\x0fdefault_project\x18\x1a \x01(\tB\x03\xe0A\x03R\x0edefaultProject\x12.\n" +
+ "\x11user_count_in_iam\x18\x1b \x01(\x05B\x03\xe0A\x03R\x0euserCountInIamJ\x04\b\t\x10\n" +
"J\x04\b\n" +
"\x10\vJ\x04\b\f\x10\rJ\x04\b\x10\x10\x11J\x04\b\x11\x10\x12J\x04\b\x0e\x10\x0f2\xb6\x04\n" +
"\x0fActuatorService\x12s\n" +
diff --git a/backend/generated-go/v1/actuator_service_equal.pb.go b/backend/generated-go/v1/actuator_service_equal.pb.go
index 901d53ba02..8c20f112db 100644
--- a/backend/generated-go/v1/actuator_service_equal.pb.go
+++ b/backend/generated-go/v1/actuator_service_equal.pb.go
@@ -137,5 +137,8 @@ func (x *ActuatorInfo) Equal(y *ActuatorInfo) bool {
if x.DefaultProject != y.DefaultProject {
return false
}
+ if x.UserCountInIam != y.UserCountInIam {
+ return false
+ }
return true
}
diff --git a/backend/plugin/stripe/stripe.go b/backend/plugin/stripe/stripe.go
index a8ddf6ed2d..1ab0f7d39b 100644
--- a/backend/plugin/stripe/stripe.go
+++ b/backend/plugin/stripe/stripe.go
@@ -199,6 +199,7 @@ func CreateSubscriptionDirect(params *DirectSubscriptionParams) (*stripego.Subsc
{
Price: stripego.String(newPrice.ID),
Quantity: stripego.Int64(1),
+ Metadata: params.Metadata,
},
},
Metadata: params.Metadata,
diff --git a/backend/store/group.go b/backend/store/group.go
index 38f794dc63..bb7f93ec63 100644
--- a/backend/store/group.go
+++ b/backend/store/group.go
@@ -52,10 +52,32 @@ type GroupMessage struct {
Payload *storepb.GroupPayload
}
+// GetGroupByName resolves a group by its resource name "groups/{identifier}".
+// The identifier can be an email (contains "@") or an ID.
+// Includes a fallback for legacy SCIM sync where the email was stored as the ID.
+func (s *Store) GetGroupByName(ctx context.Context, workspace, name string) (*GroupMessage, error) {
+ identifier := strings.TrimPrefix(name, "groups/")
+ find := &FindGroupMessage{Workspace: workspace}
+ if strings.Contains(identifier, "@") {
+ find.Email = &identifier
+ } else {
+ find.ID = &identifier
+ }
+ group, err := s.GetGroup(ctx, find)
+ if err != nil {
+ return nil, err
+ }
+ if group == nil && find.ID == nil {
+ // Fallback: legacy SCIM sync may store email as ID.
+ return s.GetGroup(ctx, &FindGroupMessage{Workspace: workspace, ID: &identifier})
+ }
+ return group, nil
+}
+
// GetGroup gets a group.
func (s *Store) GetGroup(ctx context.Context, find *FindGroupMessage) (*GroupMessage, error) {
if find.Email != nil && find.Workspace != "" {
- if v, ok := s.groupCache.Get(getGroupCacheKey(find.Workspace, *find.Email)); ok && s.enableCache {
+ if v, ok := s.groupCache.Get(getGroupCacheKey(find.Workspace, &GroupMessage{Email: *find.Email})); ok && s.enableCache {
return v, nil
}
}
@@ -169,7 +191,7 @@ func (s *Store) ListGroups(ctx context.Context, find *FindGroupMessage) ([]*Grou
}
for _, group := range groups {
- s.groupCache.Add(getGroupCacheKey(group.Workspace, group.Email), group)
+ s.groupCache.Add(getGroupCacheKey(group.Workspace, group), group)
}
return groups, nil
}
@@ -211,10 +233,7 @@ func (s *Store) CreateGroup(ctx context.Context, create *GroupMessage) (*GroupMe
return nil, err
}
- if create.Email != "" {
- s.groupCache.Add(getGroupCacheKey(create.Workspace, create.Email), create)
- }
- s.userCountCache.Remove(create.Workspace)
+ s.groupCache.Add(getGroupCacheKey(create.Workspace, create), create)
return create, nil
}
@@ -279,11 +298,8 @@ func (s *Store) UpdateGroup(ctx context.Context, patch *UpdateGroupMessage) (*Gr
}
group.Workspace = patch.Workspace
- if group.Email != "" {
- s.groupCache.Add(getGroupCacheKey(group.Workspace, group.Email), &group)
- s.groupMembersCache.Remove(getGroupMembersCacheKey(group.Workspace, "groups/"+group.Email))
- }
- s.userCountCache.Remove(patch.Workspace)
+ s.groupCache.Add(getGroupCacheKey(group.Workspace, &group), &group)
+ s.removeGroupMembersCache(group.Workspace, &group)
return &group, nil
}
@@ -300,11 +316,12 @@ func (s *Store) DeleteGroup(ctx context.Context, workspace string, id string) er
return err
}
- if email.Valid && email.String != "" {
- s.groupCache.Remove(getGroupCacheKey(workspace, email.String))
- s.groupMembersCache.Remove(getGroupMembersCacheKey(workspace, "groups/"+email.String))
+ group := &GroupMessage{ID: id}
+ if email.Valid {
+ group.Email = email.String
}
- s.userCountCache.Remove(workspace)
+ s.groupCache.Remove(getGroupCacheKey(workspace, group))
+ s.removeGroupMembersCache(group.Workspace, group)
return nil
}
@@ -339,16 +356,15 @@ func (s *Store) GetUserGroupsSnapshot(ctx context.Context, workspaceID string, u
}
// GetGroupMembersSnapshot returns group members with snapshot reads (with cache).
-// groupName format is "groups/{email}".
+// groupName format is "groups/{identifier}" where identifier can be an email or an ID.
// Trades consistency for performance.
func (s *Store) GetGroupMembersSnapshot(ctx context.Context, workspaceID string, groupName string) (map[string]bool, error) {
- if v, ok := s.groupMembersCache.Get(getGroupMembersCacheKey(workspaceID, groupName)); ok {
+ cacheKey := getGroupMembersCacheKey(workspaceID, groupName)
+ if v, ok := s.groupMembersCache.Get(cacheKey); ok {
return v, nil
}
- // Extract email from group name "groups/{email}"
- email := strings.TrimPrefix(groupName, "groups/")
- group, err := s.GetGroup(ctx, &FindGroupMessage{Workspace: workspaceID, Email: &email})
+ group, err := s.GetGroupByName(ctx, workspaceID, groupName)
if err != nil {
return nil, err
}
@@ -360,7 +376,7 @@ func (s *Store) GetGroupMembersSnapshot(ctx context.Context, workspaceID string,
for _, m := range group.Payload.GetMembers() {
members[m.Member] = true
}
- s.groupMembersCache.Add(getGroupMembersCacheKey(workspaceID, groupName), members)
+ s.groupMembersCache.Add(cacheKey, members)
return members, nil
}
diff --git a/backend/store/policy.go b/backend/store/policy.go
index d4a1d4060d..032dc69c3b 100644
--- a/backend/store/policy.go
+++ b/backend/store/policy.go
@@ -104,7 +104,6 @@ func (s *Store) PatchWorkspaceIamPolicy(ctx context.Context, patch *PatchIamPoli
// Invalidate caches after mutation.
s.iamPolicyCache.Remove(getIamPolicyCacheKey(patch.Workspace, storepb.Policy_WORKSPACE, workspaceResource))
- s.userCountCache.Remove(patch.Workspace)
return s.GetWorkspaceIamPolicy(ctx, patch.Workspace)
}
diff --git a/backend/store/stats.go b/backend/store/stats.go
index 94ccf0768e..a1512ef2ea 100644
--- a/backend/store/stats.go
+++ b/backend/store/stats.go
@@ -24,69 +24,17 @@ func (s *Store) CountActiveInstances(ctx context.Context, workspaceID string) (i
return count, nil
}
-// CountAllActivePrincipals counts all active end users globally (cross-workspace).
-func (s *Store) CountAllActivePrincipals(ctx context.Context) (int, error) {
- var count int
- if err := s.GetDB().QueryRowContext(ctx,
- `SELECT count(*) FROM principal WHERE deleted = FALSE`,
- ).Scan(&count); err != nil {
- return 0, err
- }
- return count, nil
-}
-
-// CountActiveEndUsersPerWorkspace counts active end users who are members of the given workspace
-// by joining principal with workspace IAM policy bindings.
-func (s *Store) CountActiveEndUsersPerWorkspace(ctx context.Context, workspaceID string) (int, error) {
- if v, ok := s.userCountCache.Get(workspaceID); ok && s.enableCache {
- return v, nil
- }
-
- // Count distinct active users who are members of the workspace, either
- // directly (users/email) or via group expansion (groups/{email|id} -> group members).
- q := qb.Q().Space(`
- WITH iam_members AS (
- SELECT DISTINCT jsonb_array_elements_text(binding->'members') AS member
- FROM policy,
- jsonb_array_elements(policy.payload->'bindings') AS binding
- WHERE policy.workspace = ?
- AND policy.resource_type = 'WORKSPACE'
- AND policy.type = 'IAM'
- ),
- direct_users AS (
- SELECT SUBSTRING(member FROM 7) AS email
- FROM iam_members
- WHERE member LIKE 'users/%'
- ),
- group_users AS (
- SELECT SUBSTRING(gm.value->>'member' FROM 7) AS email
- FROM iam_members im
- JOIN user_group ug ON ug.workspace = ?
- AND (ug.email = SUBSTRING(im.member FROM 8) OR ug.id = SUBSTRING(im.member FROM 8))
- , jsonb_array_elements(ug.payload->'members') AS gm
- WHERE im.member LIKE 'groups/%'
- AND gm.value->>'member' LIKE 'users/%'
- ),
- all_users AS (
- SELECT email FROM direct_users
- UNION
- SELECT email FROM group_users
- )
- SELECT count(*)
- FROM principal
- WHERE principal.deleted = FALSE
- AND principal.email IN (SELECT email FROM all_users)
- `, workspaceID, workspaceID)
-
+// CountActivePrincipals counts non-deleted principals cross-workspace. Used for display purposes
+// (e.g. actuator info) — not for seat limit enforcement.
+func (s *Store) CountActivePrincipals(ctx context.Context) (int, error) {
+ q := qb.Q().Space(`SELECT count(*) FROM principal WHERE deleted = FALSE`)
query, args, err := q.ToSQL()
if err != nil {
return 0, errors.Wrapf(err, "failed to build sql")
}
-
var count int
if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&count); err != nil {
return 0, err
}
- s.userCountCache.Add(workspaceID, count)
return count, nil
}
diff --git a/backend/store/store.go b/backend/store/store.go
index 085176a3a0..d02eb6b14b 100644
--- a/backend/store/store.go
+++ b/backend/store/store.go
@@ -33,7 +33,6 @@ type Store struct {
memberGroupsCache *expirable.LRU[string, []string]
dbSchemaCache *expirable.LRU[string, *model.DatabaseMetadata]
iamPolicyCache *expirable.LRU[string, *IamPolicyMessage]
- userCountCache *expirable.LRU[string, int]
// Large objects.
sheetFullCache *lru.Cache[string, *SheetMessage]
@@ -76,7 +75,6 @@ func New(ctx context.Context, pgURL string, enableCache bool) (*Store, error) {
memberGroupsCache := expirable.NewLRU[string, []string](4096, nil, time.Minute)
dbSchemaCache := expirable.NewLRU[string, *model.DatabaseMetadata](128, nil, 5*time.Minute)
iamPolicyCache := expirable.NewLRU[string, *IamPolicyMessage](1024, nil, time.Minute)
- userCountCache := expirable.NewLRU[string, int](128, nil, time.Minute)
// Initialize database connection (handles both direct URL and file-based)
dbConnManager := NewDBConnectionManager(pgURL)
@@ -102,7 +100,6 @@ func New(ctx context.Context, pgURL string, enableCache bool) (*Store, error) {
memberGroupsCache: memberGroupsCache,
dbSchemaCache: dbSchemaCache,
iamPolicyCache: iamPolicyCache,
- userCountCache: userCountCache,
}
return s, nil
@@ -136,6 +133,13 @@ func (s *Store) PurgeIamPolicyCaches() {
s.iamPolicyCache.Purge()
}
+// removeGroupMembersCache removes all possible cache entries for a group's members,
+// covering both groups/{email} and groups/{id} lookups.
+func (s *Store) removeGroupMembersCache(workspace string, group *GroupMessage) {
+ cacheKey := getGroupMembersCacheKey(workspace, formatGroupName(group))
+ s.groupMembersCache.Remove(cacheKey)
+}
+
func getInstanceCacheKey(instanceID string) string {
return instanceID
}
@@ -144,12 +148,21 @@ func getSettingCacheKey(workspace string, name storepb.SettingName) string {
return fmt.Sprintf("workspaces/%s/settings/%s", workspace, name.String())
}
-func getGroupCacheKey(workspace, email string) string {
- return fmt.Sprintf("workspaces/%s/groups/%s", workspace, email)
+// formatGroupName returns "groups/{email}" if email is set, otherwise "groups/{id}".
+// This mirrors utils.FormatGroupName but avoids a circular import.
+func formatGroupName(group *GroupMessage) string {
+ if group.Email != "" {
+ return "groups/" + group.Email
+ }
+ return "groups/" + group.ID
+}
+
+func getGroupCacheKey(workspace string, group *GroupMessage) string {
+ return fmt.Sprintf("workspaces/%s/%s", workspace, formatGroupName(group))
}
func getGroupMembersCacheKey(workspace, groupName string) string {
- return fmt.Sprintf("workspaces/%s/%s", workspace, groupName)
+ return fmt.Sprintf("workspaces/%s/%s/members", workspace, groupName)
}
func getMemberGroupsCacheKey(workspace, userName string) string {
diff --git a/backend/utils/member.go b/backend/utils/member.go
index 5561cffa2d..18611105c1 100644
--- a/backend/utils/member.go
+++ b/backend/utils/member.go
@@ -7,8 +7,6 @@ import (
"strings"
"time"
- "github.com/pkg/errors"
-
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
@@ -87,39 +85,6 @@ func GetUsersByRoleInIAMPolicy(
return users
}
-// GetGroupByName finds a group by identifier which can be either:
-// - Azure objectId (UUID format, no @) - used as group ID in new deployments
-// - Group email (contains @) - used as group ID in legacy deployments
-//
-// This supports both attribute mapping configurations in Azure Entra ID.
-func GetGroupByName(ctx context.Context, stores *store.Store, workspace string, name string) (*store.GroupMessage, error) {
- identifier, err := common.GetGroupEmail(name)
- if err != nil {
- return nil, err
- }
- find := &store.FindGroupMessage{Workspace: workspace}
- if strings.Contains(identifier, "@") {
- find.Email = &identifier
- } else {
- find.ID = &identifier
- }
-
- group, err := stores.GetGroup(ctx, find)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to get group %q", name)
- }
- if group == nil && find.ID == nil {
- // The fallback is used to handle the legacy mapping from SCIM sync.
- // For legacy SCIM sync attribute mapping, the group ExternalID map to Email
- // If users keep using this legacy mapping, the new group will have empty email, and the email will set as the ID.
- return stores.GetGroup(ctx, &store.FindGroupMessage{
- Workspace: workspace,
- ID: &identifier,
- })
- }
- return group, nil
-}
-
// GetUsersByMember gets user messages by member.
// The member should be in users/{email}, serviceAccounts/{email}, workloadIdentities/{email}, or groups/{email} format.
func GetUsersByMember(ctx context.Context, stores *store.Store, workspace string, member string) []*store.UserMessage {
@@ -140,7 +105,7 @@ func GetUsersByMember(ctx context.Context, stores *store.Store, workspace string
users = append(users, user)
}
} else if strings.HasPrefix(member, common.GroupPrefix) {
- group, err := GetGroupByName(ctx, stores, workspace, member)
+ group, err := stores.GetGroupByName(ctx, workspace, member)
if err != nil {
slog.Error("failed to get group", slog.String("group", member), log.BBError(err))
return users
@@ -219,7 +184,7 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, workspac
break
}
if strings.HasPrefix(member, common.GroupPrefix) {
- group, err := GetGroupByName(ctx, stores, workspace, member)
+ group, err := stores.GetGroupByName(ctx, workspace, member)
if err != nil {
slog.Error("failed to get group", slog.String("group", member), log.BBError(err))
continue
@@ -286,7 +251,7 @@ func MemberContainsUser(ctx context.Context, stores *store.Store, workspace stri
// Check if member is a group
if strings.HasPrefix(member, common.GroupPrefix) {
- group, err := GetGroupByName(ctx, stores, workspace, member)
+ group, err := stores.GetGroupByName(ctx, workspace, member)
if err != nil {
slog.Error("failed to get group", slog.String("group", member), log.BBError(err))
return false
diff --git a/frontend/src/react/pages/settings/EnvironmentsPage.tsx b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
index 088cfde18f..43bf9e239d 100644
--- a/frontend/src/react/pages/settings/EnvironmentsPage.tsx
+++ b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
@@ -1487,6 +1487,7 @@ export function EnvironmentsPage() {
key={env.id}
value={env.id}
className="flex-1 overflow-auto mt-0"
+ keepMounted={false}
>
<EnvironmentDetail
environment={env}
diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsx
index 4692d333d2..a1db185b90 100644
--- a/frontend/src/react/pages/settings/MembersPage.tsx
+++ b/frontend/src/react/pages/settings/MembersPage.tsx
@@ -1611,11 +1611,11 @@ export function MembersPage({ projectId }: { projectId?: string }) {
const projectStore = useProjectV1Store();
const projectIamPolicyStore = useProjectIamPolicyStore();
- const activeUserCount = useVueState(() => actuatorStore.activeUserCount);
+ const userCountInIam = useVueState(() => actuatorStore.userCountInIam);
const userCountLimit = useVueState(() => subscriptionStore.userCountLimit);
const remainingUserCount = useMemo(
- () => Math.max(0, userCountLimit - activeUserCount),
- [userCountLimit, activeUserCount]
+ () => Math.max(0, userCountLimit - userCountInIam),
+ [userCountLimit, userCountInIam]
);
const projectName = projectId
diff --git a/frontend/src/react/pages/settings/SubscriptionPage.tsx b/frontend/src/react/pages/settings/SubscriptionPage.tsx
index 7e2cc60501..1e69d5fabb 100644
--- a/frontend/src/react/pages/settings/SubscriptionPage.tsx
+++ b/frontend/src/react/pages/settings/SubscriptionPage.tsx
@@ -52,7 +52,7 @@ export function SubscriptionPage({
() => subscriptionStore.instanceLicenseCount
);
const userCountLimit = useVueState(() => subscriptionStore.userCountLimit);
- const activeUserCount = useVueState(() => actuatorStore.activeUserCount);
+ const userCountInIam = useVueState(() => actuatorStore.userCountInIam);
const activatedInstanceCount = useVueState(
() => actuatorStore.activatedInstanceCount
);
@@ -197,7 +197,7 @@ export function SubscriptionPage({
{t("subscription.instance-assignment.used-and-total-user")}
</div>
<div className="mt-1 text-4xl flex items-center gap-2">
- {activeUserCount}
+ {userCountInIam}
<span className="font-mono text-control-light">/</span>
{userLimit}
</div>
diff --git a/frontend/src/store/modules/v1/actuator.ts b/frontend/src/store/modules/v1/actuator.ts
index a43e474638..a17fa70f80 100644
--- a/frontend/src/store/modules/v1/actuator.ts
+++ b/frontend/src/store/modules/v1/actuator.ts
@@ -102,6 +102,8 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
() => serverInfo.value?.activatedUserCount ?? 0
);
+ const userCountInIam = computed(() => serverInfo.value?.userCountInIam ?? 0);
+
const enableOnboarding = computed(() => {
return activeUserCount.value === 1 && !isSaaSMode.value;
});
@@ -242,6 +244,7 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
quickStartEnabled,
enableOnboarding,
activeUserCount,
+ userCountInIam,
// Actions
updateUserStat,
setServerInfo,
diff --git a/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts b/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts
index 552e0a8d1c..73f6132a15 100644
--- a/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts
@@ -252,6 +252,13 @@ export declare type ActuatorInfo = Message<"bytebase.v1.ActuatorInfo"> & {
* @generated from field: string default_project = 26;
*/
defaultProject: string;
+
+ /**
+ * The number of users in the workspace IAM (for seat limit display).
+ *
+ * @generated from field: int32 user_count_in_iam = 27;
+ */
+ userCountInIam: number;
};
/**
diff --git a/frontend/src/types/proto-es/v1/actuator_service_pb.js b/frontend/src/types/proto-es/v1/actuator_service_pb.js
index 494281ed71..0f2ca8d529 100644
--- a/frontend/src/types/proto-es/v1/actuator_service_pb.js
+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.js
@@ -15,7 +15,7 @@ import { file_v1_setting_service } from "./setting_service_pb";
* Describes the file v1/actuator_service.proto.
*/
export const file_v1_actuator_service = /*@__PURE__*/
- fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIUChJTZXR1cFNhbXBsZVJlcXVlc3QiGAoWR2V0QWN0dWF0b3JJbmZvUmVxdWVzdCJPCh9HZXRXb3Jrc3BhY2VBY3R1YXRvckluZm9SZXF1ZXN0EiwKBG5hbWUYASABKAlCHuBBAvpBGAoWYnl0ZWJhc2UuY29tL1dvcmtzcGFjZSIUChJEZWxldGVDYWNoZVJlcXVlc3QirwEKC1Jlc3RyaWN0aW9uEhwKD2Rpc2FsbG93X3NpZ251cBgBIAEoCEID4EEDEiUKGGRpc2FsbG93X3Bhc3N3b3JkX3NpZ25pbhgCIAEoCEID4EEDElsKFHBhc3N3b3JkX3Jlc3RyaWN0aW9uGAMgASgLMjguYnl0ZWJhc2UudjEuV29ya3NwYWNlUHJvZmlsZVNldHRpbmcuUGFzc3dvcmRSZXN0cmljdGlvbkID4EEDIoUFCgxBY3R1YXRvckluZm8SFAoHdmVyc2lvbhgBIAEoCUID4EEDEhcKCmdpdF9jb21taXQYAiABKAlCA+BBAxIVCghyZWFkb25seRgDIAEoCEID4EEDEhEKBHNhYXMYBCABKAhCA+BBAxIRCgRkZW1vGAUgASgIQgPgQQMSEQoEaG9zdBgGIAEoCUID4EEDEhEKBHBvcnQYByABKAlCA+BBAxIZCgxleHRlcm5hbF91cmwYCCABKAlCA+BBAxI5ChBsYXN0X2FjdGl2ZV90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhYKCXdvcmtzcGFjZRgNIAEoCUID4EEDEiAKE3VubGljZW5zZWRfZmVhdHVyZXMYDyADKAlCA+BBAxITCgZkb2NrZXIYEiABKAhCA+BBAxIhChRhY3RpdmF0ZWRfdXNlcl9jb3VudBgTIAEoBUID4EEDEiUKGGFjdGl2YXRlZF9pbnN0YW5jZV9jb3VudBgUIAEoBUID4EEDEiEKFHRvdGFsX2luc3RhbmNlX2NvdW50GBUgASgFQgPgQQMSGgoNZW5hYmxlX3NhbXBsZRgWIAEoCEID4EEDEiMKFmV4dGVybmFsX3VybF9mcm9tX2ZsYWcYFyABKAhCA+BBAxIaCg1yZXBsaWNhX2NvdW50GBggASgFQgPgQQMSMgoLcmVzdHJpY3Rpb24YGSABKAsyGC5ieXRlYmFzZS52MS5SZXN0cmljdGlvbkID4EEDEhwKD2RlZmF1bHRfcHJvamVjdBgaIAEoCUID4EEDSgQICRAKSgQIChALSgQIDBANSgQIEBARSgQIERASSgQIDhAPMrYECg9BY3R1YXRvclNlcnZpY2UScwoPR2V0QWN0dWF0b3JJbmZvEiMuYnl0ZWJhc2UudjEuR2V0QWN0dWF0b3JJbmZvUmVxdWVzdBoZLmJ5dGViYXNlLnYxLkFjdHVhdG9ySW5mbyIg2kEAgOowAYLT5JMCExIRL3YxL2FjdHVhdG9yL2luZm8SggEKC1NldHVwU2FtcGxlEh8uYnl0ZWJhc2UudjEuU2V0dXBTYW1wbGVSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjqK6jASYmIucHJvamVjdHMuY3JlYXRlkOowAYLT5JMCGiIYL3YxL2FjdHVhdG9yOnNldHVwU2FtcGxlEmYKC0RlbGV0ZUNhY2hlEh8uYnl0ZWJhc2UudjEuRGVsZXRlQ2FjaGVSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5Ih6A6jABgtPkkwIUKhIvdjEvYWN0dWF0b3IvY2FjaGUSwAEKGEdldFdvcmtzcGFjZUFjdHVhdG9ySW5mbxIsLmJ5dGViYXNlLnYxLkdldFdvcmtzcGFjZUFjdHVhdG9ySW5mb1JlcXVlc3QaGS5ieXRlYmFzZS52MS5BY3R1YXRvckluZm8iW9pBBG5hbWWK6jAfYmIuc2V0dGluZ3MuZ2V0V29ya3NwYWNlUHJvZmlsZZDqMAGC0+STAicSJS92MS97bmFtZT13b3Jrc3BhY2VzLyp9L2FjdHVhdG9yL2luZm9CqgEKD2NvbS5ieXRlYmFzZS52MUIUQWN0dWF0b3JTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_timestamp, file_v1_annotation, file_v1_setting_service]);
+ fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIUChJTZXR1cFNhbXBsZVJlcXVlc3QiGAoWR2V0QWN0dWF0b3JJbmZvUmVxdWVzdCJPCh9HZXRXb3Jrc3BhY2VBY3R1YXRvckluZm9SZXF1ZXN0EiwKBG5hbWUYASABKAlCHuBBAvpBGAoWYnl0ZWJhc2UuY29tL1dvcmtzcGFjZSIUChJEZWxldGVDYWNoZVJlcXVlc3QirwEKC1Jlc3RyaWN0aW9uEhwKD2Rpc2FsbG93X3NpZ251cBgBIAEoCEID4EEDEiUKGGRpc2FsbG93X3Bhc3N3b3JkX3NpZ25pbhgCIAEoCEID4EEDElsKFHBhc3N3b3JkX3Jlc3RyaWN0aW9uGAMgASgLMjguYnl0ZWJhc2UudjEuV29ya3NwYWNlUHJvZmlsZVNldHRpbmcuUGFzc3dvcmRSZXN0cmljdGlvbkID4EEDIqUFCgxBY3R1YXRvckluZm8SFAoHdmVyc2lvbhgBIAEoCUID4EEDEhcKCmdpdF9jb21taXQYAiABKAlCA+BBAxIVCghyZWFkb25seRgDIAEoCEID4EEDEhEKBHNhYXMYBCABKAhCA+BBAxIRCgRkZW1vGAUgASgIQgPgQQMSEQoEaG9zdBgGIAEoCUID4EEDEhEKBHBvcnQYByABKAlCA+BBAxIZCgxleHRlcm5hbF91cmwYCCABKAlCA+BBAxI5ChBsYXN0X2FjdGl2ZV90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhYKCXdvcmtzcGFjZRgNIAEoCUID4EEDEiAKE3VubGljZW5zZWRfZmVhdHVyZXMYDyADKAlCA+BBAxITCgZkb2NrZXIYEiABKAhCA+BBAxIhChRhY3RpdmF0ZWRfdXNlcl9jb3VudBgTIAEoBUID4EEDEiUKGGFjdGl2YXRlZF9pbnN0YW5jZV9jb3VudBgUIAEoBUID4EEDEiEKFHRvdGFsX2luc3RhbmNlX2NvdW50GBUgASgFQgPgQQMSGgoNZW5hYmxlX3NhbXBsZRgWIAEoCEID4EEDEiMKFmV4dGVybmFsX3VybF9mcm9tX2ZsYWcYFyABKAhCA+BBAxIaCg1yZXBsaWNhX2NvdW50GBggASgFQgPgQQMSMgoLcmVzdHJpY3Rpb24YGSABKAsyGC5ieXRlYmFzZS52MS5SZXN0cmljdGlvbkID4EEDEhwKD2RlZmF1bHRfcHJvamVjdBgaIAEoCUID4EEDEh4KEXVzZXJfY291bnRfaW5faWFtGBsgASgFQgPgQQNKBAgJEApKBAgKEAtKBAgMEA1KBAgQEBFKBAgREBJKBAgOEA8ytgQKD0FjdHVhdG9yU2VydmljZRJzCg9HZXRBY3R1YXRvckluZm8SIy5ieXRlYmFzZS52MS5HZXRBY3R1YXRvckluZm9SZXF1ZXN0GhkuYnl0ZWJhc2UudjEuQWN0dWF0b3JJbmZvIiDaQQCA6jABgtPkkwITEhEvdjEvYWN0dWF0b3IvaW5mbxKCAQoLU2V0dXBTYW1wbGUSHy5ieXRlYmFzZS52MS5TZXR1cFNhbXBsZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiOorqMBJiYi5wcm9qZWN0cy5jcmVhdGWQ6jABgtPkkwIaIhgvdjEvYWN0dWF0b3I6c2V0dXBTYW1wbGUSZgoLRGVsZXRlQ2FjaGUSHy5ieXRlYmFzZS52MS5EZWxldGVDYWNoZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiHoDqMAGC0+STAhQqEi92MS9hY3R1YXRvci9jYWNoZRLAAQoYR2V0V29ya3NwYWNlQWN0dWF0b3JJbmZvEiwuYnl0ZWJhc2UudjEuR2V0V29ya3NwYWNlQWN0dWF0b3JJbmZvUmVxdWVzdBoZLmJ5dGViYXNlLnYxLkFjdHVhdG9ySW5mbyJb2kEEbmFtZYrqMB9iYi5zZXR0aW5ncy5nZXRXb3Jrc3BhY2VQcm9maWxlkOowAYLT5JMCJxIlL3YxL3tuYW1lPXdvcmtzcGFjZXMvKn0vYWN0dWF0b3IvaW5mb0KqAQoPY29tLmJ5dGViYXNlLnYxQhRBY3R1YXRvclNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_timestamp, file_v1_annotation, file_v1_setting_service]);
/**
* Describes the message bytebase.v1.SetupSampleRequest.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index dff8be8898..4e45e6e32f 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -16683,6 +16683,12 @@ components:
The default project for unassigned databases.
Format: projects/{id}
readOnly: true
+ userCountInIam:
+ type: integer
+ title: user_count_in_iam
+ format: int32
+ description: The number of users in the workspace IAM (for seat limit display).
+ readOnly: true
title: ActuatorInfo
additionalProperties: false
description: |-
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 7e7c87e870..76bfd337cb 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -2583,6 +2583,7 @@ Actuator concept is similar to the Spring Boot Actuator.
| replica_count | [int32](#int32) | | The number of active replicas (servers sharing the same database). |
| restriction | [Restriction](#bytebase-v1-Restriction) | | |
| default_project | [string](#string) | | The default project for unassigned databases. Format: projects/{id} |
+| user_count_in_iam | [int32](#int32) | | The number of users in the workspace IAM (for seat limit display). |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 00619340d6..abe29b6184 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -8003,6 +8003,13 @@ Format: workspaces/{id} </p></td>
Format: projects/{id} </p></td>
</tr>
+ <tr>
+ <td>user_count_in_iam</td>
+ <td><a href="#int32">int32</a></td>
+ <td></td>
+ <td><p>The number of users in the workspace IAM (for seat limit display). </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/v1/v1/actuator_service.proto b/proto/v1/v1/actuator_service.proto
index f29c4a1f07..88fc32f287 100644
--- a/proto/v1/v1/actuator_service.proto
+++ b/proto/v1/v1/actuator_service.proto
@@ -144,4 +144,7 @@ message ActuatorInfo {
// The default project for unassigned databases.
// Format: projects/{id}
string default_project = 26 [(google.api.field_behavior) = OUTPUT_ONLY];
+
+ // The number of users in the workspace IAM (for seat limit display).
+ int32 user_count_in_iam = 27 [(google.api.field_behavior) = OUTPUT_ONLY];
}