Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
WIP: feat: support Issue Approved webhook event (BYT-9100) (#19740)
zchpeter9a2d915439dd
diff --git a/.sonarcloud.properties b/.sonarcloud.propertiesindex 50620cc83b..c8aa56d375 100644--- a/.sonarcloud.properties+++ b/.sonarcloud.properties@@ -3,11 +3,12 @@ sonar.sources=.# Exclude generated code, build artifacts, and dependencies from analysissonar.exclusions=\- backend/generated-go,\- backend/migrator/migration,\- proto/gen,\- bytebase-build,\- frontend/node_modules+ backend/generated-go/**,\+ backend/migrator/migration/**,\+ backend/api/mcp/gen/**,\+ proto/gen/**,\+ bytebase-build/**,\+ frontend/node_modules/**# Path to tests — identify test files so they are analyzed as tests, not sourcesonar.test.inclusions=\@@ -65,8 +66,9 @@ sonar.cpd.exclusions=\backend/**/*_test.go,\backend/**/testdata/**,\backend/**/test-data/**,\- backend/generated-go,\+ backend/generated-go/**,\+ backend/api/mcp/gen/**,\backend/plugin/db/**,\frontend/src/**/*.test.ts,\frontend/src/**/*.test.tsx,\- proto/gen+ proto/gen/**diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex 1da1d0f71c..885377c103 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -7437,6 +7437,7 @@ components:- ISSUE_SENT_BACK- PIPELINE_FAILED- PIPELINE_COMPLETED+ - ISSUE_APPROVEDdescription: Activity type enumeration.bytebase.v1.ActuatorInfo:type: object@@ -19162,6 +19163,7 @@ components:- ISSUE_CREATED- ISSUE_APPROVAL_REQUESTED- ISSUE_SENT_BACK+ - ISSUE_APPROVED- PIPELINE_FAILED- PIPELINE_COMPLETEDtitle: Webhookdiff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.goindex 5b5f045060..68a2fcba60 100644--- a/backend/api/v1/issue_service.go+++ b/backend/api/v1/issue_service.go@@ -631,8 +631,9 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1approval.NotifyApprovalRequested(ctx, s.store, s.webhookManager, issue, project)- // If the issue is a role grant request and approved, complete it.+ // If the issue is approved, notify the creator and complete access request if applicable.if approved {+ approval.NotifyIssueApproved(ctx, s.store, s.webhookManager, issue, project, user)issue, err = completeAccessRequestIssue(ctx, s.store, user.Email, issue)if err != nil {slog.Debug("failed to complete role grant issue", log.BBError(err))diff --git a/backend/api/v1/project_service_converter.go b/backend/api/v1/project_service_converter.goindex 95b122d4ac..a2ffef6d7d 100644--- a/backend/api/v1/project_service_converter.go+++ b/backend/api/v1/project_service_converter.go@@ -63,6 +63,8 @@ func convertToStoreActivityTypes(types []v1pb.Activity_Type) ([]storepb.Activityresult = append(result, storepb.Activity_ISSUE_APPROVAL_REQUESTED)case v1pb.Activity_ISSUE_SENT_BACK:result = append(result, storepb.Activity_ISSUE_SENT_BACK)+ case v1pb.Activity_ISSUE_APPROVED:+ result = append(result, storepb.Activity_ISSUE_APPROVED)case v1pb.Activity_PIPELINE_FAILED:result = append(result, storepb.Activity_PIPELINE_FAILED)case v1pb.Activity_PIPELINE_COMPLETED:@@ -84,6 +86,8 @@ func convertToV1ActivityTypes(types []storepb.Activity_Type) []v1pb.Activity_Typresult = append(result, v1pb.Activity_ISSUE_APPROVAL_REQUESTED)case storepb.Activity_ISSUE_SENT_BACK:result = append(result, v1pb.Activity_ISSUE_SENT_BACK)+ case storepb.Activity_ISSUE_APPROVED:+ result = append(result, v1pb.Activity_ISSUE_APPROVED)case storepb.Activity_PIPELINE_FAILED:result = append(result, v1pb.Activity_PIPELINE_FAILED)case storepb.Activity_PIPELINE_COMPLETED:diff --git a/backend/component/webhook/event.go b/backend/component/webhook/event.goindex 872ac58d1a..0b7dfcfef2 100644--- a/backend/component/webhook/event.go+++ b/backend/component/webhook/event.go@@ -12,6 +12,7 @@ type Event struct {// Focused event types (only one is set)IssueCreated *EventIssueCreatedApprovalRequested *EventIssueApprovalRequested+ IssueApproved *EventIssueApprovedSentBack *EventIssueSentBackRolloutFailed *EventRolloutFailedRolloutCompleted *EventRolloutCompleted@@ -79,6 +80,12 @@ type EventIssueApprovalRequested struct {Approvers []User}+type EventIssueApproved struct {+ Approver *User+ Creator *User+ Issue *Issue+}+type EventIssueSentBack struct {Approver *UserCreator *Userdiff --git a/backend/component/webhook/event_test.go b/backend/component/webhook/event_test.gonew file mode 100644index 0000000000..795ffded6d--- /dev/null+++ b/backend/component/webhook/event_test.go@@ -0,0 +1,192 @@+package webhook++import (+ "testing"++ "github.com/stretchr/testify/require"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/store"+)++func TestNewIssue(t *testing.T) {+ t.Run("nil input", func(t *testing.T) {+ a := require.New(t)+ a.Nil(NewIssue(nil))+ })++ t.Run("basic fields", func(t *testing.T) {+ a := require.New(t)+ msg := &store.IssueMessage{+ UID: 42,+ Title: "Add index to users table",+ Description: "We need a B-tree index",+ Status: storepb.Issue_OPEN,+ Type: storepb.Issue_DATABASE_CHANGE,+ CreatorEmail: "[email protected]",+ Payload: &storepb.Issue{},+ }+ got := NewIssue(msg)+ a.Equal(int64(42), got.UID)+ a.Equal("Add index to users table", got.Title)+ a.Equal("We need a B-tree index", got.Description)+ a.Equal("OPEN", got.Status)+ a.Equal("DATABASE_CHANGE", got.Type)+ a.Equal("[email protected]", got.CreatorEmail)+ })++ t.Run("nil payload", func(t *testing.T) {+ a := require.New(t)+ msg := &store.IssueMessage{+ UID: 1,+ Title: "test",+ }+ got := NewIssue(msg)+ a.NotNil(got)+ a.Nil(got.Approval)+ })+}++func TestNewProject(t *testing.T) {+ a := require.New(t)+ msg := &store.ProjectMessage{+ ResourceID: "my-project",+ Workspace: "ws-001",+ Title: "My Project",+ }+ got := NewProject(msg)+ a.Equal("my-project", got.ResourceID)+ a.Equal("ws-001", got.Workspace)+ a.Equal("My Project", got.Title)+}++func TestNewRollout(t *testing.T) {+ a := require.New(t)+ msg := &store.PlanMessage{+ UID: 99,+ Name: "Deploy v2.0",+ }+ got := NewRollout(msg)+ a.Equal(99, got.UID)+ a.Equal("Deploy v2.0", got.Title)+}++func TestEventIssueApproved_Structure(t *testing.T) {+ a := require.New(t)++ event := &EventIssueApproved{+ Approver: &User{Name: "Bob", Email: "[email protected]"},+ Creator: &User{Name: "Alice", Email: "[email protected]"},+ Issue: &Issue{+ UID: 101,+ Title: "Grant read access",+ Description: "Need read access to prod DB",+ CreatorEmail: "[email protected]",+ },+ }++ a.Equal("Bob", event.Approver.Name)+ a.Equal("[email protected]", event.Approver.Email)+ a.Equal("Alice", event.Creator.Name)+ a.Equal("[email protected]", event.Creator.Email)+ a.Equal(int64(101), event.Issue.UID)+ a.Equal("Grant read access", event.Issue.Title)+}++func TestEvent_IssueApproved_TypeField(t *testing.T) {+ a := require.New(t)++ event := &Event{+ Type: storepb.Activity_ISSUE_APPROVED,+ IssueApproved: &EventIssueApproved{+ Approver: &User{Name: "Bob", Email: "[email protected]"},+ Creator: &User{Name: "Alice", Email: "[email protected]"},+ Issue: &Issue{UID: 1, Title: "test"},+ },+ }++ a.Equal(storepb.Activity_ISSUE_APPROVED, event.Type)+ a.NotNil(event.IssueApproved)+ a.Nil(event.IssueCreated)+ a.Nil(event.ApprovalRequested)+ a.Nil(event.SentBack)+ a.Nil(event.RolloutFailed)+ a.Nil(event.RolloutCompleted)+}++func TestEvent_OnlyOneEventTypeSet(t *testing.T) {+ tests := []struct {+ name string+ event Event+ }{+ {+ name: "ISSUE_CREATED",+ event: Event{+ Type: storepb.Activity_ISSUE_CREATED,+ IssueCreated: &EventIssueCreated{},+ },+ },+ {+ name: "ISSUE_APPROVAL_REQUESTED",+ event: Event{+ Type: storepb.Activity_ISSUE_APPROVAL_REQUESTED,+ ApprovalRequested: &EventIssueApprovalRequested{},+ },+ },+ {+ name: "ISSUE_APPROVED",+ event: Event{+ Type: storepb.Activity_ISSUE_APPROVED,+ IssueApproved: &EventIssueApproved{},+ },+ },+ {+ name: "ISSUE_SENT_BACK",+ event: Event{+ Type: storepb.Activity_ISSUE_SENT_BACK,+ SentBack: &EventIssueSentBack{},+ },+ },+ {+ name: "PIPELINE_FAILED",+ event: Event{+ Type: storepb.Activity_PIPELINE_FAILED,+ RolloutFailed: &EventRolloutFailed{},+ },+ },+ {+ name: "PIPELINE_COMPLETED",+ event: Event{+ Type: storepb.Activity_PIPELINE_COMPLETED,+ RolloutCompleted: &EventRolloutCompleted{},+ },+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ a := require.New(t)+ // Verify only the expected event type field is set+ setCount := 0+ if tt.event.IssueCreated != nil {+ setCount+++ }+ if tt.event.ApprovalRequested != nil {+ setCount+++ }+ if tt.event.IssueApproved != nil {+ setCount+++ }+ if tt.event.SentBack != nil {+ setCount+++ }+ if tt.event.RolloutFailed != nil {+ setCount+++ }+ if tt.event.RolloutCompleted != nil {+ setCount+++ }+ a.Equal(1, setCount, "exactly one event type should be set for %s", tt.name)+ })+ }+}diff --git a/backend/component/webhook/manager.go b/backend/component/webhook/manager.goindex e3bbabc7c6..d0a9e5c01d 100644--- a/backend/component/webhook/manager.go+++ b/backend/component/webhook/manager.go@@ -74,6 +74,8 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, eventitle := ""titleZh := ""link := ""+ description := ""+ environment := ""var actor *Uservar issue *Issuevar rollout *Rollout@@ -86,7 +88,7 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, evenactor = e.IssueCreated.Creatorissue = e.IssueCreated.Issuelink = fmt.Sprintf("%s/projects/%s/issues/%d", externalURL, e.Project.ResourceID, issue.UID)- webhookCtx.Description = fmt.Sprintf("%s created issue %s", actor.Name, issue.Title)+ description = fmt.Sprintf("%s created issue %s", actor.Name, issue.Title)}case storepb.Activity_ISSUE_APPROVAL_REQUESTED:@@ -107,6 +109,22 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, even}}+ case storepb.Activity_ISSUE_APPROVED:+ level = webhook.WebhookSuccess+ title = "Issue approved"+ titleZh = "工单审批通过"+ if e.IssueApproved != nil {+ actor = e.IssueApproved.Approver+ issue = e.IssueApproved.Issue+ link = fmt.Sprintf("%s/projects/%s/issues/%d", externalURL, e.Project.ResourceID, issue.UID)+ description = fmt.Sprintf("%s approved the issue", e.IssueApproved.Approver.Name)+ mentionUsers = []*store.UserMessage{{+ Name: e.IssueApproved.Creator.Name,+ Email: e.IssueApproved.Creator.Email,+ Type: storepb.PrincipalType_END_USER,+ }}+ }+case storepb.Activity_ISSUE_SENT_BACK:level = webhook.WebhookWarntitle = "Issue sent back"@@ -115,7 +133,7 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, evenactor = e.SentBack.Approverissue = e.SentBack.Issuelink = fmt.Sprintf("%s/projects/%s/issues/%d", externalURL, e.Project.ResourceID, issue.UID)- webhookCtx.Description = fmt.Sprintf("%s sent back the issue: %s", e.SentBack.Approver.Name, e.SentBack.Reason)+ description = fmt.Sprintf("%s sent back the issue: %s", e.SentBack.Approver.Name, e.SentBack.Reason)mentionUsers = []*store.UserMessage{{Name: e.SentBack.Creator.Name,@@ -132,8 +150,8 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, evenif e.RolloutFailed != nil {rollout = e.RolloutFailed.Rolloutlink = fmt.Sprintf("%s/projects/%s/plans/%d/rollout", externalURL, e.Project.ResourceID, rollout.UID)- webhookCtx.Description = "Rollout failed"- webhookCtx.Environment = e.RolloutFailed.Environment+ description = "Rollout failed"+ environment = e.RolloutFailed.Environment}case storepb.Activity_PIPELINE_COMPLETED:@@ -143,8 +161,8 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, evenif e.RolloutCompleted != nil {rollout = e.RolloutCompleted.Rolloutlink = fmt.Sprintf("%s/projects/%s/plans/%d/rollout", externalURL, e.Project.ResourceID, rollout.UID)- webhookCtx.Description = "Rollout completed successfully"- webhookCtx.Environment = e.RolloutCompleted.Environment+ description = "Rollout completed successfully"+ environment = e.RolloutCompleted.Environment}default:@@ -164,7 +182,9 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, evenEventType: string(eventType),Title: title,TitleZh: titleZh,+ Description: description,Link: link,+ Environment: environment,MentionEndUsers: mentionEndUsers,Project: &webhook.Project{Name: common.FormatProject(e.Project.ResourceID),@@ -182,7 +202,7 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, even// Set issue information if availableif issue != nil {creatorName := issue.Title // Fallback- creatorAccount, err := m.store.GetAccountByEmail(ctx, actor.Email)+ creatorAccount, err := m.store.GetAccountByEmail(ctx, issue.CreatorEmail)if err != nil {slog.Warn("failed to get creator user for webhook context",slog.String("issue_title", issue.Title),@@ -198,7 +218,7 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, evenDescription: issue.Description,Creator: webhook.Creator{Name: creatorName,- Email: actor.Email,+ Email: issue.CreatorEmail,},}}diff --git a/backend/component/webhook/manager_test.go b/backend/component/webhook/manager_test.gonew file mode 100644index 0000000000..35163e367f--- /dev/null+++ b/backend/component/webhook/manager_test.go@@ -0,0 +1,253 @@+package webhook++import (+ "context"+ "testing"++ "github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/component/config"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/webhook"+)++// Tests for getWebhookContextFromEvent that don't require a database connection.+// The Manager is constructed with a nil store and a profile with ExternalURL set.+// Test cases where store calls (GetAccountByEmail, GetWorkspaceProfileSetting)+// are NOT reached.++func newTestManager() *Manager {+ return &Manager{+ store: nil,+ profile: &config.Profile{+ ExternalURL: "https://bb.example.com",+ },+ }+}++func TestGetWebhookContext_UnsupportedEventType(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ e := &Event{+ Type: storepb.Activity_TYPE_UNSPECIFIED,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1"},+ }+ _, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.Error(err)+ a.Contains(err.Error(), "unsupported activity type")+}++func TestGetWebhookContext_IssueApproved_NilEventData(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ // ISSUE_APPROVED with nil IssueApproved data — should still produce a context+ // but with no issue/actor/link. No store calls are made when issue is nil.+ e := &Event{+ Type: storepb.Activity_ISSUE_APPROVED,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1", Title: "Test Project"},+ IssueApproved: nil,+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.NotNil(webhookCtx)+ a.Equal(webhook.WebhookSuccess, webhookCtx.Level)+ a.Equal("Issue approved", webhookCtx.Title)+ a.Equal("工单审批通过", webhookCtx.TitleZh)+ a.Empty(webhookCtx.Link)+ a.Empty(webhookCtx.Description)+ a.Nil(webhookCtx.Issue)+ a.Equal("Test Project", webhookCtx.Project.Title)+}++func TestGetWebhookContext_IssueCreated_NilEventData(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ e := &Event{+ Type: storepb.Activity_ISSUE_CREATED,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1", Title: "Test Project"},+ IssueCreated: nil,+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.NotNil(webhookCtx)+ a.Equal(webhook.WebhookInfo, webhookCtx.Level)+ a.Equal("Issue created", webhookCtx.Title)+ a.Equal("创建工单", webhookCtx.TitleZh)+ a.Nil(webhookCtx.Issue)+}++func TestGetWebhookContext_IssueSentBack_NilEventData(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ e := &Event{+ Type: storepb.Activity_ISSUE_SENT_BACK,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1", Title: "Test Project"},+ SentBack: nil,+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.NotNil(webhookCtx)+ a.Equal(webhook.WebhookWarn, webhookCtx.Level)+ a.Equal("Issue sent back", webhookCtx.Title)+ a.Equal("工单被退回", webhookCtx.TitleZh)+}++func TestGetWebhookContext_PipelineFailed_NilEventData(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ e := &Event{+ Type: storepb.Activity_PIPELINE_FAILED,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1", Title: "Test Project"},+ RolloutFailed: nil,+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.Equal(webhook.WebhookError, webhookCtx.Level)+ a.Equal("Rollout failed", webhookCtx.Title)+ a.Equal("发布失败", webhookCtx.TitleZh)+ a.Nil(webhookCtx.Rollout)+}++func TestGetWebhookContext_PipelineCompleted_NilEventData(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ e := &Event{+ Type: storepb.Activity_PIPELINE_COMPLETED,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1", Title: "Test Project"},+ RolloutCompleted: nil,+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.Equal(webhook.WebhookSuccess, webhookCtx.Level)+ a.Equal("Rollout completed", webhookCtx.Title)+ a.Equal("发布完成", webhookCtx.TitleZh)+ a.Nil(webhookCtx.Rollout)+}++func TestGetWebhookContext_RolloutFailed_WithData(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ // PIPELINE_FAILED with rollout data — no store call needed (rollout path skips GetAccountByEmail)+ e := &Event{+ Type: storepb.Activity_PIPELINE_FAILED,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1", Title: "Test Project"},+ RolloutFailed: &EventRolloutFailed{+ Rollout: &Rollout{UID: 10, Title: "Deploy v2"},+ Environment: "environments/prod",+ },+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.Equal(webhook.WebhookError, webhookCtx.Level)+ a.Equal("Rollout failed", webhookCtx.Description)+ a.Equal("environments/prod", webhookCtx.Environment)+ a.Equal("https://bb.example.com/projects/proj-1/plans/10/rollout", webhookCtx.Link)+ a.NotNil(webhookCtx.Rollout)+ a.Equal(10, webhookCtx.Rollout.UID)+ a.Equal("Deploy v2", webhookCtx.Rollout.Title)+ a.Nil(webhookCtx.Issue, "rollout events should not set issue")+}++func TestGetWebhookContext_RolloutCompleted_WithData(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ e := &Event{+ Type: storepb.Activity_PIPELINE_COMPLETED,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1", Title: "Test Project"},+ RolloutCompleted: &EventRolloutCompleted{+ Rollout: &Rollout{UID: 20, Title: "Deploy v3"},+ Environment: "environments/staging",+ },+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.Equal(webhook.WebhookSuccess, webhookCtx.Level)+ a.Equal("Rollout completed successfully", webhookCtx.Description)+ a.Equal("environments/staging", webhookCtx.Environment)+ a.Equal("https://bb.example.com/projects/proj-1/plans/20/rollout", webhookCtx.Link)+ a.NotNil(webhookCtx.Rollout)+}++func TestGetWebhookContext_ProjectAlwaysSet(t *testing.T) {+ a := require.New(t)+ m := newTestManager()+ ctx := context.Background()++ e := &Event{+ Type: storepb.Activity_ISSUE_APPROVED,+ Project: &Project{ResourceID: "my-project", Workspace: "ws-1", Title: "My Project"},+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.NotNil(webhookCtx.Project)+ a.Equal("projects/my-project", webhookCtx.Project.Name)+ a.Equal("My Project", webhookCtx.Project.Title)+}++func TestGetWebhookContext_AllEventLevels(t *testing.T) {+ m := newTestManager()+ ctx := context.Background()++ tests := []struct {+ name string+ eventType storepb.Activity_Type+ expectedLevel webhook.Level+ }{+ {"ISSUE_CREATED is INFO", storepb.Activity_ISSUE_CREATED, webhook.WebhookInfo},+ {"ISSUE_APPROVAL_REQUESTED is WARN", storepb.Activity_ISSUE_APPROVAL_REQUESTED, webhook.WebhookWarn},+ {"ISSUE_APPROVED is SUCCESS", storepb.Activity_ISSUE_APPROVED, webhook.WebhookSuccess},+ {"ISSUE_SENT_BACK is WARN", storepb.Activity_ISSUE_SENT_BACK, webhook.WebhookWarn},+ {"PIPELINE_FAILED is ERROR", storepb.Activity_PIPELINE_FAILED, webhook.WebhookError},+ {"PIPELINE_COMPLETED is SUCCESS", storepb.Activity_PIPELINE_COMPLETED, webhook.WebhookSuccess},+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ a := require.New(t)+ e := &Event{+ Type: tt.eventType,+ Project: &Project{ResourceID: "proj-1", Workspace: "ws-1"},+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ a.NoError(err)+ a.Equal(tt.expectedLevel, webhookCtx.Level)+ })+ }+}++func TestGetWebhookContext_ExternalURLInLink(t *testing.T) {+ m := &Manager{+ store: nil,+ profile: &config.Profile{+ ExternalURL: "https://custom.bytebase.io",+ },+ }+ ctx := context.Background()++ e := &Event{+ Type: storepb.Activity_PIPELINE_FAILED,+ Project: &Project{ResourceID: "test-proj", Workspace: "ws-1"},+ RolloutFailed: &EventRolloutFailed{+ Rollout: &Rollout{UID: 5, Title: "test"},+ },+ }+ webhookCtx, err := m.getWebhookContextFromEvent(ctx, e, e.Type)+ require.NoError(t, err)+ require.Equal(t, "https://custom.bytebase.io/projects/test-proj/plans/5/rollout", webhookCtx.Link)+}diff --git a/backend/generated-go/store/project_webhook.pb.go b/backend/generated-go/store/project_webhook.pb.goindex 3861c52d46..a9808cb21b 100644--- a/backend/generated-go/store/project_webhook.pb.go+++ b/backend/generated-go/store/project_webhook.pb.go@@ -37,6 +37,8 @@ const (Activity_PIPELINE_FAILED Activity_Type = 13// PIPELINE_COMPLETED represents a pipeline completion event.Activity_PIPELINE_COMPLETED Activity_Type = 14+ // ISSUE_APPROVED represents an issue being fully approved.+ Activity_ISSUE_APPROVED Activity_Type = 15)// Enum value maps for Activity_Type.@@ -48,6 +50,7 @@ var (12: "ISSUE_SENT_BACK",13: "PIPELINE_FAILED",14: "PIPELINE_COMPLETED",+ 15: "ISSUE_APPROVED",}Activity_Type_value = map[string]int32{"TYPE_UNSPECIFIED": 0,@@ -56,6 +59,7 @@ var ("ISSUE_SENT_BACK": 12,"PIPELINE_FAILED": 13,"PIPELINE_COMPLETED": 14,+ "ISSUE_APPROVED": 15,})@@ -210,8 +214,8 @@ var File_store_project_webhook_proto protoreflect.FileDescriptorconst file_store_project_webhook_proto_rawDesc = "" +"\n" +- "\x1bstore/project_webhook.proto\x12\x0ebytebase.store\x1a\x12store/common.proto\"\x9c\x01\n" +- "\bActivity\"\x8f\x01\n" ++ "\x1bstore/project_webhook.proto\x12\x0ebytebase.store\x1a\x12store/common.proto\"\xb0\x01\n" ++ "\bActivity\"\xa3\x01\n" +"\x04Type\x12\x14\n" +"\x10TYPE_UNSPECIFIED\x10\x00\x12\x11\n" +"\rISSUE_CREATED\x10\n" +@@ -219,7 +223,8 @@ const file_store_project_webhook_proto_rawDesc = "" +"\x18ISSUE_APPROVAL_REQUESTED\x10\v\x12\x13\n" +"\x0fISSUE_SENT_BACK\x10\f\x12\x13\n" +"\x0fPIPELINE_FAILED\x10\r\x12\x16\n" +- "\x12PIPELINE_COMPLETED\x10\x0e\"\xcf\x01\n" ++ "\x12PIPELINE_COMPLETED\x10\x0e\x12\x12\n" ++ "\x0eISSUE_APPROVED\x10\x0f\"\xcf\x01\n" +"\x0eProjectWebhook\x12/\n" +"\x04type\x18\x01 \x01(\x0e2\x1b.bytebase.store.WebhookTypeR\x04type\x12\x14\n" +"\x05title\x18\x02 \x01(\tR\x05title\x12\x10\n" +diff --git a/backend/generated-go/v1/project_service.pb.go b/backend/generated-go/v1/project_service.pb.goindex c37659ff5e..76d90d4e27 100644--- a/backend/generated-go/v1/project_service.pb.go+++ b/backend/generated-go/v1/project_service.pb.go@@ -41,6 +41,8 @@ const (Activity_PIPELINE_FAILED Activity_Type = 13// PIPELINE_COMPLETED represents a pipeline completion event.Activity_PIPELINE_COMPLETED Activity_Type = 14+ // ISSUE_APPROVED represents an issue being fully approved.+ Activity_ISSUE_APPROVED Activity_Type = 15)// Enum value maps for Activity_Type.@@ -52,6 +54,7 @@ var (12: "ISSUE_SENT_BACK",13: "PIPELINE_FAILED",14: "PIPELINE_COMPLETED",+ 15: "ISSUE_APPROVED",}Activity_Type_value = map[string]int32{"TYPE_UNSPECIFIED": 0,@@ -60,6 +63,7 @@ var ("ISSUE_SENT_BACK": 12,"PIPELINE_FAILED": 13,"PIPELINE_COMPLETED": 14,+ "ISSUE_APPROVED": 15,})@@ -1400,6 +1404,7 @@ type Webhook struct {// - ISSUE_CREATED// - ISSUE_APPROVAL_REQUESTED// - ISSUE_SENT_BACK+ // - ISSUE_APPROVED// - PIPELINE_FAILED// - PIPELINE_COMPLETEDNotificationTypes []Activity_Type `protobuf:"varint,5,rep,packed,name=notification_types,json=notificationTypes,proto3,enum=bytebase.v1.Activity_Type" json:"notification_types,omitempty"`@@ -1670,8 +1675,8 @@ const file_v1_project_service_proto_rawDesc = "" +"\x03url\x18\x04 \x01(\tB\x03\xe0A\x02R\x03url\x12%\n" +"\x0edirect_message\x18\x06 \x01(\bR\rdirectMessage\x12N\n" +"\x12notification_types\x18\x05 \x03(\x0e2\x1a.bytebase.v1.Activity.TypeB\x03\xe0A\x06R\x11notificationTypes:@\xeaA=\n" +- "\x14bytebase.com/Webhook\x12%projects/{project}/webhooks/{webhook}\"\x9c\x01\n" +- "\bActivity\"\x8f\x01\n" ++ "\x14bytebase.com/Webhook\x12%projects/{project}/webhooks/{webhook}\"\xb0\x01\n" ++ "\bActivity\"\xa3\x01\n" +"\x04Type\x12\x14\n" +"\x10TYPE_UNSPECIFIED\x10\x00\x12\x11\n" +"\rISSUE_CREATED\x10\n" +@@ -1679,7 +1684,8 @@ const file_v1_project_service_proto_rawDesc = "" +"\x18ISSUE_APPROVAL_REQUESTED\x10\v\x12\x13\n" +"\x0fISSUE_SENT_BACK\x10\f\x12\x13\n" +"\x0fPIPELINE_FAILED\x10\r\x12\x16\n" +- "\x12PIPELINE_COMPLETED\x10\x0e2\x82\x12\n" ++ "\x12PIPELINE_COMPLETED\x10\x0e\x12\x12\n" ++ "\x0eISSUE_APPROVED\x10\x0f2\x82\x12\n" +"\x0eProjectService\x12\x7f\n" +"\n" +"GetProject\x12\x1e.bytebase.v1.GetProjectRequest\x1a\x14.bytebase.v1.Project\";\xdaA\x04name\x8a\xea0\x0fbb.projects.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\x17\x12\x15/v1/{name=projects/*}\x12\x95\x01\n" +diff --git a/backend/plugin/webhook/slack/app.go b/backend/plugin/webhook/slack/app.goindex ffacc5281b..a12fc2d1e5 100644--- a/backend/plugin/webhook/slack/app.go+++ b/backend/plugin/webhook/slack/app.go@@ -198,15 +198,16 @@ func (p *provider) openConversation(ctx context.Context, userID string) (string,// https://api.slack.com/methods/chat.postMessagefunc (p *provider) chatPostMessage(ctx context.Context, channelID string, webhookContext webhook.Context) error {- blocks := GetBlocks(webhookContext)- blocksJSON, err := json.Marshal(blocks)+ msg := BuildMessage(webhookContext)+ attachmentsJSON, err := json.Marshal(msg.Attachments)if err != nil {- return errors.Wrapf(err, "failed to marshal blocks")+ return errors.Wrapf(err, "failed to marshal attachments")}data := url.Values{}data.Set("channel", channelID)- data.Set("blocks", string(blocksJSON))+ data.Set("text", msg.Text)+ data.Set("attachments", string(attachmentsJSON))req, err := http.NewRequestWithContext(ctx, http.MethodPost, "https://slack.com/api/chat.postMessage", strings.NewReader(data.Encode()))if err != nil {diff --git a/backend/plugin/webhook/slack/slack.go b/backend/plugin/webhook/slack/slack.goindex a82091539c..2734cb7775 100644--- a/backend/plugin/webhook/slack/slack.go+++ b/backend/plugin/webhook/slack/slack.go@@ -8,6 +8,7 @@ import ("io""log/slog""net/http"+ "strings""github.com/pkg/errors""go.uber.org/multierr"@@ -56,13 +57,20 @@ type Element struct {type Block struct {Type string `json:"type"`Text *BlockMarkdown `json:"text,omitempty"`- ElementList []Element `json:"elements,omitempty"`+ ElementList []any `json:"elements,omitempty"`+}++// Attachment is a Slack attachment with a colored sidebar.+type Attachment struct {+ Color string `json:"color"`+ BlockList []Block `json:"blocks"`}// MessagePayload is the API message for Slack webhook.type MessagePayload struct {- Text string `json:"text"`- BlockList []Block `json:"blocks"`+ Text string `json:"text"`+ BlockList []Block `json:"blocks,omitempty"`+ Attachments []Attachment `json:"attachments,omitempty"`}func init() {@@ -73,73 +81,126 @@ func init() {type Receiver struct {}-func GetBlocks(context webhook.Context) []Block {- blockList := []Block{}+func levelColor(level webhook.Level) string {+ switch level {+ case webhook.WebhookSuccess:+ return "#2EB67D"+ case webhook.WebhookWarn:+ return "#ECB22E"+ case webhook.WebhookError:+ return "#E01E5A"+ default:+ return "#1264A3"+ }+}- status := ""- switch context.Level {+func levelEmoji(level webhook.Level) string {+ switch level {case webhook.WebhookSuccess:- status = ":white_check_mark: "+ return "✅ "case webhook.WebhookWarn:- status = ":warning: "+ return "⚠️ "case webhook.WebhookError:- status = ":exclamation: "+ return "❗ "default:- status = ""+ return ""+ }+}++// escapeMrkdwn escapes Slack mrkdwn special characters in user-provided text.+func escapeMrkdwn(s string) string {+ s = strings.ReplaceAll(s, "&", "&")+ s = strings.ReplaceAll(s, "<", "<")+ s = strings.ReplaceAll(s, ">", ">")+ return s+}++// BuildMessage constructs the Slack message payload with a colored attachment sidebar.+func BuildMessage(ctx webhook.Context) MessagePayload {+ var blocks []Block++ // Title — linked when Link is present.+ escapedTitle := escapeMrkdwn(ctx.Title)+ titleText := escapedTitle+ if ctx.Link != "" {+ titleText = fmt.Sprintf("<%s|%s>", ctx.Link, escapedTitle)}- blockList = append(blockList, Block{+ blocks = append(blocks, Block{Type: "section",- Text: &BlockMarkdown{- Type: "mrkdwn",- Text: fmt.Sprintf("*%s%s*", status, context.Title),- },+ Text: &BlockMarkdown{Type: "mrkdwn", Text: levelEmoji(ctx.Level) + "*" + titleText + "*"},})- if context.Description != "" {- blockList = append(blockList, Block{+ // Description.+ if ctx.Description != "" {+ blocks = append(blocks, Block{Type: "section",- Text: &BlockMarkdown{- Type: "mrkdwn",- Text: fmt.Sprintf("```%s```", context.Description),- },+ Text: &BlockMarkdown{Type: "mrkdwn", Text: escapeMrkdwn(ctx.Description)},})}- for _, meta := range context.GetMetaList() {- blockList = append(blockList, Block{+ // Issue/Rollout title — prominent tile between description and metadata.+ if ctx.Issue != nil {+ blocks = append(blocks, Block{Type: "section",- Text: &BlockMarkdown{- Type: "mrkdwn",- Text: fmt.Sprintf("*%s:* %s", meta.Name, meta.Value),- },+ Text: &BlockMarkdown{Type: "mrkdwn", Text: fmt.Sprintf("*%s*", escapeMrkdwn(ctx.Issue.Name))},+ })+ if ctx.Issue.Description != "" {+ blocks = append(blocks, Block{+ Type: "section",+ Text: &BlockMarkdown{Type: "mrkdwn", Text: escapeMrkdwn(common.TruncateStringWithDescription(ctx.Issue.Description))},+ })+ }+ } else if ctx.Rollout != nil && ctx.Rollout.Title != "" {+ blocks = append(blocks, Block{+ Type: "section",+ Text: &BlockMarkdown{Type: "mrkdwn", Text: fmt.Sprintf("*%s*", escapeMrkdwn(ctx.Rollout.Title))},})}- if context.ActorName != "" {- blockList = append(blockList, Block{- Type: "section",- Text: &BlockMarkdown{- Type: "mrkdwn",- Text: fmt.Sprintf("Actor: %s (%s)", context.ActorName, context.ActorEmail),+ // Compact context metadata (issue/rollout name shown above as tile).+ var parts []string+ if ctx.Project != nil {+ parts = append(parts, fmt.Sprintf("*Project:* %s", escapeMrkdwn(ctx.Project.Title)))+ }+ if ctx.Issue != nil && ctx.Issue.Creator.Name != "" {+ parts = append(parts, fmt.Sprintf("*Creator:* %s", escapeMrkdwn(ctx.Issue.Creator.Name)))+ }+ if ctx.Rollout != nil && ctx.Environment != "" {+ parts = append(parts, fmt.Sprintf("*Env:* %s", escapeMrkdwn(ctx.Environment)))+ }+ if ctx.ActorName != "" {+ parts = append(parts, fmt.Sprintf("*By:* %s", escapeMrkdwn(ctx.ActorName)))+ }+ if len(parts) > 0 {+ blocks = append(blocks, Block{+ Type: "context",+ ElementList: []any{+ BlockMarkdown{Type: "mrkdwn", Text: strings.Join(parts, " | ")},},})}- blockList = append(blockList, Block{- Type: "actions",- ElementList: []Element{- {- Type: "button",- Button: ElementButton{- Type: "plain_text",- Text: "View in Bytebase",+ // "View in Bytebase" button.+ if ctx.Link != "" {+ blocks = append(blocks, Block{+ Type: "actions",+ ElementList: []any{+ Element{+ Type: "button",+ Button: ElementButton{Type: "plain_text", Text: "View in Bytebase"},+ URL: ctx.Link,},- URL: context.Link,},- },- })+ })+ }- return blockList+ return MessagePayload{+ Text: ctx.Title,+ Attachments: []Attachment{{+ Color: levelColor(ctx.Level),+ BlockList: blocks,+ }},+ }}func (*Receiver) Post(context webhook.Context) error {@@ -153,12 +214,7 @@ func (*Receiver) Post(context webhook.Context) error {}func postMessage(context webhook.Context) error {- blockList := GetBlocks(context)-- post := MessagePayload{- Text: context.Title,- BlockList: blockList,- }+ post := BuildMessage(context)body, err := json.Marshal(post)if err != nil {return errors.Wrapf(err, "failed to marshal webhook POST request to %s", context.URL)diff --git a/backend/plugin/webhook/slack/slack_test.go b/backend/plugin/webhook/slack/slack_test.gonew file mode 100644index 0000000000..4faf386483--- /dev/null+++ b/backend/plugin/webhook/slack/slack_test.go@@ -0,0 +1,231 @@+package slack++import (+ "encoding/json"+ "testing"++ "github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/plugin/webhook"+)++func TestBuildMessage_IssueApproved(t *testing.T) {+ a := require.New(t)++ ctx := webhook.Context{+ Level: webhook.WebhookSuccess,+ Title: "Issue approved",+ Description: "Bob approved the issue",+ Link: "https://bb.example.com/projects/proj-1/issues/42",+ ActorName: "Bob",+ ActorEmail: "[email protected]",+ Project: &webhook.Project{Name: "projects/proj-1", Title: "My Project"},+ Issue: &webhook.Issue{+ ID: 42,+ Name: "Grant read access to prod",+ Creator: webhook.Creator{Name: "Alice", Email: "[email protected]"},+ },+ }++ msg := BuildMessage(ctx)++ a.Equal("Issue approved", msg.Text)+ a.Len(msg.Attachments, 1)+ a.Equal("#2EB67D", msg.Attachments[0].Color)++ blocks := msg.Attachments[0].BlockList+ // Expected: title, description, issue tile, context, actions = 5 blocks+ a.Len(blocks, 5)++ // Title block — linked+ a.Equal("section", blocks[0].Type)+ a.Contains(blocks[0].Text.Text, "✅")+ a.Contains(blocks[0].Text.Text, "<https://bb.example.com/projects/proj-1/issues/42|Issue approved>")++ // Description block+ a.Equal("section", blocks[1].Type)+ a.Equal("Bob approved the issue", blocks[1].Text.Text)++ // Issue tile — prominent, bold+ a.Equal("section", blocks[2].Type)+ a.Equal("*Grant read access to prod*", blocks[2].Text.Text)++ // Context block — project, creator, actor (no issue name)+ a.Equal("context", blocks[3].Type)+ a.Len(blocks[3].ElementList, 1)+ contextJSON, _ := json.Marshal(blocks[3].ElementList[0])+ a.Contains(string(contextJSON), "My Project")+ a.Contains(string(contextJSON), "Alice")+ a.Contains(string(contextJSON), "Bob")+ a.NotContains(string(contextJSON), "Grant read access") // issue name is in tile, not context++ // Actions block+ a.Equal("actions", blocks[4].Type)+}++func TestBuildMessage_RolloutFailed(t *testing.T) {+ a := require.New(t)++ ctx := webhook.Context{+ Level: webhook.WebhookError,+ Title: "Rollout failed",+ Description: "Rollout failed",+ Link: "https://bb.example.com/projects/proj-1/plans/10/rollout",+ Project: &webhook.Project{Name: "projects/proj-1", Title: "My Project"},+ Rollout: &webhook.Rollout{UID: 10, Title: "Deploy v2"},+ Environment: "environments/prod",+ }++ msg := BuildMessage(ctx)++ a.Equal("#E01E5A", msg.Attachments[0].Color)+ blocks := msg.Attachments[0].BlockList++ // Title should have error emoji+ a.Contains(blocks[0].Text.Text, "❗")++ // Rollout tile — prominent+ a.Equal("section", blocks[2].Type)+ a.Equal("*Deploy v2*", blocks[2].Text.Text)++ // Context should have project and env (rollout name is in tile)+ a.Equal("context", blocks[3].Type)+ contextJSON, _ := json.Marshal(blocks[3].ElementList[0])+ a.Contains(string(contextJSON), "My Project")+ a.Contains(string(contextJSON), "environments/prod")+ a.NotContains(string(contextJSON), "Deploy v2")+}++func TestBuildMessage_NoLink(t *testing.T) {+ a := require.New(t)++ ctx := webhook.Context{+ Level: webhook.WebhookInfo,+ Title: "Issue created",+ }++ msg := BuildMessage(ctx)++ a.Equal("#1264A3", msg.Attachments[0].Color)+ blocks := msg.Attachments[0].BlockList++ // Title should NOT be linked+ a.NotContains(blocks[0].Text.Text, "<")++ // No actions block when no link+ for _, b := range blocks {+ a.NotEqual("actions", b.Type)+ }+}++func TestBuildMessage_Warn(t *testing.T) {+ a := require.New(t)++ ctx := webhook.Context{+ Level: webhook.WebhookWarn,+ Title: "Issue sent back",+ Link: "https://bb.example.com/projects/proj-1/issues/1",+ }++ msg := BuildMessage(ctx)++ a.Equal("#ECB22E", msg.Attachments[0].Color)+ a.Contains(msg.Attachments[0].BlockList[0].Text.Text, "⚠️")+}++func TestBuildMessage_JSONStructure(t *testing.T) {+ a := require.New(t)++ ctx := webhook.Context{+ Level: webhook.WebhookSuccess,+ Title: "Issue approved",+ Description: "Alice approved the issue",+ Link: "https://bb.example.com/projects/p/issues/1",+ Project: &webhook.Project{Name: "projects/p", Title: "P"},+ Issue: &webhook.Issue{+ Name: "My Issue",+ Creator: webhook.Creator{Name: "Bob"},+ },+ ActorName: "Alice",+ }++ msg := BuildMessage(ctx)+ b, err := json.Marshal(msg)+ a.NoError(err)++ // Verify the JSON is valid and has expected top-level structure+ var parsed map[string]any+ a.NoError(json.Unmarshal(b, &parsed))+ a.Equal("Issue approved", parsed["text"])+ a.NotNil(parsed["attachments"])++ attachments, ok := parsed["attachments"].([]any)+ a.True(ok)+ a.Len(attachments, 1)++ att, ok := attachments[0].(map[string]any)+ a.True(ok)+ a.Equal("#2EB67D", att["color"])+ a.NotNil(att["blocks"])+}++func TestEscapeMrkdwn(t *testing.T) {+ a := require.New(t)+ a.Equal("hello & world", escapeMrkdwn("hello & world"))+ a.Equal("a <b> c", escapeMrkdwn("a <b> c"))+ a.Equal("no special chars", escapeMrkdwn("no special chars"))+ a.Equal("&<>", escapeMrkdwn("&<>"))+}++func TestBuildMessage_EscapesUserContent(t *testing.T) {+ a := require.New(t)++ ctx := webhook.Context{+ Level: webhook.WebhookWarn,+ Title: "Issue <sent> back",+ Description: "Bob & Alice sent back: <script>alert('xss')</script>",+ Link: "https://bb.example.com/issues/1",+ Project: &webhook.Project{Name: "p", Title: "Project <A>"},+ Issue: &webhook.Issue{+ Name: "Issue with <angle> brackets",+ Creator: webhook.Creator{Name: "O'Brien & Sons"},+ },+ ActorName: "Admin <root>",+ }++ msg := BuildMessage(ctx)+ blocks := msg.Attachments[0].BlockList++ // Title should have escaped angle brackets+ a.Contains(blocks[0].Text.Text, "Issue <sent> back")++ // Description should escape HTML+ a.Contains(blocks[1].Text.Text, "&")+ a.Contains(blocks[1].Text.Text, "<script>")++ // Issue tile should escape+ a.Contains(blocks[2].Text.Text, "<angle>")++ // Context should escape — check via the BlockMarkdown Text field directly.+ contextElem, ok := blocks[3].ElementList[0].(BlockMarkdown)+ a.True(ok)+ a.Contains(contextElem.Text, "Project <A>")+ a.Contains(contextElem.Text, "O'Brien & Sons")+ a.Contains(contextElem.Text, "Admin <root>")+}++func TestLevelColor(t *testing.T) {+ a := require.New(t)+ a.Equal("#1264A3", levelColor(webhook.WebhookInfo))+ a.Equal("#2EB67D", levelColor(webhook.WebhookSuccess))+ a.Equal("#ECB22E", levelColor(webhook.WebhookWarn))+ a.Equal("#E01E5A", levelColor(webhook.WebhookError))+}++func TestLevelEmoji(t *testing.T) {+ a := require.New(t)+ a.Equal("", levelEmoji(webhook.WebhookInfo))+ a.Equal("✅ ", levelEmoji(webhook.WebhookSuccess))+ a.Equal("⚠️ ", levelEmoji(webhook.WebhookWarn))+ a.Equal("❗ ", levelEmoji(webhook.WebhookError))+}diff --git a/backend/plugin/webhook/webhook_test.go b/backend/plugin/webhook/webhook_test.goindex 40fbf86d16..ad92a7ad97 100644--- a/backend/plugin/webhook/webhook_test.go+++ b/backend/plugin/webhook/webhook_test.go@@ -1,6 +1,7 @@package webhookimport (+ "strings""testing""github.com/stretchr/testify/require"@@ -65,3 +66,192 @@ func TestContext_getMetaList(t *testing.T) {a.Equal(want, context.GetMetaListZh())})}++// TestContext_IssueApproved_MetaList tests the meta list rendering for an ISSUE_APPROVED+// webhook context. This simulates the Context that getWebhookContextFromEvent builds+// when processing an ISSUE_APPROVED event.+func TestContext_IssueApproved_MetaList(t *testing.T) {+ // Build a Context that matches what the manager produces for ISSUE_APPROVED:+ // - Level: WebhookSuccess+ // - Issue with creator (looked up from store)+ // - Description: "<approver> approved the issue"+ // - Project set+ // - Link set+ approvedCtx := Context{+ Level: WebhookSuccess,+ EventType: "ISSUE_APPROVED",+ Title: "Issue approved",+ TitleZh: "工单审批通过",+ Description: "Bob approved the issue",+ Link: "https://bb.example.com/projects/proj-1/issues/42",+ ActorName: "Bob",+ ActorEmail: "[email protected]",+ Project: &Project{+ Name: "projects/proj-1",+ Title: "My Project",+ },+ Issue: &Issue{+ ID: 42,+ Name: "Grant read access to prod",+ Status: "OPEN",+ Type: "DATABASE_CHANGE",+ Description: "Engineers need read access to production database for debugging",+ Creator: Creator{+ Name: "Alice",+ Email: "[email protected]",+ },+ },+ }++ t.Run("GetMetaList includes project and issue", func(t *testing.T) {+ a := require.New(t)+ meta := approvedCtx.GetMetaList()++ // Should have: Project Title, Project ID, Issue, Issue Creator, Issue Description+ a.Len(meta, 5)+ a.Equal("Project Title", meta[0].Name)+ a.Equal("My Project", meta[0].Value)+ a.Equal("Project ID", meta[1].Name)+ a.Equal("projects/proj-1", meta[1].Value)+ a.Equal("Issue", meta[2].Name)+ a.Equal("Grant read access to prod", meta[2].Value)+ a.Equal("Issue Creator", meta[3].Name)+ a.Equal("Alice ([email protected])", meta[3].Value)+ a.Equal("Issue Description", meta[4].Name)+ a.Contains(meta[4].Value, "Engineers need read access")+ })++ t.Run("GetMetaListZh includes project and issue", func(t *testing.T) {+ a := require.New(t)+ meta := approvedCtx.GetMetaListZh()++ a.Len(meta, 5)+ a.Equal("项目名称", meta[0].Name)+ a.Equal("My Project", meta[0].Value)+ a.Equal("项目 ID", meta[1].Name)+ a.Equal("projects/proj-1", meta[1].Value)+ a.Equal("工单", meta[2].Name)+ a.Equal("Grant read access to prod", meta[2].Value)+ a.Equal("工单创建者", meta[3].Name)+ a.Equal("Alice ([email protected])", meta[3].Value)+ a.Equal("工单描述", meta[4].Name)+ a.Contains(meta[4].Value, "Engineers need read access")+ })++ t.Run("Level is WebhookSuccess", func(t *testing.T) {+ a := require.New(t)+ a.Equal(WebhookSuccess, approvedCtx.Level)+ })++ t.Run("Title and TitleZh are correct", func(t *testing.T) {+ a := require.New(t)+ a.Equal("Issue approved", approvedCtx.Title)+ a.Equal("工单审批通过", approvedCtx.TitleZh)+ })++ t.Run("Description contains approver name", func(t *testing.T) {+ a := require.New(t)+ a.Equal("Bob approved the issue", approvedCtx.Description)+ })+}++// TestContext_IssueApproved_NilEvent tests the ISSUE_APPROVED context when+// the event data is nil (e.IssueApproved == nil). In this case, the manager+// sets only title/titleZh and all other fields remain zero-valued.+func TestContext_IssueApproved_NilEvent(t *testing.T) {+ a := require.New(t)++ // Simulates what the manager produces when e.IssueApproved is nil+ ctx := Context{+ Level: WebhookSuccess,+ EventType: "ISSUE_APPROVED",+ Title: "Issue approved",+ TitleZh: "工单审批通过",+ }++ meta := ctx.GetMetaList()+ a.Empty(meta, "no meta when issue is nil")++ metaZh := ctx.GetMetaListZh()+ a.Empty(metaZh, "no meta zh when issue is nil")+}++// TestContext_IssueApproved_LongDescription tests that long issue descriptions+// are truncated in the meta list rendering.+func TestContext_IssueApproved_LongDescription(t *testing.T) {+ a := require.New(t)++ longDesc := strings.Repeat("This is a long description. ", 50) // ~1400 chars+ ctx := Context{+ Issue: &Issue{+ Name: "Issue with long description",+ Description: longDesc,+ Creator: Creator{Name: "Alice", Email: "[email protected]"},+ },+ }++ meta := ctx.GetMetaList()+ descMeta := meta[2]+ a.Equal("Issue Description", descMeta.Name)+ // TruncateStringWithDescription truncates at 450 chars and appends "... (view details in Bytebase)"+ a.True(len(descMeta.Value) < len(longDesc), "description should be truncated")+ a.Contains(descMeta.Value, "view details in Bytebase")+}++// TestContext_IssueVsRollout_Exclusive tests that Issue and Rollout are mutually+// exclusive in the meta list — matching the `else if` logic in GetMetaList.+func TestContext_IssueVsRollout_Exclusive(t *testing.T) {+ t.Run("Issue takes precedence over Rollout", func(t *testing.T) {+ a := require.New(t)+ ctx := Context{+ Issue: &Issue{+ Name: "My Issue",+ Creator: Creator{Name: "Alice", Email: "[email protected]"},+ },+ Rollout: &Rollout{+ UID: 1,+ Title: "My Rollout",+ },+ }+ meta := ctx.GetMetaList()+ // Should contain Issue fields, not Rollout+ hasIssue := false+ hasRollout := false+ for _, m := range meta {+ if m.Name == "Issue" {+ hasIssue = true+ }+ if m.Name == "Rollout" {+ hasRollout = true+ }+ }+ a.True(hasIssue, "should have Issue meta")+ a.False(hasRollout, "should not have Rollout meta when Issue is set")+ })++ t.Run("Rollout shown when no Issue", func(t *testing.T) {+ a := require.New(t)+ ctx := Context{+ Rollout: &Rollout{+ UID: 1,+ Title: "Deploy v2.0",+ },+ Environment: "environments/prod",+ }+ meta := ctx.GetMetaList()+ a.Len(meta, 2)+ a.Equal("Rollout", meta[0].Name)+ a.Equal("Deploy v2.0", meta[0].Value)+ a.Equal("Environment", meta[1].Name)+ a.Equal("environments/prod", meta[1].Value)+ })+}++// TestContext_AllWebhookLevels verifies all webhook level constants.+func TestContext_AllWebhookLevels(t *testing.T) {+ a := require.New(t)+ a.Equal(Level("INFO"), WebhookInfo)+ a.Equal(Level("SUCCESS"), WebhookSuccess)+ a.Equal(Level("WARN"), WebhookWarn)+ a.Equal(Level("ERROR"), WebhookError)+}diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.goindex 4e101de981..2885e35f01 100644--- a/backend/runner/approval/runner.go+++ b/backend/runner/approval/runner.go@@ -1030,3 +1030,27 @@ func NotifyApprovalRequested(ctx context.Context, stores *store.Store, webhookMa},})}++// NotifyIssueApproved sends the ISSUE_APPROVED webhook event when all approval steps complete.+// It notifies the issue creator that their issue has been fully approved.+func NotifyIssueApproved(ctx context.Context, stores *store.Store, webhookManager *webhook.Manager, issue *store.IssueMessage, project *store.ProjectMessage, approver *store.UserMessage) {+ creatorAccount, err := stores.GetAccountByEmail(ctx, issue.CreatorEmail)+ if err != nil {+ slog.Warn("failed to get issue creator", log.BBError(err))+ return+ }+ if creatorAccount == nil {+ slog.Warn("issue creator account not found", slog.String("email", issue.CreatorEmail))+ return+ }++ webhookManager.CreateEvent(ctx, &webhook.Event{+ Type: storepb.Activity_ISSUE_APPROVED,+ Project: webhook.NewProject(project),+ IssueApproved: &webhook.EventIssueApproved{+ Approver: &webhook.User{Name: approver.Name, Email: approver.Email},+ Creator: &webhook.User{Name: creatorAccount.Name, Email: creatorAccount.Email},+ Issue: webhook.NewIssue(issue),+ },+ })+}diff --git a/backend/tests/webhook_test.go b/backend/tests/webhook_test.goindex dae24e8dcf..43b3f7ba85 100644--- a/backend/tests/webhook_test.go+++ b/backend/tests/webhook_test.go@@ -65,22 +65,40 @@ func (c *webhookCollector) reset() {}// Helper to parse Slack webhook payload.+// Extracts section block texts from attachments[0].blocks (new format).func parseSlackWebhook(body []byte) (title, description string, err error) {var payload map[string]anyif err := json.Unmarshal(body, &payload); err != nil {return "", "", err}- blocks, ok := payload["blocks"].([]any)- if !ok {+ // New format: blocks are inside attachments[0].blocks.+ var blocks []any+ if attachments, ok := payload["attachments"].([]any); ok && len(attachments) > 0 {+ if att, ok := attachments[0].(map[string]any); ok {+ if b, ok := att["blocks"].([]any); ok {+ blocks = b+ }+ }+ }+ if blocks == nil {return "", "", nil}+ // Collect section block texts. Layout for issue events:+ // [0] event title (bold, with emoji/link)+ // [1] action description (e.g. "Admin created issue X")+ // [2] issue tile (*IssueName*) — bold-wrapped+ // [3] issue description (if present)+ var sectionTexts []stringfor _, block := range blocks {blockMap, ok := block.(map[string]any)if !ok {continue}+ if blockMap["type"] != "section" {+ continue+ }textMap, ok := blockMap["text"].(map[string]any)if !ok {continue@@ -89,11 +107,25 @@ func parseSlackWebhook(body []byte) (title, description string, err error) {if !ok {continue}+ sectionTexts = append(sectionTexts, text)+ }- if strings.HasPrefix(text, "*Issue:* ") {- title = strings.TrimPrefix(text, "*Issue:* ")- } else if strings.HasPrefix(text, "*Issue Description:* ") {- description = strings.TrimPrefix(text, "*Issue Description:* ")+ // Walk sections: find bold tile (*text*) as issue title,+ // and the next plain section after the tile as issue description.+ for i, s := range sectionTexts {+ if i == 0 {+ continue // skip event title+ }+ if strings.HasPrefix(s, "*") && strings.HasSuffix(s, "*") && !strings.Contains(s, "|") {+ title = strings.Trim(s, "*")+ // Next non-bold section is the issue description.+ if i+1 < len(sectionTexts) {+ next := sectionTexts[i+1]+ if !strings.HasPrefix(next, "*") || !strings.HasSuffix(next, "*") {+ description = next+ }+ }+ break}}return title, description, nildiff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 70761a5e81..3b5ce4f26a 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -1849,6 +1849,10 @@"title": "Issue sent back","label": "When issue is sent back by an approver"},+ "issue-approved": {+ "title": "Issue approved",+ "label": "Notify when all approval steps are completed"+ },"pipeline-failed": {"title": "Pipeline failed","label": "When pipeline tasks fail"diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex c1410bcabf..0e8eb0dba2 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -1849,6 +1849,10 @@"title": "Incidencia devuelta","label": "Cuando un aprobador devuelve la incidencia"},+ "issue-approved": {+ "title": "Incidencia aprobada",+ "label": "Cuando se completan todos los pasos de aprobación"+ },"pipeline-failed": {"title": "Pipeline fallido","label": "Cuando las tareas del pipeline fallan"diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 8f30b35780..64da4eb4bd 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -1849,6 +1849,10 @@"title": "イシューが差し戻されました","label": "承認者がイシューを差し戻したとき"},+ "issue-approved": {+ "title": "イシューが承認されました",+ "label": "すべての承認ステップが完了したとき"+ },"pipeline-failed": {"title": "パイプラインが失敗しました","label": "パイプラインタスクが失敗したとき"diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex be4c71eb2f..b032f3e56d 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -1849,6 +1849,10 @@"title": "Vấn đề bị trả lại","label": "Khi người phê duyệt trả lại vấn đề"},+ "issue-approved": {+ "title": "Vấn đề đã được phê duyệt",+ "label": "Khi tất cả các bước phê duyệt hoàn tất"+ },"pipeline-failed": {"title": "Pipeline thất bại","label": "Khi các tác vụ pipeline thất bại"diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex e881195e73..0f1e8530b5 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -1849,6 +1849,10 @@"title": "工单被退回","label": "当工单被审批人退回"},+ "issue-approved": {+ "title": "工单审批通过",+ "label": "当所有审批步骤完成时通知"+ },"pipeline-failed": {"title": "流水线失败","label": "当流水线任务失败"diff --git a/frontend/src/types/proto-es/v1/project_service_pb.d.ts b/frontend/src/types/proto-es/v1/project_service_pb.d.tsindex 514cbb9488..35da0bbe23 100644--- a/frontend/src/types/proto-es/v1/project_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/project_service_pb.d.ts@@ -780,6 +780,7 @@ export declare type Webhook = Message<"bytebase.v1.Webhook"> & {* - ISSUE_CREATED* - ISSUE_APPROVAL_REQUESTED* - ISSUE_SENT_BACK+ * - ISSUE_APPROVED* - PIPELINE_FAILED* - PIPELINE_COMPLETED*@@ -855,6 +856,13 @@ export enum Activity_Type {* @generated from enum value: PIPELINE_COMPLETED = 14;*/PIPELINE_COMPLETED = 14,++ /**+ * ISSUE_APPROVED represents an issue being fully approved.+ *+ * @generated from enum value: ISSUE_APPROVED = 15;+ */+ ISSUE_APPROVED = 15,}/**diff --git a/frontend/src/types/proto-es/v1/project_service_pb.js b/frontend/src/types/proto-es/v1/project_service_pb.jsindex 406b4cb846..7d04de10f6 100644--- a/frontend/src/types/proto-es/v1/project_service_pb.js+++ b/frontend/src/types/proto-es/v1/project_service_pb.js@@ -17,7 +17,7 @@ import { file_v1_iam_policy } from "./iam_policy_pb";* Describes the file v1/project_service.proto.*/export const file_v1_project_service = /*@__PURE__*/- fileDesc("Chh2MS9wcm9qZWN0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIj8KEUdldFByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiRgoXQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QSKwoFbmFtZXMYASADKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiQgoYQmF0Y2hHZXRQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdCJ0ChNMaXN0UHJvamVjdHNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEhQKDHNob3dfZGVsZXRlZBgDIAEoCBIOCgZmaWx0ZXIYBCABKAkSEAoIb3JkZXJfYnkYBSABKAkiVwoUTGlzdFByb2plY3RzUmVzcG9uc2USJgoIcHJvamVjdHMYASADKAsyFC5ieXRlYmFzZS52MS5Qcm9qZWN0EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ2ChVTZWFyY2hQcm9qZWN0c1JlcXVlc3QSFAoMc2hvd19kZWxldGVkGAEgASgIEg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJZChZTZWFyY2hQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiVgoUQ3JlYXRlUHJvamVjdFJlcXVlc3QSKgoHcHJvamVjdBgBIAEoCzIULmJ5dGViYXNlLnYxLlByb2plY3RCA+BBAhISCgpwcm9qZWN0X2lkGAIgASgJIooBChRVcGRhdGVQcm9qZWN0UmVxdWVzdBIqCgdwcm9qZWN0GAEgASgLMhQuYnl0ZWJhc2UudjEuUHJvamVjdEID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIlEKFERlbGV0ZVByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDQoFcHVyZ2UYAiABKAgiRAoWVW5kZWxldGVQcm9qZWN0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0IlgKGkJhdGNoRGVsZXRlUHJvamVjdHNSZXF1ZXN0EisKBW5hbWVzGAEgAygJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg0KBXB1cmdlGAIgASgIIjQKBUxhYmVsEg0KBXZhbHVlGAEgASgJEg0KBWNvbG9yGAIgASgJEg0KBWdyb3VwGAMgASgJIrMGCgdQcm9qZWN0EgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgDIAEoCUIIukgFcgMYyAESJgoId2ViaG9va3MYBCADKAsyFC5ieXRlYmFzZS52MS5XZWJob29rEiUKHWRhdGFfY2xhc3NpZmljYXRpb25fY29uZmlnX2lkGAUgASgJEigKDGlzc3VlX2xhYmVscxgGIAMoCzISLmJ5dGViYXNlLnYxLkxhYmVsEhoKEmZvcmNlX2lzc3VlX2xhYmVscxgHIAEoCBIbChNlbmZvcmNlX2lzc3VlX3RpdGxlGAogASgIEiUKHXBvc3RncmVzX2RhdGFiYXNlX3RlbmFudF9tb2RlGA0gASgIEhsKE2FsbG93X3NlbGZfYXBwcm92YWwYDiABKAgSSQoWZXhlY3V0aW9uX3JldHJ5X3BvbGljeRgPIAEoCzIpLmJ5dGViYXNlLnYxLlByb2plY3QuRXhlY3V0aW9uUmV0cnlQb2xpY3kSGAoQY2lfc2FtcGxpbmdfc2l6ZRgQIAEoBRIiChpwYXJhbGxlbF90YXNrc19wZXJfcm9sbG91dBgRIAEoBRIwCgZsYWJlbHMYEiADKAsyIC5ieXRlYmFzZS52MS5Qcm9qZWN0LkxhYmVsc0VudHJ5EhoKEmVuZm9yY2Vfc3FsX3JldmlldxgTIAEoCBIeChZyZXF1aXJlX2lzc3VlX2FwcHJvdmFsGBQgASgIEiMKG3JlcXVpcmVfcGxhbl9jaGVja19ub19lcnJvchgVIAEoCBIaChJhbGxvd19yZXF1ZXN0X3JvbGUYFiABKAgSIQoZYWxsb3dfanVzdF9pbl90aW1lX2FjY2VzcxgXIAEoCBovChRFeGVjdXRpb25SZXRyeVBvbGljeRIXCg9tYXhpbXVtX3JldHJpZXMYASABKAUaLQoLTGFiZWxzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ATot6kEqChRieXRlYmFzZS5jb20vUHJvamVjdBIScHJvamVjdHMve3Byb2plY3R9Im4KEUFkZFdlYmhvb2tSZXF1ZXN0Ei0KB3Byb2plY3QYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSKgoHd2ViaG9vaxgCIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAiKKAQoUVXBkYXRlV2ViaG9va1JlcXVlc3QSKgoHd2ViaG9vaxgBIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJCChRSZW1vdmVXZWJob29rUmVxdWVzdBIqCgd3ZWJob29rGAEgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECIm8KElRlc3RXZWJob29rUmVxdWVzdBItCgdwcm9qZWN0GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EioKB3dlYmhvb2sYAiABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQIiJAoTVGVzdFdlYmhvb2tSZXNwb25zZRINCgVlcnJvchgBIAEoCSKBAgoHV2ViaG9vaxIMCgRuYW1lGAEgASgJEisKBHR5cGUYAiABKA4yGC5ieXRlYmFzZS52MS5XZWJob29rVHlwZUID4EECEhIKBXRpdGxlGAMgASgJQgPgQQISEAoDdXJsGAQgASgJQgPgQQISFgoOZGlyZWN0X21lc3NhZ2UYBiABKAgSOwoSbm90aWZpY2F0aW9uX3R5cGVzGAUgAygOMhouYnl0ZWJhc2UudjEuQWN0aXZpdHkuVHlwZUID4EEGOkDqQT0KFGJ5dGViYXNlLmNvbS9XZWJob29rEiVwcm9qZWN0cy97cHJvamVjdH0vd2ViaG9va3Mve3dlYmhvb2t9IpwBCghBY3Rpdml0eSKPAQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASEQoNSVNTVUVfQ1JFQVRFRBAKEhwKGElTU1VFX0FQUFJPVkFMX1JFUVVFU1RFRBALEhMKD0lTU1VFX1NFTlRfQkFDSxAMEhMKD1BJUEVMSU5FX0ZBSUxFRBANEhYKElBJUEVMSU5FX0NPTVBMRVRFRBAOMoISCg5Qcm9qZWN0U2VydmljZRJ/CgpHZXRQcm9qZWN0Eh4uYnl0ZWJhc2UudjEuR2V0UHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IjvaQQRuYW1liuowD2JiLnByb2plY3RzLmdldJDqMAGC0+STAhcSFS92MS97bmFtZT1wcm9qZWN0cy8qfRKVAQoQQmF0Y2hHZXRQcm9qZWN0cxIkLmJ5dGViYXNlLnYxLkJhdGNoR2V0UHJvamVjdHNSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuQmF0Y2hHZXRQcm9qZWN0c1Jlc3BvbnNlIjSK6jAPYmIucHJvamVjdHMuZ2V0kOowAYLT5JMCFxIVL3YxL3Byb2plY3RzOmJhdGNoR2V0EoQBCgxMaXN0UHJvamVjdHMSIC5ieXRlYmFzZS52MS5MaXN0UHJvamVjdHNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFByb2plY3RzUmVzcG9uc2UiL9pBAIrqMBBiYi5wcm9qZWN0cy5saXN0kOowAYLT5JMCDhIML3YxL3Byb2plY3RzEoABCg5TZWFyY2hQcm9qZWN0cxIiLmJ5dGViYXNlLnYxLlNlYXJjaFByb2plY3RzUmVxdWVzdBojLmJ5dGViYXNlLnYxLlNlYXJjaFByb2plY3RzUmVzcG9uc2UiJdpBAJDqMAKC0+STAhg6ASoiEy92MS9wcm9qZWN0czpzZWFyY2gShAEKDUNyZWF0ZVByb2plY3QSIS5ieXRlYmFzZS52MS5DcmVhdGVQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiOtpBAIrqMBJiYi5wcm9qZWN0cy5jcmVhdGWQ6jABgtPkkwIXOgdwcm9qZWN0IgwvdjEvcHJvamVjdHMSqAEKDVVwZGF0ZVByb2plY3QSIS5ieXRlYmFzZS52MS5VcGRhdGVQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiXtpBE3Byb2plY3QsdXBkYXRlX21hc2uK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCKDoHcHJvamVjdDIdL3YxL3twcm9qZWN0Lm5hbWU9cHJvamVjdHMvKn0SjgEKDURlbGV0ZVByb2plY3QSIS5ieXRlYmFzZS52MS5EZWxldGVQcm9qZWN0UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSJC2kEEbmFtZYrqMBJiYi5wcm9qZWN0cy5kZWxldGWQ6jABmOowAYLT5JMCFyoVL3YxL3tuYW1lPXByb2plY3RzLyp9EpcBCg9VbmRlbGV0ZVByb2plY3QSIy5ieXRlYmFzZS52MS5VbmRlbGV0ZVByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJJiuowFGJiLnByb2plY3RzLnVuZGVsZXRlkOowAZjqMAGC0+STAiM6ASoiHi92MS97bmFtZT1wcm9qZWN0cy8qfTp1bmRlbGV0ZRKZAQoTQmF0Y2hEZWxldGVQcm9qZWN0cxInLmJ5dGViYXNlLnYxLkJhdGNoRGVsZXRlUHJvamVjdHNSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IkGK6jASYmIucHJvamVjdHMuZGVsZXRlkOowAZjqMAGC0+STAh06ASoiGC92MS9wcm9qZWN0czpiYXRjaERlbGV0ZRKYAQoMR2V0SWFtUG9saWN5EiAuYnl0ZWJhc2UudjEuR2V0SWFtUG9saWN5UmVxdWVzdBoWLmJ5dGViYXNlLnYxLklhbVBvbGljeSJOiuowGGJiLnByb2plY3RzLmdldElhbVBvbGljeZDqMAGC0+STAigSJi92MS97cmVzb3VyY2U9cHJvamVjdHMvKn06Z2V0SWFtUG9saWN5Ep8BCgxTZXRJYW1Qb2xpY3kSIC5ieXRlYmFzZS52MS5TZXRJYW1Qb2xpY3lSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuSWFtUG9saWN5IlWK6jAYYmIucHJvamVjdHMuc2V0SWFtUG9saWN5kOowAZjqMAGC0+STAis6ASoiJi92MS97cmVzb3VyY2U9cHJvamVjdHMvKn06c2V0SWFtUG9saWN5EowBCgpBZGRXZWJob29rEh4uYnl0ZWJhc2UudjEuQWRkV2ViaG9va1JlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IkiK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCKDoBKiIjL3YxL3twcm9qZWN0PXByb2plY3RzLyp9OmFkZFdlYmhvb2sSwQEKDVVwZGF0ZVdlYmhvb2sSIS5ieXRlYmFzZS52MS5VcGRhdGVXZWJob29rUmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3Qid9pBE3dlYmhvb2ssdXBkYXRlX21hc2uK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCQToHd2ViaG9vazI2L3YxL3t3ZWJob29rLm5hbWU9cHJvamVjdHMvKi93ZWJob29rcy8qfTp1cGRhdGVXZWJob29rEqUBCg1SZW1vdmVXZWJob29rEiEuYnl0ZWJhc2UudjEuUmVtb3ZlV2ViaG9va1JlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IluK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCOzoBKiI2L3YxL3t3ZWJob29rLm5hbWU9cHJvamVjdHMvKi93ZWJob29rcy8qfTpyZW1vdmVXZWJob29rEpsBCgtUZXN0V2ViaG9vaxIfLmJ5dGViYXNlLnYxLlRlc3RXZWJob29rUmVxdWVzdBogLmJ5dGViYXNlLnYxLlRlc3RXZWJob29rUmVzcG9uc2UiSYrqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwIpOgEqIiQvdjEve3Byb2plY3Q9cHJvamVjdHMvKn06dGVzdFdlYmhvb2tCqQEKD2NvbS5ieXRlYmFzZS52MUITUHJvamVjdFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_v1_annotation, file_v1_common, file_v1_iam_policy]);+ fileDesc("Chh2MS9wcm9qZWN0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIj8KEUdldFByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiRgoXQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QSKwoFbmFtZXMYASADKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiQgoYQmF0Y2hHZXRQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdCJ0ChNMaXN0UHJvamVjdHNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEhQKDHNob3dfZGVsZXRlZBgDIAEoCBIOCgZmaWx0ZXIYBCABKAkSEAoIb3JkZXJfYnkYBSABKAkiVwoUTGlzdFByb2plY3RzUmVzcG9uc2USJgoIcHJvamVjdHMYASADKAsyFC5ieXRlYmFzZS52MS5Qcm9qZWN0EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ2ChVTZWFyY2hQcm9qZWN0c1JlcXVlc3QSFAoMc2hvd19kZWxldGVkGAEgASgIEg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJZChZTZWFyY2hQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiVgoUQ3JlYXRlUHJvamVjdFJlcXVlc3QSKgoHcHJvamVjdBgBIAEoCzIULmJ5dGViYXNlLnYxLlByb2plY3RCA+BBAhISCgpwcm9qZWN0X2lkGAIgASgJIooBChRVcGRhdGVQcm9qZWN0UmVxdWVzdBIqCgdwcm9qZWN0GAEgASgLMhQuYnl0ZWJhc2UudjEuUHJvamVjdEID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIlEKFERlbGV0ZVByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDQoFcHVyZ2UYAiABKAgiRAoWVW5kZWxldGVQcm9qZWN0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0IlgKGkJhdGNoRGVsZXRlUHJvamVjdHNSZXF1ZXN0EisKBW5hbWVzGAEgAygJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg0KBXB1cmdlGAIgASgIIjQKBUxhYmVsEg0KBXZhbHVlGAEgASgJEg0KBWNvbG9yGAIgASgJEg0KBWdyb3VwGAMgASgJIrMGCgdQcm9qZWN0EgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgDIAEoCUIIukgFcgMYyAESJgoId2ViaG9va3MYBCADKAsyFC5ieXRlYmFzZS52MS5XZWJob29rEiUKHWRhdGFfY2xhc3NpZmljYXRpb25fY29uZmlnX2lkGAUgASgJEigKDGlzc3VlX2xhYmVscxgGIAMoCzISLmJ5dGViYXNlLnYxLkxhYmVsEhoKEmZvcmNlX2lzc3VlX2xhYmVscxgHIAEoCBIbChNlbmZvcmNlX2lzc3VlX3RpdGxlGAogASgIEiUKHXBvc3RncmVzX2RhdGFiYXNlX3RlbmFudF9tb2RlGA0gASgIEhsKE2FsbG93X3NlbGZfYXBwcm92YWwYDiABKAgSSQoWZXhlY3V0aW9uX3JldHJ5X3BvbGljeRgPIAEoCzIpLmJ5dGViYXNlLnYxLlByb2plY3QuRXhlY3V0aW9uUmV0cnlQb2xpY3kSGAoQY2lfc2FtcGxpbmdfc2l6ZRgQIAEoBRIiChpwYXJhbGxlbF90YXNrc19wZXJfcm9sbG91dBgRIAEoBRIwCgZsYWJlbHMYEiADKAsyIC5ieXRlYmFzZS52MS5Qcm9qZWN0LkxhYmVsc0VudHJ5EhoKEmVuZm9yY2Vfc3FsX3JldmlldxgTIAEoCBIeChZyZXF1aXJlX2lzc3VlX2FwcHJvdmFsGBQgASgIEiMKG3JlcXVpcmVfcGxhbl9jaGVja19ub19lcnJvchgVIAEoCBIaChJhbGxvd19yZXF1ZXN0X3JvbGUYFiABKAgSIQoZYWxsb3dfanVzdF9pbl90aW1lX2FjY2VzcxgXIAEoCBovChRFeGVjdXRpb25SZXRyeVBvbGljeRIXCg9tYXhpbXVtX3JldHJpZXMYASABKAUaLQoLTGFiZWxzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ATot6kEqChRieXRlYmFzZS5jb20vUHJvamVjdBIScHJvamVjdHMve3Byb2plY3R9Im4KEUFkZFdlYmhvb2tSZXF1ZXN0Ei0KB3Byb2plY3QYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSKgoHd2ViaG9vaxgCIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAiKKAQoUVXBkYXRlV2ViaG9va1JlcXVlc3QSKgoHd2ViaG9vaxgBIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJCChRSZW1vdmVXZWJob29rUmVxdWVzdBIqCgd3ZWJob29rGAEgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECIm8KElRlc3RXZWJob29rUmVxdWVzdBItCgdwcm9qZWN0GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EioKB3dlYmhvb2sYAiABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQIiJAoTVGVzdFdlYmhvb2tSZXNwb25zZRINCgVlcnJvchgBIAEoCSKBAgoHV2ViaG9vaxIMCgRuYW1lGAEgASgJEisKBHR5cGUYAiABKA4yGC5ieXRlYmFzZS52MS5XZWJob29rVHlwZUID4EECEhIKBXRpdGxlGAMgASgJQgPgQQISEAoDdXJsGAQgASgJQgPgQQISFgoOZGlyZWN0X21lc3NhZ2UYBiABKAgSOwoSbm90aWZpY2F0aW9uX3R5cGVzGAUgAygOMhouYnl0ZWJhc2UudjEuQWN0aXZpdHkuVHlwZUID4EEGOkDqQT0KFGJ5dGViYXNlLmNvbS9XZWJob29rEiVwcm9qZWN0cy97cHJvamVjdH0vd2ViaG9va3Mve3dlYmhvb2t9IrABCghBY3Rpdml0eSKjAQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASEQoNSVNTVUVfQ1JFQVRFRBAKEhwKGElTU1VFX0FQUFJPVkFMX1JFUVVFU1RFRBALEhMKD0lTU1VFX1NFTlRfQkFDSxAMEhMKD1BJUEVMSU5FX0ZBSUxFRBANEhYKElBJUEVMSU5FX0NPTVBMRVRFRBAOEhIKDklTU1VFX0FQUFJPVkVEEA8yghIKDlByb2plY3RTZXJ2aWNlEn8KCkdldFByb2plY3QSHi5ieXRlYmFzZS52MS5HZXRQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiO9pBBG5hbWWK6jAPYmIucHJvamVjdHMuZ2V0kOowAYLT5JMCFxIVL3YxL3tuYW1lPXByb2plY3RzLyp9EpUBChBCYXRjaEdldFByb2plY3RzEiQuYnl0ZWJhc2UudjEuQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QaJS5ieXRlYmFzZS52MS5CYXRjaEdldFByb2plY3RzUmVzcG9uc2UiNIrqMA9iYi5wcm9qZWN0cy5nZXSQ6jABgtPkkwIXEhUvdjEvcHJvamVjdHM6YmF0Y2hHZXQShAEKDExpc3RQcm9qZWN0cxIgLmJ5dGViYXNlLnYxLkxpc3RQcm9qZWN0c1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0UHJvamVjdHNSZXNwb25zZSIv2kEAiuowEGJiLnByb2plY3RzLmxpc3SQ6jABgtPkkwIOEgwvdjEvcHJvamVjdHMSgAEKDlNlYXJjaFByb2plY3RzEiIuYnl0ZWJhc2UudjEuU2VhcmNoUHJvamVjdHNSZXF1ZXN0GiMuYnl0ZWJhc2UudjEuU2VhcmNoUHJvamVjdHNSZXNwb25zZSIl2kEAkOowAoLT5JMCGDoBKiITL3YxL3Byb2plY3RzOnNlYXJjaBKEAQoNQ3JlYXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLkNyZWF0ZVByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCI62kEAiuowEmJiLnByb2plY3RzLmNyZWF0ZZDqMAGC0+STAhc6B3Byb2plY3QiDC92MS9wcm9qZWN0cxKoAQoNVXBkYXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLlVwZGF0ZVByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJe2kETcHJvamVjdCx1cGRhdGVfbWFza4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwIoOgdwcm9qZWN0Mh0vdjEve3Byb2plY3QubmFtZT1wcm9qZWN0cy8qfRKOAQoNRGVsZXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLkRlbGV0ZVByb2plY3RSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IkLaQQRuYW1liuowEmJiLnByb2plY3RzLmRlbGV0ZZDqMAGY6jABgtPkkwIXKhUvdjEve25hbWU9cHJvamVjdHMvKn0SlwEKD1VuZGVsZXRlUHJvamVjdBIjLmJ5dGViYXNlLnYxLlVuZGVsZXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IkmK6jAUYmIucHJvamVjdHMudW5kZWxldGWQ6jABmOowAYLT5JMCIzoBKiIeL3YxL3tuYW1lPXByb2plY3RzLyp9OnVuZGVsZXRlEpkBChNCYXRjaERlbGV0ZVByb2plY3RzEicuYnl0ZWJhc2UudjEuQmF0Y2hEZWxldGVQcm9qZWN0c1JlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiQYrqMBJiYi5wcm9qZWN0cy5kZWxldGWQ6jABmOowAYLT5JMCHToBKiIYL3YxL3Byb2plY3RzOmJhdGNoRGVsZXRlEpgBCgxHZXRJYW1Qb2xpY3kSIC5ieXRlYmFzZS52MS5HZXRJYW1Qb2xpY3lSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuSWFtUG9saWN5Ik6K6jAYYmIucHJvamVjdHMuZ2V0SWFtUG9saWN5kOowAYLT5JMCKBImL3YxL3tyZXNvdXJjZT1wcm9qZWN0cy8qfTpnZXRJYW1Qb2xpY3kSnwEKDFNldElhbVBvbGljeRIgLmJ5dGViYXNlLnYxLlNldElhbVBvbGljeVJlcXVlc3QaFi5ieXRlYmFzZS52MS5JYW1Qb2xpY3kiVYrqMBhiYi5wcm9qZWN0cy5zZXRJYW1Qb2xpY3mQ6jABmOowAYLT5JMCKzoBKiImL3YxL3tyZXNvdXJjZT1wcm9qZWN0cy8qfTpzZXRJYW1Qb2xpY3kSjAEKCkFkZFdlYmhvb2sSHi5ieXRlYmFzZS52MS5BZGRXZWJob29rUmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiSIrqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwIoOgEqIiMvdjEve3Byb2plY3Q9cHJvamVjdHMvKn06YWRkV2ViaG9vaxLBAQoNVXBkYXRlV2ViaG9vaxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVdlYmhvb2tSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJ32kETd2ViaG9vayx1cGRhdGVfbWFza4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwJBOgd3ZWJob29rMjYvdjEve3dlYmhvb2submFtZT1wcm9qZWN0cy8qL3dlYmhvb2tzLyp9OnVwZGF0ZVdlYmhvb2sSpQEKDVJlbW92ZVdlYmhvb2sSIS5ieXRlYmFzZS52MS5SZW1vdmVXZWJob29rUmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiW4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwI7OgEqIjYvdjEve3dlYmhvb2submFtZT1wcm9qZWN0cy8qL3dlYmhvb2tzLyp9OnJlbW92ZVdlYmhvb2sSmwEKC1Rlc3RXZWJob29rEh8uYnl0ZWJhc2UudjEuVGVzdFdlYmhvb2tSZXF1ZXN0GiAuYnl0ZWJhc2UudjEuVGVzdFdlYmhvb2tSZXNwb25zZSJJiuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAik6ASoiJC92MS97cHJvamVjdD1wcm9qZWN0cy8qfTp0ZXN0V2ViaG9va0KpAQoPY29tLmJ5dGViYXNlLnYxQhNQcm9qZWN0U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_v1_annotation, file_v1_common, file_v1_iam_policy]);/*** Describes the message bytebase.v1.GetProjectRequest.diff --git a/frontend/src/types/v1/projectWebhook.ts b/frontend/src/types/v1/projectWebhook.tsindex 752fb95104..193b0c1c84 100644--- a/frontend/src/types/v1/projectWebhook.ts+++ b/frontend/src/types/v1/projectWebhook.ts@@ -117,6 +117,12 @@ export const projectWebhookV1ActivityItemList =activity: Activity_Type.ISSUE_SENT_BACK,supportDirectMessage: true,},+ {+ title: t("project.webhook.activity-item.issue-approved.title"),+ label: t("project.webhook.activity-item.issue-approved.label"),+ activity: Activity_Type.ISSUE_APPROVED,+ supportDirectMessage: true,+ },{title: t("project.webhook.activity-item.pipeline-failed.title"),label: t("project.webhook.activity-item.pipeline-failed.label"),diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex b081953a06..9b7ec93a42 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -16467,6 +16467,7 @@ components:- ISSUE_SENT_BACK- PIPELINE_FAILED- PIPELINE_COMPLETED+ - ISSUE_APPROVEDdescription: Activity type enumeration.bytebase.v1.ActuatorInfo:type: object@@ -28686,6 +28687,7 @@ components:- ISSUE_CREATED- ISSUE_APPROVAL_REQUESTED- ISSUE_SENT_BACK+ - ISSUE_APPROVED- PIPELINE_FAILED- PIPELINE_COMPLETEDtitle: Webhookdiff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex 93ea154a18..4292fa41b1 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -3528,6 +3528,7 @@ Activity type enumeration.| ISSUE_SENT_BACK | 12 | ISSUE_SENT_BACK represents an issue being sent back by an approver. || PIPELINE_FAILED | 13 | PIPELINE_FAILED represents a pipeline failure event. || PIPELINE_COMPLETED | 14 | PIPELINE_COMPLETED represents a pipeline completion event. |+| ISSUE_APPROVED | 15 | ISSUE_APPROVED represents an issue being fully approved. |diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex 2582353d15..66e5878f71 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -9950,6 +9950,12 @@ IM integration setting should be set for this function to work. </p></td><td><p>PIPELINE_COMPLETED represents a pipeline completion event.</p></td></tr>+ <tr>+ <td>ISSUE_APPROVED</td>+ <td>15</td>+ <td><p>ISSUE_APPROVED represents an issue being fully approved.</p></td>+ </tr>+</tbody></table>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 04a84a39a3..223beadd6a 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -8575,7 +8575,7 @@ The project's `name` field is used to identify the project to update. Format| title | [string](#string) | | title is the title of the webhook. || url | [string](#string) | | url is the url of the webhook, should be unique within the project. || direct_message | [bool](#bool) | | if direct_message is set, the notification is sent directly to the persons and url will be ignored. IM integration setting should be set for this function to work. |-| notification_types | [Activity.Type](#bytebase-v1-Activity-Type) | repeated | notification_types is the list of activities types that the webhook is interested in. Bytebase will only send notifications to the webhook if the activity type is in the list. It should not be empty, and should be a subset of the following: - ISSUE_CREATED - ISSUE_APPROVAL_REQUESTED - ISSUE_SENT_BACK - PIPELINE_FAILED - PIPELINE_COMPLETED |+| notification_types | [Activity.Type](#bytebase-v1-Activity-Type) | repeated | notification_types is the list of activities types that the webhook is interested in. Bytebase will only send notifications to the webhook if the activity type is in the list. It should not be empty, and should be a subset of the following: - ISSUE_CREATED - ISSUE_APPROVAL_REQUESTED - ISSUE_SENT_BACK - ISSUE_APPROVED - PIPELINE_FAILED - PIPELINE_COMPLETED |@@ -8597,6 +8597,7 @@ Activity type enumeration.| ISSUE_SENT_BACK | 12 | ISSUE_SENT_BACK represents an issue being sent back by an approver. || PIPELINE_FAILED | 13 | PIPELINE_FAILED represents a pipeline failure event. || PIPELINE_COMPLETED | 14 | PIPELINE_COMPLETED represents a pipeline completion event. |+| ISSUE_APPROVED | 15 | ISSUE_APPROVED represents an issue being fully approved. |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 1c7809c17e..48f0b80d5e 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -24182,6 +24182,7 @@ It should not be empty, and should be a subset of the following:- ISSUE_CREATED- ISSUE_APPROVAL_REQUESTED- ISSUE_SENT_BACK+- ISSUE_APPROVED- PIPELINE_FAILED- PIPELINE_COMPLETED </p></td></tr>@@ -24239,6 +24240,12 @@ It should not be empty, and should be a subset of the following:<td><p>PIPELINE_COMPLETED represents a pipeline completion event.</p></td></tr>+ <tr>+ <td>ISSUE_APPROVED</td>+ <td>15</td>+ <td><p>ISSUE_APPROVED represents an issue being fully approved.</p></td>+ </tr>+</tbody></table>diff --git a/proto/store/store/project_webhook.proto b/proto/store/store/project_webhook.protoindex e6b109dfe9..06341befbd 100644--- a/proto/store/store/project_webhook.proto+++ b/proto/store/store/project_webhook.proto@@ -22,6 +22,8 @@ message Activity {PIPELINE_FAILED = 13;// PIPELINE_COMPLETED represents a pipeline completion event.PIPELINE_COMPLETED = 14;+ // ISSUE_APPROVED represents an issue being fully approved.+ ISSUE_APPROVED = 15;}}diff --git a/proto/v1/v1/project_service.proto b/proto/v1/v1/project_service.protoindex 6ab9a1cde5..f10e975727 100644--- a/proto/v1/v1/project_service.proto+++ b/proto/v1/v1/project_service.proto@@ -535,6 +535,7 @@ message Webhook {// - ISSUE_CREATED// - ISSUE_APPROVAL_REQUESTED// - ISSUE_SENT_BACK+ // - ISSUE_APPROVED// - PIPELINE_FAILED// - PIPELINE_COMPLETEDrepeated Activity.Type notification_types = 5 [(google.api.field_behavior) = UNORDERED_LIST];@@ -556,5 +557,7 @@ message Activity {PIPELINE_FAILED = 13;// PIPELINE_COMPLETED represents a pipeline completion event.PIPELINE_COMPLETED = 14;+ // ISSUE_APPROVED represents an issue being fully approved.+ ISSUE_APPROVED = 15;}}