Merge #130835

130835: ui: explain default settings changes in role events r=dhartunian a=dhartunian Resolves: #127182 Release note: None Co-authored-by: David Hartunian <[email protected]>
cockroachdb · Sep 20, 2024 · 2e318cb · 2e318cb
2 parents ed3d337 + 64e19da
commit 2e318cb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkg/ui/workspaces/db-console/src/util/events.spec.ts b/pkg/ui/workspaces/db-console/src/util/events.spec.ts
@@ -63,6 +63,14 @@ describe("getEventDescription", function () {
         },
         expected: "Role Altered: User abc altered role 123",
       },
+      {
+        event: {
+          eventType: "alter_role",
+          info: '{"User": "abc", "RoleName": "123", "SetInfo": ["DEFAULTSETTINGS"]}',
+        },
+        expected:
+          "Role Altered: User abc altered default settings for role 123",
+      },
       {
         event: {
           eventType: "alter_role",

diff --git a/pkg/ui/workspaces/db-console/src/util/events.ts b/pkg/ui/workspaces/db-console/src/util/events.ts
@@ -181,6 +181,12 @@ export function getEventDescription(e: clusterUiApi.EventColumns): string {
     case eventTypes.ALTER_ROLE:
       if (info.Options && info.Options.length > 0) {
         return `Role Altered: User ${info.User} altered role ${info.RoleName} with options ${info.Options}`;
+      } else if (
+        info.SetInfo &&
+        info.SetInfo.length === 1 &&
+        info.SetInfo[0] === "DEFAULTSETTINGS"
+      ) {
+        return `Role Altered: User ${info.User} altered default settings for role ${info.RoleName}`;
       } else {
         return `Role Altered: User ${info.User} altered role ${info.RoleName}`;
       }
@@ -240,6 +246,7 @@ export interface EventInfo {
   RoleName?: string;
   SchemaName?: string;
   SequenceName?: string;
+  SetInfo?: string[];
   SettingName?: string;
   Statement?: string;
   TableName?: string;