Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle external ops subscription #1022

Merged
merged 12 commits into from
Jan 27, 2025
Merged

Handle external ops subscription #1022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
25c41cc
feat: add external ops roles and status management in configuration a…
caffeinated92 Jan 22, 2025
6c6e2d9
feat: implement external role subscription management and add TextInp…
caffeinated92 Jan 22, 2025
bfff729
Merge remote-tracking branch 'origin/develop' into cloud18
caffeinated92 Jan 24, 2025
67fd8b9
fix: prevent show drop user button for extdbops and extsysops while s…
caffeinated92 Jan 24, 2025
ee38430
fix: clear external role configurations upon ending external operations
caffeinated92 Jan 24, 2025
f5c5819
fix: update API user ACL allow settings for enhanced permissions
caffeinated92 Jan 24, 2025
73d6bd1
fix: fix external ops handling and add external ops buttons to settings
caffeinated92 Jan 24, 2025
3943a09
fix grant option not showing when sysops does not have the grant
caffeinated92 Jan 24, 2025
0538f90
refactor: update external operations API endpoints and documentation
caffeinated92 Jan 24, 2025
19f07cd
external ops quotation
caffeinated92 Jan 25, 2025
2a604e5
add quote roles to config role types
caffeinated92 Jan 25, 2025
ae5eda4
feat: update terms handling and add TermsModal component; remove Clus…
caffeinated92 Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add quote roles to config role types
  • Loading branch information
@caffeinated92
caffeinated92 committed Jan 25, 2025
commit 2a604e53a89a28592ae00add7b55f07dc11e1b1e
2 changes: 2 additions & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2549,6 +2549,8 @@ func GetRoleType() map[string]string {
RolePending: RolePending,
RolePendingExtDBOps: RolePendingExtDBOps,
RolePendingExtSysOps: RolePendingExtSysOps,
RoleQuoteExtDBOps: RoleQuoteExtDBOps,
RoleQuoteExtSysOps: RoleQuoteExtSysOps,
RoleUnsubscribed: RoleUnsubscribed,
RoleUnsubscribedExtDBOps: RoleUnsubscribedExtDBOps,
RoleUnsubscribedExtSysOps: RoleUnsubscribedExtSysOps,
Expand Down
4 changes: 2 additions & 2 deletions server/server_cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,11 @@ func (repman *ReplicationManager) AcceptExternalOps(userform CloudUserForm, cl *

if userform.Roles == config.RoleExtDBOps {
if v, ok := auser.Roles[config.RoleQuoteExtDBOps]; !ok || !v {
return fmt.Errorf("User %s does not have '%s' role", user, config.RoleQuoteExtSysOps)
return fmt.Errorf("User %s does not have '%s' role", user, config.RoleQuoteExtDBOps)
}

extops = repman.CreateExtDBOpsForm(user)
auser.Roles[config.RoleQuoteExtSysOps] = false
auser.Roles[config.RoleQuoteExtDBOps] = false
cl.Conf.Cloud18ExternalDbOpsStatus = config.ExternalActive
} else if userform.Roles == config.RoleExtSysOps {
if v, ok := auser.Roles[config.RoleQuoteExtSysOps]; !ok || !v {
Expand Down