Skip to content

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

feat(project): migrate rollout policy checkers to project settings (#18450)

Danny Xufad5293a2db4
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 1457985ac3..fb0ca1668f 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -13796,6 +13796,14 @@ components:
description: |-
Whether to enforce SQL review checks to pass before issue creation.
If enabled, issues cannot be created when SQL review finds errors.
+ requireIssueApproval:
+ type: boolean
+ title: require_issue_approval
+ description: Whether to require issue approval before rollout.
+ requirePlanCheckNoError:
+ type: boolean
+ title: require_plan_check_no_error
+ description: Whether to require plan check to have no error before rollout.
title: Project
additionalProperties: false
bytebase.v1.Project.ExecutionRetryPolicy:
diff --git a/backend/api/v1/org_policy_service_converter.go b/backend/api/v1/org_policy_service_converter.go
index 192ff3a93b..2501178789 100644
--- a/backend/api/v1/org_policy_service_converter.go
+++ b/backend/api/v1/org_policy_service_converter.go
@@ -198,7 +198,6 @@ func convertToStorePBRolloutPolicy(policy *v1pb.RolloutPolicy) *storepb.RolloutP
return &storepb.RolloutPolicy{
Automatic: policy.Automatic,
Roles: policy.Roles,
- Checkers: convertToStorePBCheckers(policy.Checkers),
}
}
@@ -206,40 +205,9 @@ func convertToV1PBRolloutPolicy(policy *storepb.RolloutPolicy) *v1pb.RolloutPoli
return &v1pb.RolloutPolicy{
Automatic: policy.Automatic,
Roles: policy.Roles,
- Checkers: convertToV1PBCheckers(policy.Checkers),
}
}
-func convertToV1PBCheckers(checkers *storepb.RolloutPolicy_Checkers) *v1pb.RolloutPolicy_Checkers {
- if checkers == nil {
- return nil
- }
- result := &v1pb.RolloutPolicy_Checkers{
- RequiredIssueApproval: checkers.RequiredIssueApproval,
- }
- if checkers.RequiredStatusChecks != nil {
- result.RequiredStatusChecks = &v1pb.RolloutPolicy_Checkers_RequiredStatusChecks{
- PlanCheckEnforcement: v1pb.RolloutPolicy_Checkers_PlanCheckEnforcement(checkers.RequiredStatusChecks.PlanCheckEnforcement),
- }
- }
- return result
-}
-
-func convertToStorePBCheckers(checkers *v1pb.RolloutPolicy_Checkers) *storepb.RolloutPolicy_Checkers {
- if checkers == nil {
- return nil
- }
- result := &storepb.RolloutPolicy_Checkers{
- RequiredIssueApproval: checkers.RequiredIssueApproval,
- }
- if checkers.RequiredStatusChecks != nil {
- result.RequiredStatusChecks = &storepb.RolloutPolicy_Checkers_RequiredStatusChecks{
- PlanCheckEnforcement: storepb.RolloutPolicy_Checkers_PlanCheckEnforcement(checkers.RequiredStatusChecks.PlanCheckEnforcement),
- }
- }
- return result
-}
-
func convertToV1PBQueryDataPolicy(payloadStr string) (*v1pb.Policy_QueryDataPolicy, error) {
payload := &storepb.QueryDataPolicy{}
if err := common.ProtojsonUnmarshaler.Unmarshal([]byte(payloadStr), payload); err != nil {
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index e649a8fc04..ec1e39eb06 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -328,6 +328,14 @@ func (s *ProjectService) UpdateProject(ctx context.Context, req *connect.Request
projectSettings := project.Setting
projectSettings.ParallelTasksPerRollout = req.Msg.Project.ParallelTasksPerRollout
patch.Setting = projectSettings
+ case "require_issue_approval":
+ projectSettings := project.Setting
+ projectSettings.RequireIssueApproval = req.Msg.Project.RequireIssueApproval
+ patch.Setting = projectSettings
+ case "require_plan_check_no_error":
+ projectSettings := project.Setting
+ projectSettings.RequirePlanCheckNoError = req.Msg.Project.RequirePlanCheckNoError
+ patch.Setting = projectSettings
case "labels":
if err := validateLabels(req.Msg.Project.Labels); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
diff --git a/backend/api/v1/project_service_converter.go b/backend/api/v1/project_service_converter.go
index ae9ab7d379..89ff7278e6 100644
--- a/backend/api/v1/project_service_converter.go
+++ b/backend/api/v1/project_service_converter.go
@@ -324,6 +324,8 @@ func convertToProject(projectMessage *store.ProjectMessage) *v1pb.Project {
CiSamplingSize: projectMessage.Setting.CiSamplingSize,
ParallelTasksPerRollout: projectMessage.Setting.ParallelTasksPerRollout,
Labels: projectMessage.Setting.Labels,
+ RequireIssueApproval: projectMessage.Setting.RequireIssueApproval,
+ RequirePlanCheckNoError: projectMessage.Setting.RequirePlanCheckNoError,
}
}
@@ -362,6 +364,8 @@ func convertToProjectMessage(resourceID string, project *v1pb.Project) *store.Pr
ParallelTasksPerRollout: project.ParallelTasksPerRollout,
Labels: project.Labels,
EnforceSqlReview: project.EnforceSqlReview,
+ RequireIssueApproval: project.RequireIssueApproval,
+ RequirePlanCheckNoError: project.RequirePlanCheckNoError,
}
return &store.ProjectMessage{
ResourceID: resourceID,
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index 269b5a3f86..be7f8879b2 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -596,14 +596,8 @@ func (s *RolloutService) BatchRunTasks(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodePermissionDenied, errors.New("Not allowed to run tasks"))
}
- // Get rollout policy to check rollout requirements
- rolloutPolicy, err := GetValidRolloutPolicyForEnvironment(ctx, s.store, environmentToRun)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get rollout policy, error: %v", err))
- }
-
- // Check if issue approval is required according to the rollout policy checkers
- if rolloutPolicy.GetCheckers().GetRequiredIssueApproval() && issueN != nil {
+ // Check if issue approval is required according to the project settings
+ if project.Setting.RequireIssueApproval && issueN != nil {
approved, err := utils.CheckIssueApproved(issueN)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check if the issue is approved, error: %v", err))
diff --git a/backend/generated-go/store/advice.pb.go b/backend/generated-go/store/advice.pb.go
index 520aa958da..bee19accd8 100644
--- a/backend/generated-go/store/advice.pb.go
+++ b/backend/generated-go/store/advice.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/advice.proto
diff --git a/backend/generated-go/store/approval.pb.go b/backend/generated-go/store/approval.pb.go
index 334f26f5f8..72617e960e 100644
--- a/backend/generated-go/store/approval.pb.go
+++ b/backend/generated-go/store/approval.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/approval.proto
diff --git a/backend/generated-go/store/audit_log.pb.go b/backend/generated-go/store/audit_log.pb.go
index 2b392d216b..652629e112 100644
--- a/backend/generated-go/store/audit_log.pb.go
+++ b/backend/generated-go/store/audit_log.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/audit_log.proto
diff --git a/backend/generated-go/store/changelog.pb.go b/backend/generated-go/store/changelog.pb.go
index 4cf128cce5..5b39052f3a 100644
--- a/backend/generated-go/store/changelog.pb.go
+++ b/backend/generated-go/store/changelog.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/changelog.proto
diff --git a/backend/generated-go/store/common.pb.go b/backend/generated-go/store/common.pb.go
index c95d164c74..af24c754b5 100644
--- a/backend/generated-go/store/common.pb.go
+++ b/backend/generated-go/store/common.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/common.proto
diff --git a/backend/generated-go/store/database.pb.go b/backend/generated-go/store/database.pb.go
index a829a9f803..27e0a5abe9 100644
--- a/backend/generated-go/store/database.pb.go
+++ b/backend/generated-go/store/database.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/database.proto
diff --git a/backend/generated-go/store/export_archive.pb.go b/backend/generated-go/store/export_archive.pb.go
index fafe7acbd4..d1c00ccc01 100644
--- a/backend/generated-go/store/export_archive.pb.go
+++ b/backend/generated-go/store/export_archive.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/export_archive.proto
diff --git a/backend/generated-go/store/group.pb.go b/backend/generated-go/store/group.pb.go
index bad0143a32..af391e0606 100644
--- a/backend/generated-go/store/group.pb.go
+++ b/backend/generated-go/store/group.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/group.proto
diff --git a/backend/generated-go/store/idp.pb.go b/backend/generated-go/store/idp.pb.go
index 542970f89a..f1e840377c 100644
--- a/backend/generated-go/store/idp.pb.go
+++ b/backend/generated-go/store/idp.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/idp.proto
diff --git a/backend/generated-go/store/instance.pb.go b/backend/generated-go/store/instance.pb.go
index b973bfe00c..102a80c2d2 100644
--- a/backend/generated-go/store/instance.pb.go
+++ b/backend/generated-go/store/instance.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/instance.proto
diff --git a/backend/generated-go/store/instance_change_history.pb.go b/backend/generated-go/store/instance_change_history.pb.go
index e39519f976..ce9861a394 100644
--- a/backend/generated-go/store/instance_change_history.pb.go
+++ b/backend/generated-go/store/instance_change_history.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/instance_change_history.proto
diff --git a/backend/generated-go/store/issue.pb.go b/backend/generated-go/store/issue.pb.go
index 9e34f61369..a2d527311c 100644
--- a/backend/generated-go/store/issue.pb.go
+++ b/backend/generated-go/store/issue.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/issue.proto
diff --git a/backend/generated-go/store/issue_comment.pb.go b/backend/generated-go/store/issue_comment.pb.go
index 25ac138468..b771bfe75f 100644
--- a/backend/generated-go/store/issue_comment.pb.go
+++ b/backend/generated-go/store/issue_comment.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/issue_comment.proto
diff --git a/backend/generated-go/store/oauth2.pb.go b/backend/generated-go/store/oauth2.pb.go
index 4740968fb7..569e3d763f 100644
--- a/backend/generated-go/store/oauth2.pb.go
+++ b/backend/generated-go/store/oauth2.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/oauth2.proto
diff --git a/backend/generated-go/store/plan.pb.go b/backend/generated-go/store/plan.pb.go
index cf7c6d9f11..789cf72bb8 100644
--- a/backend/generated-go/store/plan.pb.go
+++ b/backend/generated-go/store/plan.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/plan.proto
diff --git a/backend/generated-go/store/plan_check_run.pb.go b/backend/generated-go/store/plan_check_run.pb.go
index a6187fd6d8..f1943ef7dc 100644
--- a/backend/generated-go/store/plan_check_run.pb.go
+++ b/backend/generated-go/store/plan_check_run.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/plan_check_run.proto
diff --git a/backend/generated-go/store/policy.pb.go b/backend/generated-go/store/policy.pb.go
index df8cf305df..ac75c55e44 100644
--- a/backend/generated-go/store/policy.pb.go
+++ b/backend/generated-go/store/policy.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/policy.proto
@@ -139,58 +139,6 @@ func (Policy_Resource) EnumDescriptor() ([]byte, []int) {
return file_store_policy_proto_rawDescGZIP(), []int{0, 1}
}
-type RolloutPolicy_Checkers_PlanCheckEnforcement int32
-
-const (
- // Allow rollout regardless of plan check results (no enforcement).
- RolloutPolicy_Checkers_PLAN_CHECK_ENFORCEMENT_UNSPECIFIED RolloutPolicy_Checkers_PlanCheckEnforcement = 0
- // Block rollout only when plan check finds errors.
- RolloutPolicy_Checkers_ERROR_ONLY RolloutPolicy_Checkers_PlanCheckEnforcement = 1
- // Block rollout when plan check finds errors or warnings.
- RolloutPolicy_Checkers_STRICT RolloutPolicy_Checkers_PlanCheckEnforcement = 2
-)
-
-// Enum value maps for RolloutPolicy_Checkers_PlanCheckEnforcement.
-var (
- RolloutPolicy_Checkers_PlanCheckEnforcement_name = map[int32]string{
- 0: "PLAN_CHECK_ENFORCEMENT_UNSPECIFIED",
- 1: "ERROR_ONLY",
- 2: "STRICT",
- }
- RolloutPolicy_Checkers_PlanCheckEnforcement_value = map[string]int32{
- "PLAN_CHECK_ENFORCEMENT_UNSPECIFIED": 0,
- "ERROR_ONLY": 1,
- "STRICT": 2,
- }
-)
-
-func (x RolloutPolicy_Checkers_PlanCheckEnforcement) Enum() *RolloutPolicy_Checkers_PlanCheckEnforcement {
- p := new(RolloutPolicy_Checkers_PlanCheckEnforcement)
- *p = x
- return p
-}
-
-func (x RolloutPolicy_Checkers_PlanCheckEnforcement) String() string {
- return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (RolloutPolicy_Checkers_PlanCheckEnforcement) Descriptor() protoreflect.EnumDescriptor {
- return file_store_policy_proto_enumTypes[2].Descriptor()
-}
-
-func (RolloutPolicy_Checkers_PlanCheckEnforcement) Type() protoreflect.EnumType {
- return &file_store_policy_proto_enumTypes[2]
-}
-
-func (x RolloutPolicy_Checkers_PlanCheckEnforcement) Number() protoreflect.EnumNumber {
- return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use RolloutPolicy_Checkers_PlanCheckEnforcement.Descriptor instead.
-func (RolloutPolicy_Checkers_PlanCheckEnforcement) EnumDescriptor() ([]byte, []int) {
- return file_store_policy_proto_rawDescGZIP(), []int{1, 0, 0}
-}
-
type MaskingExceptionPolicy_MaskingException_Action int32
const (
@@ -224,11 +172,11 @@ func (x MaskingExceptionPolicy_MaskingException_Action) String() string {
}
func (MaskingExceptionPolicy_MaskingException_Action) Descriptor() protoreflect.EnumDescriptor {
- return file_store_policy_proto_enumTypes[3].Descriptor()
+ return file_store_policy_proto_enumTypes[2].Descriptor()
}
func (MaskingExceptionPolicy_MaskingException_Action) Type() protoreflect.EnumType {
- return &file_store_policy_proto_enumTypes[3]
+ return &file_store_policy_proto_enumTypes[2]
}
func (x MaskingExceptionPolicy_MaskingException_Action) Number() protoreflect.EnumNumber {
@@ -273,11 +221,11 @@ func (x EnvironmentTierPolicy_EnvironmentTier) String() string {
}
func (EnvironmentTierPolicy_EnvironmentTier) Descriptor() protoreflect.EnumDescriptor {
- return file_store_policy_proto_enumTypes[4].Descriptor()
+ return file_store_policy_proto_enumTypes[3].Descriptor()
}
func (EnvironmentTierPolicy_EnvironmentTier) Type() protoreflect.EnumType {
- return &file_store_policy_proto_enumTypes[4]
+ return &file_store_policy_proto_enumTypes[3]
}
func (x EnvironmentTierPolicy_EnvironmentTier) Number() protoreflect.EnumNumber {
@@ -324,11 +272,11 @@ func (x DataSourceQueryPolicy_Restriction) String() string {
}
func (DataSourceQueryPolicy_Restriction) Descriptor() protoreflect.EnumDescriptor {
- return file_store_policy_proto_enumTypes[5].Descriptor()
+ return file_store_policy_proto_enumTypes[4].Descriptor()
}
func (DataSourceQueryPolicy_Restriction) Type() protoreflect.EnumType {
- return &file_store_policy_proto_enumTypes[5]
+ return &file_store_policy_proto_enumTypes[4]
}
func (x DataSourceQueryPolicy_Restriction) Number() protoreflect.EnumNumber {
@@ -377,12 +325,9 @@ func (*Policy) Descriptor() ([]byte, []int) {
}
type RolloutPolicy struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Automatic bool `protobuf:"varint,1,opt,name=automatic,proto3" json:"automatic,omitempty"`
- Roles []string `protobuf:"bytes,2,rep,name=roles,proto3" json:"roles,omitempty"`
- // Checkers that must pass before rollout execution.
- // These checks are performed in UI workflows only.
- Checkers *RolloutPolicy_Checkers `protobuf:"bytes,4,opt,name=checkers,proto3" json:"checkers,omitempty"`
+ state protoimpl.MessageState `protogen:"open.v1"`
+ Automatic bool `protobuf:"varint,1,opt,name=automatic,proto3" json:"automatic,omitempty"`
+ Roles []string `protobuf:"bytes,2,rep,name=roles,proto3" json:"roles,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -431,13 +376,6 @@ func (x *RolloutPolicy) GetRoles() []string {
return nil
}
-func (x *RolloutPolicy) GetCheckers() *RolloutPolicy_Checkers {
- if x != nil {
- return x.Checkers
- }
- return nil
-}
-
// MaskingExceptionPolicy is the allowlist of users who can access sensitive data.
type MaskingExceptionPolicy struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -887,105 +825,6 @@ func (x *DataSourceQueryPolicy) GetDisallowDml() bool {
return false
}
-type RolloutPolicy_Checkers struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // Whether issue approval is required before proceeding with rollout.
- RequiredIssueApproval bool `protobuf:"varint,1,opt,name=required_issue_approval,json=requiredIssueApproval,proto3" json:"required_issue_approval,omitempty"`
- // Status checks that must pass before rollout can be executed.
- RequiredStatusChecks *RolloutPolicy_Checkers_RequiredStatusChecks `protobuf:"bytes,2,opt,name=required_status_checks,json=requiredStatusChecks,proto3" json:"required_status_checks,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *RolloutPolicy_Checkers) Reset() {
- *x = RolloutPolicy_Checkers{}
- mi := &file_store_policy_proto_msgTypes[10]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *RolloutPolicy_Checkers) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RolloutPolicy_Checkers) ProtoMessage() {}
-
-func (x *RolloutPolicy_Checkers) ProtoReflect() protoreflect.Message {
- mi := &file_store_policy_proto_msgTypes[10]
- if x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use RolloutPolicy_Checkers.ProtoReflect.Descriptor instead.
-func (*RolloutPolicy_Checkers) Descriptor() ([]byte, []int) {
- return file_store_policy_proto_rawDescGZIP(), []int{1, 0}
-}
-
-func (x *RolloutPolicy_Checkers) GetRequiredIssueApproval() bool {
- if x != nil {
- return x.RequiredIssueApproval
- }
- return false
-}
-
-func (x *RolloutPolicy_Checkers) GetRequiredStatusChecks() *RolloutPolicy_Checkers_RequiredStatusChecks {
- if x != nil {
- return x.RequiredStatusChecks
- }
- return nil
-}
-
-type RolloutPolicy_Checkers_RequiredStatusChecks struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // Enforcement level for plan check results during rollout validation.
- PlanCheckEnforcement RolloutPolicy_Checkers_PlanCheckEnforcement `protobuf:"varint,1,opt,name=plan_check_enforcement,json=planCheckEnforcement,proto3,enum=bytebase.store.RolloutPolicy_Checkers_PlanCheckEnforcement" json:"plan_check_enforcement,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *RolloutPolicy_Checkers_RequiredStatusChecks) Reset() {
- *x = RolloutPolicy_Checkers_RequiredStatusChecks{}
- mi := &file_store_policy_proto_msgTypes[11]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *RolloutPolicy_Checkers_RequiredStatusChecks) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RolloutPolicy_Checkers_RequiredStatusChecks) ProtoMessage() {}
-
-func (x *RolloutPolicy_Checkers_RequiredStatusChecks) ProtoReflect() protoreflect.Message {
- mi := &file_store_policy_proto_msgTypes[11]
- if x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use RolloutPolicy_Checkers_RequiredStatusChecks.ProtoReflect.Descriptor instead.
-func (*RolloutPolicy_Checkers_RequiredStatusChecks) Descriptor() ([]byte, []int) {
- return file_store_policy_proto_rawDescGZIP(), []int{1, 0, 0}
-}
-
-func (x *RolloutPolicy_Checkers_RequiredStatusChecks) GetPlanCheckEnforcement() RolloutPolicy_Checkers_PlanCheckEnforcement {
- if x != nil {
- return x.PlanCheckEnforcement
- }
- return RolloutPolicy_Checkers_PLAN_CHECK_ENFORCEMENT_UNSPECIFIED
-}
-
type MaskingExceptionPolicy_MaskingException struct {
state protoimpl.MessageState `protogen:"open.v1"`
// action is the action by which the user can access sensitive data.
@@ -1002,7 +841,7 @@ type MaskingExceptionPolicy_MaskingException struct {
func (x *MaskingExceptionPolicy_MaskingException) Reset() {
*x = MaskingExceptionPolicy_MaskingException{}
- mi := &file_store_policy_proto_msgTypes[12]
+ mi := &file_store_policy_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1014,7 +853,7 @@ func (x *MaskingExceptionPolicy_MaskingException) String() string {
func (*MaskingExceptionPolicy_MaskingException) ProtoMessage() {}
func (x *MaskingExceptionPolicy_MaskingException) ProtoReflect() protoreflect.Message {
- mi := &file_store_policy_proto_msgTypes[12]
+ mi := &file_store_policy_proto_msgTypes[10]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1063,7 +902,7 @@ type MaskingRulePolicy_MaskingRule struct {
func (x *MaskingRulePolicy_MaskingRule) Reset() {
*x = MaskingRulePolicy_MaskingRule{}
- mi := &file_store_policy_proto_msgTypes[13]
+ mi := &file_store_policy_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1075,7 +914,7 @@ func (x *MaskingRulePolicy_MaskingRule) String() string {
func (*MaskingRulePolicy_MaskingRule) ProtoMessage() {}
func (x *MaskingRulePolicy_MaskingRule) ProtoReflect() protoreflect.Message {
- mi := &file_store_policy_proto_msgTypes[13]
+ mi := &file_store_policy_proto_msgTypes[11]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1133,22 +972,10 @@ const file_store_policy_proto_rawDesc = "" +
"\x14RESOURCE_UNSPECIFIED\x10\x00\x12\r\n" +
"\tWORKSPACE\x10\x01\x12\x0f\n" +
"\vENVIRONMENT\x10\x02\x12\v\n" +
- "\aPROJECT\x10\x03\"\xa7\x04\n" +
+ "\aPROJECT\x10\x03\"C\n" +
"\rRolloutPolicy\x12\x1c\n" +
"\tautomatic\x18\x01 \x01(\bR\tautomatic\x12\x14\n" +
- "\x05roles\x18\x02 \x03(\tR\x05roles\x12B\n" +
- "\bcheckers\x18\x04 \x01(\v2&.bytebase.store.RolloutPolicy.CheckersR\bcheckers\x1a\x9d\x03\n" +
- "\bCheckers\x126\n" +
- "\x17required_issue_approval\x18\x01 \x01(\bR\x15requiredIssueApproval\x12q\n" +
- "\x16required_status_checks\x18\x02 \x01(\v2;.bytebase.store.RolloutPolicy.Checkers.RequiredStatusChecksR\x14requiredStatusChecks\x1a\x89\x01\n" +
- "\x14RequiredStatusChecks\x12q\n" +
- "\x16plan_check_enforcement\x18\x01 \x01(\x0e2;.bytebase.store.RolloutPolicy.Checkers.PlanCheckEnforcementR\x14planCheckEnforcement\"Z\n" +
- "\x14PlanCheckEnforcement\x12&\n" +
- "\"PLAN_CHECK_ENFORCEMENT_UNSPECIFIED\x10\x00\x12\x0e\n" +
- "\n" +
- "ERROR_ONLY\x10\x01\x12\n" +
- "\n" +
- "\x06STRICT\x10\x02\"\xef\x02\n" +
+ "\x05roles\x18\x02 \x03(\tR\x05roles\"\xef\x02\n" +
"\x16MaskingExceptionPolicy\x12f\n" +
"\x12masking_exceptions\x18\x01 \x03(\v27.bytebase.store.MaskingExceptionPolicy.MaskingExceptionR\x11maskingExceptions\x1a\xec\x01\n" +
"\x10MaskingException\x12V\n" +
@@ -1212,53 +1039,47 @@ func file_store_policy_proto_rawDescGZIP() []byte {
return file_store_policy_proto_rawDescData
}
-var file_store_policy_proto_enumTypes = make([]protoimpl.EnumInfo, 6)
-var file_store_policy_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
+var file_store_policy_proto_enumTypes = make([]protoimpl.EnumInfo, 5)
+var file_store_policy_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
var file_store_policy_proto_goTypes = []any{
(Policy_Type)(0), // 0: bytebase.store.Policy.Type
(Policy_Resource)(0), // 1: bytebase.store.Policy.Resource
- (RolloutPolicy_Checkers_PlanCheckEnforcement)(0), // 2: bytebase.store.RolloutPolicy.Checkers.PlanCheckEnforcement
- (MaskingExceptionPolicy_MaskingException_Action)(0), // 3: bytebase.store.MaskingExceptionPolicy.MaskingException.Action
- (EnvironmentTierPolicy_EnvironmentTier)(0), // 4: bytebase.store.EnvironmentTierPolicy.EnvironmentTier
- (DataSourceQueryPolicy_Restriction)(0), // 5: bytebase.store.DataSourceQueryPolicy.Restriction
- (*Policy)(nil), // 6: bytebase.store.Policy
- (*RolloutPolicy)(nil), // 7: bytebase.store.RolloutPolicy
- (*MaskingExceptionPolicy)(nil), // 8: bytebase.store.MaskingExceptionPolicy
- (*MaskingRulePolicy)(nil), // 9: bytebase.store.MaskingRulePolicy
- (*TagPolicy)(nil), // 10: bytebase.store.TagPolicy
- (*Binding)(nil), // 11: bytebase.store.Binding
- (*IamPolicy)(nil), // 12: bytebase.store.IamPolicy
- (*EnvironmentTierPolicy)(nil), // 13: bytebase.store.EnvironmentTierPolicy
- (*QueryDataPolicy)(nil), // 14: bytebase.store.QueryDataPolicy
- (*DataSourceQueryPolicy)(nil), // 15: bytebase.store.DataSourceQueryPolicy
- (*RolloutPolicy_Checkers)(nil), // 16: bytebase.store.RolloutPolicy.Checkers
- (*RolloutPolicy_Checkers_RequiredStatusChecks)(nil), // 17: bytebase.store.RolloutPolicy.Checkers.RequiredStatusChecks
- (*MaskingExceptionPolicy_MaskingException)(nil), // 18: bytebase.store.MaskingExceptionPolicy.MaskingException
- (*MaskingRulePolicy_MaskingRule)(nil), // 19: bytebase.store.MaskingRulePolicy.MaskingRule
- nil, // 20: bytebase.store.TagPolicy.TagsEntry
- (*expr.Expr)(nil), // 21: google.type.Expr
- (*durationpb.Duration)(nil), // 22: google.protobuf.Duration
+ (MaskingExceptionPolicy_MaskingException_Action)(0), // 2: bytebase.store.MaskingExceptionPolicy.MaskingException.Action
+ (EnvironmentTierPolicy_EnvironmentTier)(0), // 3: bytebase.store.EnvironmentTierPolicy.EnvironmentTier
+ (DataSourceQueryPolicy_Restriction)(0), // 4: bytebase.store.DataSourceQueryPolicy.Restriction
+ (*Policy)(nil), // 5: bytebase.store.Policy
+ (*RolloutPolicy)(nil), // 6: bytebase.store.RolloutPolicy
+ (*MaskingExceptionPolicy)(nil), // 7: bytebase.store.MaskingExceptionPolicy
+ (*MaskingRulePolicy)(nil), // 8: bytebase.store.MaskingRulePolicy
+ (*TagPolicy)(nil), // 9: bytebase.store.TagPolicy
+ (*Binding)(nil), // 10: bytebase.store.Binding
+ (*IamPolicy)(nil), // 11: bytebase.store.IamPolicy
+ (*EnvironmentTierPolicy)(nil), // 12: bytebase.store.EnvironmentTierPolicy
+ (*QueryDataPolicy)(nil), // 13: bytebase.store.QueryDataPolicy
+ (*DataSourceQueryPolicy)(nil), // 14: bytebase.store.DataSourceQueryPolicy
+ (*MaskingExceptionPolicy_MaskingException)(nil), // 15: bytebase.store.MaskingExceptionPolicy.MaskingException
+ (*MaskingRulePolicy_MaskingRule)(nil), // 16: bytebase.store.MaskingRulePolicy.MaskingRule
+ nil, // 17: bytebase.store.TagPolicy.TagsEntry
+ (*expr.Expr)(nil), // 18: google.type.Expr
+ (*durationpb.Duration)(nil), // 19: google.protobuf.Duration
}
var file_store_policy_proto_depIdxs = []int32{
- 16, // 0: bytebase.store.RolloutPolicy.checkers:type_name -> bytebase.store.RolloutPolicy.Checkers
- 18, // 1: bytebase.store.MaskingExceptionPolicy.masking_exceptions:type_name -> bytebase.store.MaskingExceptionPolicy.MaskingException
- 19, // 2: bytebase.store.MaskingRulePolicy.rules:type_name -> bytebase.store.MaskingRulePolicy.MaskingRule
- 20, // 3: bytebase.store.TagPolicy.tags:type_name -> bytebase.store.TagPolicy.TagsEntry
- 21, // 4: bytebase.store.Binding.condition:type_name -> google.type.Expr
- 11, // 5: bytebase.store.IamPolicy.bindings:type_name -> bytebase.store.Binding
- 4, // 6: bytebase.store.EnvironmentTierPolicy.environment_tier:type_name -> bytebase.store.EnvironmentTierPolicy.EnvironmentTier
- 22, // 7: bytebase.store.QueryDataPolicy.timeout:type_name -> google.protobuf.Duration
- 5, // 8: bytebase.store.DataSourceQueryPolicy.admin_data_source_restriction:type_name -> bytebase.store.DataSourceQueryPolicy.Restriction
- 17, // 9: bytebase.store.RolloutPolicy.Checkers.required_status_checks:type_name -> bytebase.store.RolloutPolicy.Checkers.RequiredStatusChecks
- 2, // 10: bytebase.store.RolloutPolicy.Checkers.RequiredStatusChecks.plan_check_enforcement:type_name -> bytebase.store.RolloutPolicy.Checkers.PlanCheckEnforcement
- 3, // 11: bytebase.store.MaskingExceptionPolicy.MaskingException.action:type_name -> bytebase.store.MaskingExceptionPolicy.MaskingException.Action
- 21, // 12: bytebase.store.MaskingExceptionPolicy.MaskingException.condition:type_name -> google.type.Expr
- 21, // 13: bytebase.store.MaskingRulePolicy.MaskingRule.condition:type_name -> google.type.Expr
- 14, // [14:14] is the sub-list for method output_type
- 14, // [14:14] is the sub-list for method input_type
- 14, // [14:14] is the sub-list for extension type_name
- 14, // [14:14] is the sub-list for extension extendee
- 0, // [0:14] is the sub-list for field type_name
+ 15, // 0: bytebase.store.MaskingExceptionPolicy.masking_exceptions:type_name -> bytebase.store.MaskingExceptionPolicy.MaskingException
+ 16, // 1: bytebase.store.MaskingRulePolicy.rules:type_name -> bytebase.store.MaskingRulePolicy.MaskingRule
+ 17, // 2: bytebase.store.TagPolicy.tags:type_name -> bytebase.store.TagPolicy.TagsEntry
+ 18, // 3: bytebase.store.Binding.condition:type_name -> google.type.Expr
+ 10, // 4: bytebase.store.IamPolicy.bindings:type_name -> bytebase.store.Binding
+ 3, // 5: bytebase.store.EnvironmentTierPolicy.environment_tier:type_name -> bytebase.store.EnvironmentTierPolicy.EnvironmentTier
+ 19, // 6: bytebase.store.QueryDataPolicy.timeout:type_name -> google.protobuf.Duration
+ 4, // 7: bytebase.store.DataSourceQueryPolicy.admin_data_source_restriction:type_name -> bytebase.store.DataSourceQueryPolicy.Restriction
+ 2, // 8: bytebase.store.MaskingExceptionPolicy.MaskingException.action:type_name -> bytebase.store.MaskingExceptionPolicy.MaskingException.Action
+ 18, // 9: bytebase.store.MaskingExceptionPolicy.MaskingException.condition:type_name -> google.type.Expr
+ 18, // 10: bytebase.store.MaskingRulePolicy.MaskingRule.condition:type_name -> google.type.Expr
+ 11, // [11:11] is the sub-list for method output_type
+ 11, // [11:11] is the sub-list for method input_type
+ 11, // [11:11] is the sub-list for extension type_name
+ 11, // [11:11] is the sub-list for extension extendee
+ 0, // [0:11] is the sub-list for field type_name
}
func init() { file_store_policy_proto_init() }
@@ -1271,8 +1092,8 @@ func file_store_policy_proto_init() {
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_policy_proto_rawDesc), len(file_store_policy_proto_rawDesc)),
- NumEnums: 6,
- NumMessages: 15,
+ NumEnums: 5,
+ NumMessages: 13,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/backend/generated-go/store/policy_equal.pb.go b/backend/generated-go/store/policy_equal.pb.go
index ac771f04a4..a096694dc6 100644
--- a/backend/generated-go/store/policy_equal.pb.go
+++ b/backend/generated-go/store/policy_equal.pb.go
@@ -18,35 +18,6 @@ func (x *Policy) Equal(y *Policy) bool {
return true
}
-func (x *RolloutPolicy_Checkers_RequiredStatusChecks) Equal(y *RolloutPolicy_Checkers_RequiredStatusChecks) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- if x.PlanCheckEnforcement != y.PlanCheckEnforcement {
- return false
- }
- return true
-}
-
-func (x *RolloutPolicy_Checkers) Equal(y *RolloutPolicy_Checkers) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- if x.RequiredIssueApproval != y.RequiredIssueApproval {
- return false
- }
- if !x.RequiredStatusChecks.Equal(y.RequiredStatusChecks) {
- return false
- }
- return true
-}
-
func (x *RolloutPolicy) Equal(y *RolloutPolicy) bool {
if x == y {
return true
@@ -65,9 +36,6 @@ func (x *RolloutPolicy) Equal(y *RolloutPolicy) bool {
return false
}
}
- if !x.Checkers.Equal(y.Checkers) {
- return false
- }
return true
}
diff --git a/backend/generated-go/store/project.pb.go b/backend/generated-go/store/project.pb.go
index 4f8e0c670e..9669bfea87 100644
--- a/backend/generated-go/store/project.pb.go
+++ b/backend/generated-go/store/project.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/project.proto
@@ -120,8 +120,12 @@ type Project struct {
// Whether to enforce SQL review checks to pass before issue creation.
// If enabled, issues cannot be created when SQL review finds errors.
EnforceSqlReview bool `protobuf:"varint,15,opt,name=enforce_sql_review,json=enforceSqlReview,proto3" json:"enforce_sql_review,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // Whether issue approval is required before proceeding with rollout.
+ RequireIssueApproval bool `protobuf:"varint,16,opt,name=require_issue_approval,json=requireIssueApproval,proto3" json:"require_issue_approval,omitempty"`
+ // Whether to block rollout when plan check finds errors.
+ RequirePlanCheckNoError bool `protobuf:"varint,17,opt,name=require_plan_check_no_error,json=requirePlanCheckNoError,proto3" json:"require_plan_check_no_error,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *Project) Reset() {
@@ -252,6 +256,20 @@ func (x *Project) GetEnforceSqlReview() bool {
return false
}
+func (x *Project) GetRequireIssueApproval() bool {
+ if x != nil {
+ return x.RequireIssueApproval
+ }
+ return false
+}
+
+func (x *Project) GetRequirePlanCheckNoError() bool {
+ if x != nil {
+ return x.RequirePlanCheckNoError
+ }
+ return false
+}
+
// ExecutionRetryPolicy defines retry behavior for failed task executions.
type Project_ExecutionRetryPolicy struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -306,7 +324,7 @@ const file_store_project_proto_rawDesc = "" +
"\x05Label\x12\x14\n" +
"\x05value\x18\x01 \x01(\tR\x05value\x12\x14\n" +
"\x05color\x18\x02 \x01(\tR\x05color\x12\x14\n" +
- "\x05group\x18\x03 \x01(\tR\x05group\"\x8c\a\n" +
+ "\x05group\x18\x03 \x01(\tR\x05group\"\x80\b\n" +
"\aProject\x128\n" +
"\fissue_labels\x18\x02 \x03(\v2\x15.bytebase.store.LabelR\vissueLabels\x12,\n" +
"\x12force_issue_labels\x18\x03 \x01(\bR\x10forceIssueLabels\x124\n" +
@@ -322,7 +340,9 @@ const file_store_project_proto_rawDesc = "" +
"\x10ci_sampling_size\x18\f \x01(\x05R\x0eciSamplingSize\x12;\n" +
"\x1aparallel_tasks_per_rollout\x18\r \x01(\x05R\x17parallelTasksPerRollout\x12;\n" +
"\x06labels\x18\x0e \x03(\v2#.bytebase.store.Project.LabelsEntryR\x06labels\x12,\n" +
- "\x12enforce_sql_review\x18\x0f \x01(\bR\x10enforceSqlReview\x1a?\n" +
+ "\x12enforce_sql_review\x18\x0f \x01(\bR\x10enforceSqlReview\x124\n" +
+ "\x16require_issue_approval\x18\x10 \x01(\bR\x14requireIssueApproval\x12<\n" +
+ "\x1brequire_plan_check_no_error\x18\x11 \x01(\bR\x17requirePlanCheckNoError\x1a?\n" +
"\x14ExecutionRetryPolicy\x12'\n" +
"\x0fmaximum_retries\x18\x01 \x01(\x05R\x0emaximumRetries\x1a9\n" +
"\vLabelsEntry\x12\x10\n" +
diff --git a/backend/generated-go/store/project_equal.pb.go b/backend/generated-go/store/project_equal.pb.go
index cedb7d7847..2ff70400ca 100644
--- a/backend/generated-go/store/project_equal.pb.go
+++ b/backend/generated-go/store/project_equal.pb.go
@@ -98,5 +98,11 @@ func (x *Project) Equal(y *Project) bool {
if x.EnforceSqlReview != y.EnforceSqlReview {
return false
}
+ if x.RequireIssueApproval != y.RequireIssueApproval {
+ return false
+ }
+ if x.RequirePlanCheckNoError != y.RequirePlanCheckNoError {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/store/project_webhook.pb.go b/backend/generated-go/store/project_webhook.pb.go
index d7e3b6a83b..93b0a11cbf 100644
--- a/backend/generated-go/store/project_webhook.pb.go
+++ b/backend/generated-go/store/project_webhook.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/project_webhook.proto
diff --git a/backend/generated-go/store/query_history.pb.go b/backend/generated-go/store/query_history.pb.go
index 19cf92fefd..75991aff52 100644
--- a/backend/generated-go/store/query_history.pb.go
+++ b/backend/generated-go/store/query_history.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/query_history.proto
diff --git a/backend/generated-go/store/release.pb.go b/backend/generated-go/store/release.pb.go
index 061dd988c5..615c8e7ef1 100644
--- a/backend/generated-go/store/release.pb.go
+++ b/backend/generated-go/store/release.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/release.proto
diff --git a/backend/generated-go/store/review_config.pb.go b/backend/generated-go/store/review_config.pb.go
index ff48784c3c..3b1a9fbb02 100644
--- a/backend/generated-go/store/review_config.pb.go
+++ b/backend/generated-go/store/review_config.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/review_config.proto
diff --git a/backend/generated-go/store/revision.pb.go b/backend/generated-go/store/revision.pb.go
index b59cac87b0..09973a0b23 100644
--- a/backend/generated-go/store/revision.pb.go
+++ b/backend/generated-go/store/revision.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/revision.proto
diff --git a/backend/generated-go/store/role.pb.go b/backend/generated-go/store/role.pb.go
index 65855ecaf9..d44f138668 100644
--- a/backend/generated-go/store/role.pb.go
+++ b/backend/generated-go/store/role.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/role.proto
diff --git a/backend/generated-go/store/setting.pb.go b/backend/generated-go/store/setting.pb.go
index 4456555e91..868072c728 100644
--- a/backend/generated-go/store/setting.pb.go
+++ b/backend/generated-go/store/setting.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/setting.proto
diff --git a/backend/generated-go/store/sheet.pb.go b/backend/generated-go/store/sheet.pb.go
index e242231c9d..04d88b494b 100644
--- a/backend/generated-go/store/sheet.pb.go
+++ b/backend/generated-go/store/sheet.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/sheet.proto
diff --git a/backend/generated-go/store/task.pb.go b/backend/generated-go/store/task.pb.go
index b19fe7bca4..7d91d73c66 100644
--- a/backend/generated-go/store/task.pb.go
+++ b/backend/generated-go/store/task.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/task.proto
diff --git a/backend/generated-go/store/task_run.pb.go b/backend/generated-go/store/task_run.pb.go
index 14e08d8b23..26d60e621b 100644
--- a/backend/generated-go/store/task_run.pb.go
+++ b/backend/generated-go/store/task_run.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/task_run.proto
diff --git a/backend/generated-go/store/task_run_log.pb.go b/backend/generated-go/store/task_run_log.pb.go
index 334175e565..4f83ad0a13 100644
--- a/backend/generated-go/store/task_run_log.pb.go
+++ b/backend/generated-go/store/task_run_log.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/task_run_log.proto
diff --git a/backend/generated-go/store/user.pb.go b/backend/generated-go/store/user.pb.go
index 87fa5a3941..96a5cb1d41 100644
--- a/backend/generated-go/store/user.pb.go
+++ b/backend/generated-go/store/user.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/user.proto
diff --git a/backend/generated-go/store/worksheet.pb.go b/backend/generated-go/store/worksheet.pb.go
index 1b662329fa..b82898eadb 100644
--- a/backend/generated-go/store/worksheet.pb.go
+++ b/backend/generated-go/store/worksheet.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: store/worksheet.proto
diff --git a/backend/generated-go/v1/actuator_service.pb.go b/backend/generated-go/v1/actuator_service.pb.go
index 758c7d53d7..8757304db7 100644
--- a/backend/generated-go/v1/actuator_service.pb.go
+++ b/backend/generated-go/v1/actuator_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/actuator_service.proto
diff --git a/backend/generated-go/v1/annotation.pb.go b/backend/generated-go/v1/annotation.pb.go
index 948c4c798f..658a58c865 100644
--- a/backend/generated-go/v1/annotation.pb.go
+++ b/backend/generated-go/v1/annotation.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/annotation.proto
diff --git a/backend/generated-go/v1/audit_log_service.pb.go b/backend/generated-go/v1/audit_log_service.pb.go
index cbc6210138..618d8b693c 100644
--- a/backend/generated-go/v1/audit_log_service.pb.go
+++ b/backend/generated-go/v1/audit_log_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/audit_log_service.proto
diff --git a/backend/generated-go/v1/auth_service.pb.go b/backend/generated-go/v1/auth_service.pb.go
index f47ce79a71..3c94214c10 100644
--- a/backend/generated-go/v1/auth_service.pb.go
+++ b/backend/generated-go/v1/auth_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/auth_service.proto
diff --git a/backend/generated-go/v1/cel_service.pb.go b/backend/generated-go/v1/cel_service.pb.go
index b707cdfaa3..ae60fc349f 100644
--- a/backend/generated-go/v1/cel_service.pb.go
+++ b/backend/generated-go/v1/cel_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/cel_service.proto
diff --git a/backend/generated-go/v1/common.pb.go b/backend/generated-go/v1/common.pb.go
index 4d3331a051..67044b16c8 100644
--- a/backend/generated-go/v1/common.pb.go
+++ b/backend/generated-go/v1/common.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/common.proto
diff --git a/backend/generated-go/v1/database_catalog_service.pb.go b/backend/generated-go/v1/database_catalog_service.pb.go
index 73e35bbb8b..4f595968eb 100644
--- a/backend/generated-go/v1/database_catalog_service.pb.go
+++ b/backend/generated-go/v1/database_catalog_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/database_catalog_service.proto
diff --git a/backend/generated-go/v1/database_group_service.pb.go b/backend/generated-go/v1/database_group_service.pb.go
index 07348d4601..587d100093 100644
--- a/backend/generated-go/v1/database_group_service.pb.go
+++ b/backend/generated-go/v1/database_group_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/database_group_service.proto
diff --git a/backend/generated-go/v1/database_service.pb.go b/backend/generated-go/v1/database_service.pb.go
index 707c7567bc..bd3ced39bb 100644
--- a/backend/generated-go/v1/database_service.pb.go
+++ b/backend/generated-go/v1/database_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/database_service.proto
diff --git a/backend/generated-go/v1/group_service.pb.go b/backend/generated-go/v1/group_service.pb.go
index 8bbc6b538f..ade20c4525 100644
--- a/backend/generated-go/v1/group_service.pb.go
+++ b/backend/generated-go/v1/group_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/group_service.proto
diff --git a/backend/generated-go/v1/iam_policy.pb.go b/backend/generated-go/v1/iam_policy.pb.go
index 06d5ef4250..e68ebb7c27 100644
--- a/backend/generated-go/v1/iam_policy.pb.go
+++ b/backend/generated-go/v1/iam_policy.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/iam_policy.proto
diff --git a/backend/generated-go/v1/idp_service.pb.go b/backend/generated-go/v1/idp_service.pb.go
index 80daba585b..071e08de4b 100644
--- a/backend/generated-go/v1/idp_service.pb.go
+++ b/backend/generated-go/v1/idp_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/idp_service.proto
diff --git a/backend/generated-go/v1/instance_role_service.pb.go b/backend/generated-go/v1/instance_role_service.pb.go
index 42c46b0e2e..899927bd69 100644
--- a/backend/generated-go/v1/instance_role_service.pb.go
+++ b/backend/generated-go/v1/instance_role_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/instance_role_service.proto
diff --git a/backend/generated-go/v1/instance_service.pb.go b/backend/generated-go/v1/instance_service.pb.go
index 8083e41b60..79875bf94f 100644
--- a/backend/generated-go/v1/instance_service.pb.go
+++ b/backend/generated-go/v1/instance_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/instance_service.proto
diff --git a/backend/generated-go/v1/issue_service.pb.go b/backend/generated-go/v1/issue_service.pb.go
index 975ed56485..d3e7e9f4a2 100644
--- a/backend/generated-go/v1/issue_service.pb.go
+++ b/backend/generated-go/v1/issue_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/issue_service.proto
diff --git a/backend/generated-go/v1/org_policy_service.pb.go b/backend/generated-go/v1/org_policy_service.pb.go
index 7a22ae41bd..6a1295eb51 100644
--- a/backend/generated-go/v1/org_policy_service.pb.go
+++ b/backend/generated-go/v1/org_policy_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/org_policy_service.proto
diff --git a/backend/generated-go/v1/plan_service.pb.go b/backend/generated-go/v1/plan_service.pb.go
index fcac5fc465..86f0748830 100644
--- a/backend/generated-go/v1/plan_service.pb.go
+++ b/backend/generated-go/v1/plan_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/plan_service.proto
diff --git a/backend/generated-go/v1/project_service.pb.go b/backend/generated-go/v1/project_service.pb.go
index 1472f8176f..31a10c15be 100644
--- a/backend/generated-go/v1/project_service.pb.go
+++ b/backend/generated-go/v1/project_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/project_service.proto
@@ -955,8 +955,12 @@ type Project struct {
// Whether to enforce SQL review checks to pass before issue creation.
// If enabled, issues cannot be created when SQL review finds errors.
EnforceSqlReview bool `protobuf:"varint,26,opt,name=enforce_sql_review,json=enforceSqlReview,proto3" json:"enforce_sql_review,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // Whether to require issue approval before rollout.
+ RequireIssueApproval bool `protobuf:"varint,27,opt,name=require_issue_approval,json=requireIssueApproval,proto3" json:"require_issue_approval,omitempty"`
+ // Whether to require plan check to have no error before rollout.
+ RequirePlanCheckNoError bool `protobuf:"varint,28,opt,name=require_plan_check_no_error,json=requirePlanCheckNoError,proto3" json:"require_plan_check_no_error,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *Project) Reset() {
@@ -1122,6 +1126,20 @@ func (x *Project) GetEnforceSqlReview() bool {
return false
}
+func (x *Project) GetRequireIssueApproval() bool {
+ if x != nil {
+ return x.RequireIssueApproval
+ }
+ return false
+}
+
+func (x *Project) GetRequirePlanCheckNoError() bool {
+ if x != nil {
+ return x.RequirePlanCheckNoError
+ }
+ return false
+}
+
type AddWebhookRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The name of the project to add the webhook to.
@@ -1687,7 +1705,7 @@ const file_v1_project_service_proto_rawDesc = "" +
"\x05Label\x12\x14\n" +
"\x05value\x18\x01 \x01(\tR\x05value\x12\x14\n" +
"\x05color\x18\x02 \x01(\tR\x05color\x12\x14\n" +
- "\x05group\x18\x03 \x01(\tR\x05group\"\x85\t\n" +
+ "\x05group\x18\x03 \x01(\tR\x05group\"\xf9\t\n" +
"\aProject\x12\x12\n" +
"\x04name\x18\x01 \x01(\tR\x04name\x12(\n" +
"\x05state\x18\x03 \x01(\x0e2\x12.bytebase.v1.StateR\x05state\x12\x1e\n" +
@@ -1707,7 +1725,9 @@ const file_v1_project_service_proto_rawDesc = "" +
"\x10ci_sampling_size\x18\x17 \x01(\x05R\x0eciSamplingSize\x12;\n" +
"\x1aparallel_tasks_per_rollout\x18\x18 \x01(\x05R\x17parallelTasksPerRollout\x128\n" +
"\x06labels\x18\x19 \x03(\v2 .bytebase.v1.Project.LabelsEntryR\x06labels\x12,\n" +
- "\x12enforce_sql_review\x18\x1a \x01(\bR\x10enforceSqlReview\x1a?\n" +
+ "\x12enforce_sql_review\x18\x1a \x01(\bR\x10enforceSqlReview\x124\n" +
+ "\x16require_issue_approval\x18\x1b \x01(\bR\x14requireIssueApproval\x12<\n" +
+ "\x1brequire_plan_check_no_error\x18\x1c \x01(\bR\x17requirePlanCheckNoError\x1a?\n" +
"\x14ExecutionRetryPolicy\x12'\n" +
"\x0fmaximum_retries\x18\x01 \x01(\x05R\x0emaximumRetries\x1a9\n" +
"\vLabelsEntry\x12\x10\n" +
diff --git a/backend/generated-go/v1/project_service_equal.pb.go b/backend/generated-go/v1/project_service_equal.pb.go
index 316d603efe..bc974b53f5 100644
--- a/backend/generated-go/v1/project_service_equal.pb.go
+++ b/backend/generated-go/v1/project_service_equal.pb.go
@@ -369,6 +369,12 @@ func (x *Project) Equal(y *Project) bool {
if x.EnforceSqlReview != y.EnforceSqlReview {
return false
}
+ if x.RequireIssueApproval != y.RequireIssueApproval {
+ return false
+ }
+ if x.RequirePlanCheckNoError != y.RequirePlanCheckNoError {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/release_service.pb.go b/backend/generated-go/v1/release_service.pb.go
index f49cbe2788..e644192a22 100644
--- a/backend/generated-go/v1/release_service.pb.go
+++ b/backend/generated-go/v1/release_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/release_service.proto
diff --git a/backend/generated-go/v1/review_config_service.pb.go b/backend/generated-go/v1/review_config_service.pb.go
index 68e11a1343..a1514733da 100644
--- a/backend/generated-go/v1/review_config_service.pb.go
+++ b/backend/generated-go/v1/review_config_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/review_config_service.proto
diff --git a/backend/generated-go/v1/revision_service.pb.go b/backend/generated-go/v1/revision_service.pb.go
index 3782534723..01e0474e4e 100644
--- a/backend/generated-go/v1/revision_service.pb.go
+++ b/backend/generated-go/v1/revision_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/revision_service.proto
diff --git a/backend/generated-go/v1/role_service.pb.go b/backend/generated-go/v1/role_service.pb.go
index ae6f001ba5..7b8653fd2d 100644
--- a/backend/generated-go/v1/role_service.pb.go
+++ b/backend/generated-go/v1/role_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/role_service.proto
diff --git a/backend/generated-go/v1/rollout_service.pb.go b/backend/generated-go/v1/rollout_service.pb.go
index 6374ca0144..74129ba5a6 100644
--- a/backend/generated-go/v1/rollout_service.pb.go
+++ b/backend/generated-go/v1/rollout_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/rollout_service.proto
diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.go
index e0371d01d1..da7516c715 100644
--- a/backend/generated-go/v1/setting_service.pb.go
+++ b/backend/generated-go/v1/setting_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/setting_service.proto
diff --git a/backend/generated-go/v1/sheet_service.pb.go b/backend/generated-go/v1/sheet_service.pb.go
index 0cc0076184..fb8bda8c00 100644
--- a/backend/generated-go/v1/sheet_service.pb.go
+++ b/backend/generated-go/v1/sheet_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/sheet_service.proto
diff --git a/backend/generated-go/v1/sql_service.pb.go b/backend/generated-go/v1/sql_service.pb.go
index 4c39cc3881..1e09b3f789 100644
--- a/backend/generated-go/v1/sql_service.pb.go
+++ b/backend/generated-go/v1/sql_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/sql_service.proto
diff --git a/backend/generated-go/v1/subscription_service.pb.go b/backend/generated-go/v1/subscription_service.pb.go
index c1b2305f91..a1498f2d51 100644
--- a/backend/generated-go/v1/subscription_service.pb.go
+++ b/backend/generated-go/v1/subscription_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/subscription_service.proto
diff --git a/backend/generated-go/v1/user_service.pb.go b/backend/generated-go/v1/user_service.pb.go
index eab2bc9120..132497e048 100644
--- a/backend/generated-go/v1/user_service.pb.go
+++ b/backend/generated-go/v1/user_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/user_service.proto
diff --git a/backend/generated-go/v1/worksheet_service.pb.go b/backend/generated-go/v1/worksheet_service.pb.go
index 925a3442d6..d121904f04 100644
--- a/backend/generated-go/v1/worksheet_service.pb.go
+++ b/backend/generated-go/v1/worksheet_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/worksheet_service.proto
diff --git a/backend/generated-go/v1/workspace_service.pb.go b/backend/generated-go/v1/workspace_service.pb.go
index 14858902ad..ea73ac95ee 100644
--- a/backend/generated-go/v1/workspace_service.pb.go
+++ b/backend/generated-go/v1/workspace_service.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.11
// protoc (unknown)
// source: v1/workspace_service.proto
diff --git a/backend/migrator/migration/3.13/0025##backfill_project_rollout_settings.sql b/backend/migrator/migration/3.13/0025##backfill_project_rollout_settings.sql
new file mode 100644
index 0000000000..4c728112b3
--- /dev/null
+++ b/backend/migrator/migration/3.13/0025##backfill_project_rollout_settings.sql
@@ -0,0 +1,24 @@
+-- 1. Enable requireIssueApproval for ALL projects if ANY rollout policy has 'required-issue-approval' config.
+-- This is a "safety first" global backfill: if strictness is used anywhere, enforce it everywhere at the project level
+-- to prevent security regression, since environment-level rollout policies are being deprecated/moved.
+UPDATE project
+SET setting = setting || '{"requireIssueApproval": true}'::jsonb
+WHERE EXISTS (
+ SELECT 1 FROM policy
+ WHERE type = 'ROLLOUT'
+ AND (payload::jsonb -> 'checkers' -> 'required-issue-approval') IS NOT NULL
+);
+
+-- 2. Enable requirePlanCheckNoError for ALL projects if ANY rollout policy has 'plan-check-enforcement' config.
+UPDATE project
+SET setting = setting || '{"requirePlanCheckNoError": true}'::jsonb
+WHERE EXISTS (
+ SELECT 1 FROM policy
+ WHERE type = 'ROLLOUT'
+ AND (payload::jsonb -> 'checkers' -> 'plan-check-enforcement') IS NOT NULL
+);
+
+-- 3. Cleanup existing checkers and requireIssueApproval from rollout policy in the policy table
+UPDATE policy
+SET payload = (payload - 'checkers' - 'requireIssueApproval')
+WHERE type = 'ROLLOUT';
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 3478d26d2c..95941c2801 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -12,7 +12,7 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.13.24"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.13.25"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/runner/taskrun/scheduler.go b/backend/runner/taskrun/scheduler.go
index 89028dd57f..f6d7b7832f 100644
--- a/backend/runner/taskrun/scheduler.go
+++ b/backend/runner/taskrun/scheduler.go
@@ -12,7 +12,6 @@ import (
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/timestamppb"
- apiv1 "github.com/bytebase/bytebase/backend/api/v1"
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
@@ -178,12 +177,6 @@ func (s *Scheduler) scheduleAutoRolloutTask(ctx context.Context, taskUID int) er
return nil
}
- // Get rollout policy to check rollout requirements
- rolloutPolicy, err := apiv1.GetValidRolloutPolicyForEnvironment(ctx, s.store, task.Environment)
- if err != nil {
- return errors.Wrapf(err, "failed to get rollout policy for environment %s", task.Environment)
- }
-
issue, err := s.store.GetIssue(ctx, &store.FindIssueMessage{PipelineID: &task.PipelineID})
if err != nil {
return err
@@ -192,8 +185,8 @@ func (s *Scheduler) scheduleAutoRolloutTask(ctx context.Context, taskUID int) er
if issue.Status != storepb.Issue_OPEN {
return nil
}
- // Check if issue approval is required according to the rollout policy checkers
- if rolloutPolicy.GetCheckers().GetRequiredIssueApproval() {
+ // Check if issue approval is required according to the project settings
+ if project.Setting.RequireIssueApproval {
approved, err := utils.CheckIssueApproved(issue)
if err != nil {
return errors.Wrapf(err, "failed to check if the issue is approved")
@@ -204,9 +197,8 @@ func (s *Scheduler) scheduleAutoRolloutTask(ctx context.Context, taskUID int) er
}
}
- // Check the latest plan checks based on rollout policy enforcement level
- planCheckEnforcement := rolloutPolicy.GetCheckers().GetRequiredStatusChecks().GetPlanCheckEnforcement()
- if planCheckEnforcement != storepb.RolloutPolicy_Checkers_PLAN_CHECK_ENFORCEMENT_UNSPECIFIED {
+ // Check the latest plan checks based on project settings (error only)
+ if project.Setting.RequirePlanCheckNoError {
pass, err := func() (bool, error) {
plan, err := s.store.GetPlan(ctx, &store.FindPlanMessage{PipelineID: &task.PipelineID})
if err != nil {
@@ -226,14 +218,9 @@ func (s *Scheduler) scheduleAutoRolloutTask(ctx context.Context, taskUID int) er
return false, nil
}
for _, result := range run.Result.Results {
- // Block on errors for both ERROR_ONLY and STRICT enforcement
if result.Status == storepb.Advice_ERROR {
return false, nil
}
- // Block on warnings only for STRICT enforcement
- if planCheckEnforcement == storepb.RolloutPolicy_Checkers_STRICT && result.Status == storepb.Advice_WARNING {
- return false, nil
- }
}
}
return true, nil
diff --git a/backend/store/policy.go b/backend/store/policy.go
index 6805d11bb4..b20fd82047 100644
--- a/backend/store/policy.go
+++ b/backend/store/policy.go
@@ -140,12 +140,6 @@ func GetDefaultRolloutPolicy() *storepb.RolloutPolicy {
return &storepb.RolloutPolicy{
Automatic: false,
Roles: []string{},
- Checkers: &storepb.RolloutPolicy_Checkers{
- RequiredIssueApproval: true,
- RequiredStatusChecks: &storepb.RolloutPolicy_Checkers_RequiredStatusChecks{
- PlanCheckEnforcement: storepb.RolloutPolicy_Checkers_ERROR_ONLY,
- },
- },
}
}
diff --git a/frontend/src/components/EnvironmentForm/RolloutPolicyConfig.vue b/frontend/src/components/EnvironmentForm/RolloutPolicyConfig.vue
index b57361dea9..5deb498ec8 100644
--- a/frontend/src/components/EnvironmentForm/RolloutPolicyConfig.vue
+++ b/frontend/src/components/EnvironmentForm/RolloutPolicyConfig.vue
@@ -26,125 +26,19 @@
</div>
</div>
</div>
-
- <!-- Requirements Section -->
- <div class="flex flex-col gap-y-2">
- <div class="textlabel font-medium">
- {{ t("policy.rollout.checkers.self") }}
- </div>
-
- <!-- Required Issue Approval -->
- <div class="w-full inline-flex items-start gap-x-2">
- <Switch
- :value="isRequiredIssueApprovalChecked"
- :text="true"
- :disabled="disabled"
- @update:value="toggleRequiredIssueApproval($event)"
- />
- <div class="flex flex-col">
- <span class="textlabel">
- {{ t("policy.rollout.checkers.required-issue-approval.self") }}
- </span>
- <div class="textinfolabel">
- {{
- t("policy.rollout.checkers.required-issue-approval.description")
- }}
- </div>
- </div>
- </div>
-
- <!-- Plan Check Enforcement -->
- <div class="w-full inline-flex items-start gap-x-2">
- <Switch
- :value="isPlanCheckEnforcementEnabled"
- :text="true"
- :disabled="disabled"
- @update:value="togglePlanCheckEnforcement($event)"
- />
- <div class="flex flex-col">
- <span class="textlabel">
- {{ t("policy.rollout.checkers.plan-check-enforcement.self") }}
- </span>
- <div class="textinfolabel">
- {{
- t("policy.rollout.checkers.plan-check-enforcement.description")
- }}
- </div>
- </div>
- </div>
-
- <!-- Plan Check Enforcement Options (shown when enabled) -->
- <div
- v-if="isPlanCheckEnforcementEnabled"
- class="flex flex-col gap-y-2 ml-12"
- >
- <NRadioGroup
- :value="planCheckEnforcementLevel"
- :disabled="disabled"
- @update:value="updatePlanCheckEnforcementLevel($event)"
- >
- <div class="flex flex-col gap-y-2">
- <NRadio
- :value="RolloutPolicy_Checkers_PlanCheckEnforcement.ERROR_ONLY"
- >
- <div class="flex flex-col">
- <div>
- {{
- t(
- "policy.rollout.checkers.plan-check-enforcement.error-only.self"
- )
- }}
- </div>
- <div class="textinfolabel">
- {{
- t(
- "policy.rollout.checkers.plan-check-enforcement.error-only.description"
- )
- }}
- </div>
- </div>
- </NRadio>
- <NRadio :value="RolloutPolicy_Checkers_PlanCheckEnforcement.STRICT">
- <div class="flex flex-col">
- <div>
- {{
- t(
- "policy.rollout.checkers.plan-check-enforcement.strict.self"
- )
- }}
- </div>
- <div class="textinfolabel">
- {{
- t(
- "policy.rollout.checkers.plan-check-enforcement.strict.description"
- )
- }}
- </div>
- </div>
- </NRadio>
- </div>
- </NRadioGroup>
- </div>
- </div>
</div>
</template>
<script setup lang="ts">
import { create } from "@bufbuild/protobuf";
import { cloneDeep } from "lodash-es";
-import { NRadio, NRadioGroup } from "naive-ui";
import { computed, ref, watch } from "vue";
import { useI18n } from "vue-i18n";
import type {
Policy,
RolloutPolicy,
} from "@/types/proto-es/v1/org_policy_service_pb";
-import {
- RolloutPolicy_Checkers_PlanCheckEnforcement,
- RolloutPolicy_Checkers_RequiredStatusChecksSchema,
- RolloutPolicy_CheckersSchema,
- RolloutPolicySchema,
-} from "@/types/proto-es/v1/org_policy_service_pb";
+import { RolloutPolicySchema } from "@/types/proto-es/v1/org_policy_service_pb";
import { RoleSelect, Switch } from "../v2";
const { t } = useI18n();
@@ -170,27 +64,6 @@ const isAutomaticRolloutChecked = computed(() => {
return rolloutPolicy.value.automatic;
});
-const isRequiredIssueApprovalChecked = computed(() => {
- return rolloutPolicy.value.checkers?.requiredIssueApproval ?? false;
-});
-
-const isPlanCheckEnforcementEnabled = computed(() => {
- const enforcement =
- rolloutPolicy.value.checkers?.requiredStatusChecks?.planCheckEnforcement;
- return (
- enforcement !== undefined &&
- enforcement !==
- RolloutPolicy_Checkers_PlanCheckEnforcement.PLAN_CHECK_ENFORCEMENT_UNSPECIFIED
- );
-});
-
-const planCheckEnforcementLevel = computed(() => {
- return (
- rolloutPolicy.value.checkers?.requiredStatusChecks?.planCheckEnforcement ??
- RolloutPolicy_Checkers_PlanCheckEnforcement.ERROR_ONLY
- );
-});
-
const update = (rp: RolloutPolicy) => {
emit("update:policy", {
...props.policy,
@@ -217,82 +90,6 @@ const updateRoles = (roles: string[]) => {
);
};
-// Checkers methods
-const toggleRequiredIssueApproval = (checked: boolean) => {
- const currentCheckers = rolloutPolicy.value.checkers;
- const updatedCheckers = create(RolloutPolicy_CheckersSchema, {
- requiredIssueApproval: checked,
- requiredStatusChecks: currentCheckers?.requiredStatusChecks,
- });
-
- update(
- create(RolloutPolicySchema, {
- ...rolloutPolicy.value,
- checkers: updatedCheckers,
- })
- );
-};
-
-const togglePlanCheckEnforcement = (enabled: boolean) => {
- const currentCheckers = rolloutPolicy.value.checkers;
- let updatedStatusChecks;
-
- if (enabled) {
- // When enabling, default to ERROR_ONLY
- updatedStatusChecks = create(
- RolloutPolicy_Checkers_RequiredStatusChecksSchema,
- {
- planCheckEnforcement:
- RolloutPolicy_Checkers_PlanCheckEnforcement.ERROR_ONLY,
- }
- );
- } else {
- // When disabling, set to UNSPECIFIED (no enforcement)
- updatedStatusChecks = create(
- RolloutPolicy_Checkers_RequiredStatusChecksSchema,
- {
- planCheckEnforcement:
- RolloutPolicy_Checkers_PlanCheckEnforcement.PLAN_CHECK_ENFORCEMENT_UNSPECIFIED,
- }
- );
- }
-
- const updatedCheckers = create(RolloutPolicy_CheckersSchema, {
- requiredIssueApproval: currentCheckers?.requiredIssueApproval ?? false,
- requiredStatusChecks: updatedStatusChecks,
- });
-
- update(
- create(RolloutPolicySchema, {
- ...rolloutPolicy.value,
- checkers: updatedCheckers,
- })
- );
-};
-
-const updatePlanCheckEnforcementLevel = (
- enforcement: RolloutPolicy_Checkers_PlanCheckEnforcement
-) => {
- const currentCheckers = rolloutPolicy.value.checkers;
- const updatedStatusChecks = create(
- RolloutPolicy_Checkers_RequiredStatusChecksSchema,
- {
- planCheckEnforcement: enforcement,
- }
- );
- const updatedCheckers = create(RolloutPolicy_CheckersSchema, {
- requiredIssueApproval: currentCheckers?.requiredIssueApproval ?? false,
- requiredStatusChecks: updatedStatusChecks,
- });
-
- update(
- create(RolloutPolicySchema, {
- ...rolloutPolicy.value,
- checkers: updatedCheckers,
- })
- );
-};
-
watch(
() =>
props.policy.policy?.case === "rolloutPolicy"
diff --git a/frontend/src/components/IssueV1/components/Panel/TaskRolloutActionPanel.vue b/frontend/src/components/IssueV1/components/Panel/TaskRolloutActionPanel.vue
index 34c25fb89f..8851d68cb0 100644
--- a/frontend/src/components/IssueV1/components/Panel/TaskRolloutActionPanel.vue
+++ b/frontend/src/components/IssueV1/components/Panel/TaskRolloutActionPanel.vue
@@ -237,13 +237,8 @@ import {
pushNotification,
useCurrentProjectV1,
useEnvironmentV1Store,
- usePolicyByParentAndType,
} from "@/store";
import { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";
-import {
- PolicyType,
- RolloutPolicy_Checkers_PlanCheckEnforcement,
-} from "@/types/proto-es/v1/org_policy_service_pb";
import type { Task } from "@/types/proto-es/v1/rollout_service_pb";
import {
BatchCancelTaskRunsRequestSchema,
@@ -337,20 +332,6 @@ const database = computed(() =>
databaseForTask(project.value, selectedTask.value)
);
-// Get rollout policy for the environment
-const { policy: rolloutPolicy } = usePolicyByParentAndType(
- computed(() => {
- const env = database.value?.effectiveEnvironment;
- if (!env) {
- return { parentPath: "", policyType: PolicyType.ROLLOUT_POLICY };
- }
- return {
- parentPath: env,
- policyType: PolicyType.ROLLOUT_POLICY,
- };
- })
-);
-
const stage = computed(() => {
const firstTask = head(props.taskList);
if (!firstTask) return undefined;
@@ -426,7 +407,7 @@ const planCheckRunList = computed(() => {
return uniqBy(list, (checkRun) => checkRun.name);
});
-// Plan check error validation based on rollout policy checkers
+// Plan check error validation based on project settings
const planCheckError = computed(() => {
if (
!(
@@ -440,15 +421,8 @@ const planCheckError = computed(() => {
const summary = planCheckRunSummaryForCheckRunList(planCheckRunList.value);
- // Get the plan check enforcement level from the rollout policy
- const planCheckEnforcement =
- rolloutPolicy.value?.policy?.case === "rolloutPolicy"
- ? rolloutPolicy.value.policy.value.checkers?.requiredStatusChecks
- ?.planCheckEnforcement
- : undefined;
-
// If no enforcement is specified, default to no validation
- if (!planCheckEnforcement) {
+ if (!project.value.requirePlanCheckNoError) {
return undefined;
}
@@ -457,27 +431,13 @@ const planCheckError = computed(() => {
"custom-approval.issue-review.disallow-approve-reason.some-task-checks-are-still-running"
);
}
- // ERROR_ONLY enforcement: only block on errors
- if (
- planCheckEnforcement ===
- RolloutPolicy_Checkers_PlanCheckEnforcement.ERROR_ONLY
- ) {
- if (summary.errorCount > 0) {
- return t(
- "custom-approval.issue-review.disallow-approve-reason.some-task-checks-didnt-pass"
- );
- }
- }
- // STRICT enforcement: block on both errors and warnings
- if (
- planCheckEnforcement === RolloutPolicy_Checkers_PlanCheckEnforcement.STRICT
- ) {
- if (summary.errorCount > 0 || summary.warnCount > 0) {
- return t(
- "custom-approval.issue-review.disallow-approve-reason.some-task-checks-didnt-pass"
- );
- }
+
+ if (summary.errorCount > 0) {
+ return t(
+ "custom-approval.issue-review.disallow-approve-reason.some-task-checks-didnt-pass"
+ );
}
+
return undefined;
});
@@ -504,15 +464,8 @@ const planCheckWarning = computed(() => {
return undefined;
}
- // Get the plan check enforcement level from the rollout policy
- const planCheckEnforcement =
- rolloutPolicy.value?.policy?.case === "rolloutPolicy"
- ? rolloutPolicy.value.policy.value.checkers?.requiredStatusChecks
- ?.planCheckEnforcement
- : undefined;
-
- // If there's no enforcement policy, show any plan check issues as warnings
- if (!planCheckEnforcement) {
+ // If enforcement is disabled, show any plan check issues as warnings
+ if (!project.value.requirePlanCheckNoError) {
if (summary.runningCount > 0) {
return t(
"custom-approval.issue-review.disallow-approve-reason.some-task-checks-are-still-running"
@@ -525,17 +478,6 @@ const planCheckWarning = computed(() => {
}
}
- // Show warnings for plan check results that don't violate enforcement policy
- if (
- planCheckEnforcement ===
- RolloutPolicy_Checkers_PlanCheckEnforcement.ERROR_ONLY
- ) {
- // Show warnings as non-blocking when ERROR_ONLY policy allows them
- if (summary.warnCount > 0) {
- return t("rollout.task-execution-notices");
- }
- }
-
return undefined;
});
@@ -569,10 +511,7 @@ const validationErrors = computed(() => {
props.action === "RESTART"
) {
// Issue approval errors (only if policy requires it) - HARD BLOCK
- const requiresIssueApproval =
- rolloutPolicy.value?.policy?.case === "rolloutPolicy"
- ? rolloutPolicy.value.policy.value.checkers?.requiredIssueApproval
- : false;
+ const requiresIssueApproval = project.value.requireIssueApproval;
if (
requiresIssueApproval &&
@@ -623,10 +562,7 @@ const validationWarnings = computed(() => {
}
// Issue approval warnings (when not required by policy but issue is not approved)
- const requiresIssueApproval =
- rolloutPolicy.value?.policy?.case === "rolloutPolicy"
- ? rolloutPolicy.value.policy.value.checkers?.requiredIssueApproval
- : false;
+ const requiresIssueApproval = project.value.requireIssueApproval;
if (
!requiresIssueApproval &&
diff --git a/frontend/src/components/Plan/components/RolloutView/TaskRolloutActionPanel.vue b/frontend/src/components/Plan/components/RolloutView/TaskRolloutActionPanel.vue
index 1998e170fe..9e57bfff81 100644
--- a/frontend/src/components/Plan/components/RolloutView/TaskRolloutActionPanel.vue
+++ b/frontend/src/components/Plan/components/RolloutView/TaskRolloutActionPanel.vue
@@ -277,10 +277,7 @@ import {
Issue_Approver_Status,
Issue_Type,
} from "@/types/proto-es/v1/issue_service_pb";
-import {
- PolicyType,
- RolloutPolicy_Checkers_PlanCheckEnforcement,
-} from "@/types/proto-es/v1/org_policy_service_pb";
+import { PolicyType } from "@/types/proto-es/v1/org_policy_service_pb";
import type {
BatchRunTasksRequest,
Stage,
@@ -329,6 +326,7 @@ const comment = ref("");
const runTimeInMS = ref<number | undefined>(undefined);
const bypassPolicyChecks = ref(false);
const { statusSummary: planCheckStatus } = usePlanCheckStatus(plan);
+const project = computed(() => projectOfPlan(plan.value));
// Check issue approval status using the review context
const issueApprovalStatus = computed(() => {
@@ -372,20 +370,14 @@ const shouldShowComment = computed(
() => props.action === "SKIP" && !isNullOrUndefined(issue?.value)
);
-// Plan check error validation based on rollout policy checkers
+// Plan check error validation based on project settings
const planCheckError = computed(() => {
if (props.action !== "RUN") {
return undefined;
}
- // Get the plan check enforcement level from the rollout policy
- const planCheckEnforcement =
- rolloutPolicy.value?.policy?.case === "rolloutPolicy"
- ? rolloutPolicy.value.policy.value.checkers?.requiredStatusChecks
- ?.planCheckEnforcement
- : undefined;
// If no enforcement is specified, default to no validation
- if (!planCheckEnforcement) {
+ if (!project.value || !project.value.requirePlanCheckNoError) {
return undefined;
}
@@ -394,27 +386,13 @@ const planCheckError = computed(() => {
"custom-approval.issue-review.disallow-approve-reason.some-task-checks-are-still-running"
);
}
- // ERROR_ONLY enforcement: only block on errors
- if (
- planCheckEnforcement ===
- RolloutPolicy_Checkers_PlanCheckEnforcement.ERROR_ONLY
- ) {
- if (planCheckStatus.value.error > 0) {
- return t(
- "custom-approval.issue-review.disallow-approve-reason.some-task-checks-didnt-pass"
- );
- }
- }
- // STRICT enforcement: block on both errors and warnings
- if (
- planCheckEnforcement === RolloutPolicy_Checkers_PlanCheckEnforcement.STRICT
- ) {
- if (planCheckStatus.value.error > 0 || planCheckStatus.value.warning > 0) {
- return t(
- "custom-approval.issue-review.disallow-approve-reason.some-task-checks-didnt-pass"
- );
- }
+
+ if (planCheckStatus.value.error > 0) {
+ return t(
+ "custom-approval.issue-review.disallow-approve-reason.some-task-checks-didnt-pass"
+ );
}
+
return undefined;
});
@@ -424,15 +402,8 @@ const planCheckWarning = computed(() => {
return undefined;
}
- // Get the plan check enforcement level from the rollout policy
- const planCheckEnforcement =
- rolloutPolicy.value?.policy?.case === "rolloutPolicy"
- ? rolloutPolicy.value.policy.value.checkers?.requiredStatusChecks
- ?.planCheckEnforcement
- : undefined;
-
- // If there's no enforcement policy, show any plan check issues as warnings
- if (!planCheckEnforcement) {
+ // If enforcement is disabled, show any plan check issues as warnings
+ if (!project.value || !project.value.requirePlanCheckNoError) {
if (planCheckStatus.value.running > 0) {
return t(
"custom-approval.issue-review.disallow-approve-reason.some-task-checks-are-still-running"
@@ -445,19 +416,6 @@ const planCheckWarning = computed(() => {
}
}
- // Show warnings for plan check results that don't violate enforcement policy
- if (
- planCheckEnforcement ===
- RolloutPolicy_Checkers_PlanCheckEnforcement.ERROR_ONLY
- ) {
- // Show warnings as non-blocking when ERROR_ONLY policy allows them
- if (planCheckStatus.value.warning > 0) {
- return t(
- "custom-approval.issue-review.disallow-approve-reason.some-task-checks-didnt-pass"
- );
- }
- }
-
return undefined;
});
@@ -508,9 +466,7 @@ const validationErrors = computed(() => {
// Issue approval errors (only if policy requires it) - HARD BLOCK
const requiresIssueApproval =
- rolloutPolicy.value?.policy?.case === "rolloutPolicy"
- ? rolloutPolicy.value.policy.value.checkers?.requiredIssueApproval
- : false;
+ project.value && project.value.requireIssueApproval;
if (
requiresIssueApproval &&
@@ -556,9 +512,7 @@ const validationWarnings = computed(() => {
// Issue approval warnings (when not required by policy but issue is not approved)
const requiresIssueApproval =
- rolloutPolicy.value?.policy?.case === "rolloutPolicy"
- ? rolloutPolicy.value.policy.value.checkers?.requiredIssueApproval
- : false;
+ project.value && project.value.requireIssueApproval;
if (
!requiresIssueApproval &&
diff --git a/frontend/src/components/Project/Settings/ProjectIssueRelatedSettingPanel.vue b/frontend/src/components/Project/Settings/ProjectIssueRelatedSettingPanel.vue
index 7575d5fb3b..dc7bfe99bb 100644
--- a/frontend/src/components/Project/Settings/ProjectIssueRelatedSettingPanel.vue
+++ b/frontend/src/components/Project/Settings/ProjectIssueRelatedSettingPanel.vue
@@ -147,6 +147,50 @@
}}
</div>
</div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.requireIssueApproval"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
+ {{
+ $t("project.settings.issue-related.require-issue-approval.self")
+ }}
+ </span>
+ </div>
+ <div class="mt-1 mb-3 text-sm text-gray-400">
+ {{
+ $t(
+ "project.settings.issue-related.require-issue-approval.description"
+ )
+ }}
+ </div>
+ </div>
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.requirePlanCheckNoError"
+ :text="true"
+ :disabled="!allowUpdateIssueProjectSetting || loading"
+ />
+ <span class="textlabel">
+ {{
+ $t(
+ "project.settings.issue-related.require-plan-check-no-error.self"
+ )
+ }}
+ </span>
+ </div>
+ <div class="mt-1 mb-3 text-sm text-gray-400">
+ {{
+ $t(
+ "project.settings.issue-related.require-plan-check-no-error.description"
+ )
+ }}
+ </div>
+ </div>
<div>
<div class="flex items-center gap-x-2">
<Switch
@@ -320,24 +364,54 @@ interface LocalState {
executionRetryPolicy: Project_ExecutionRetryPolicy | undefined;
ciSamplingSize: number;
parallelTasksPerRollout: number;
+ requireIssueApproval: boolean;
+ requirePlanCheckNoError: boolean;
}
const getInitialLocalState = (): LocalState => {
- const project = props.project;
+ if (!props.project) {
+ return {
+ issueLabels: [],
+ forceIssueLabels: false,
+ allowModifyStatement: false,
+ autoResolveIssue: false,
+ enforceIssueTitle: false,
+ enforceSqlReview: false,
+ autoEnableBackup: false,
+ skipBackupErrors: false,
+ postgresDatabaseTenantMode: false,
+ allowSelfApproval: false,
+ executionRetryPolicy: createProto(Project_ExecutionRetryPolicySchema, {
+ maximumRetries: 0,
+ }),
+ ciSamplingSize: 0,
+ parallelTasksPerRollout: 1,
+ requireIssueApproval: false,
+ requirePlanCheckNoError: false,
+ };
+ }
return {
- issueLabels: [...cloneDeep(project.issueLabels)],
- enforceSqlReview: project.enforceSqlReview,
- allowModifyStatement: project.allowModifyStatement,
- autoResolveIssue: project.autoResolveIssue,
- forceIssueLabels: project.forceIssueLabels,
- enforceIssueTitle: project.enforceIssueTitle,
- allowSelfApproval: project.allowSelfApproval,
- autoEnableBackup: project.autoEnableBackup,
- skipBackupErrors: project.skipBackupErrors,
- postgresDatabaseTenantMode: project.postgresDatabaseTenantMode,
- executionRetryPolicy: project.executionRetryPolicy,
- ciSamplingSize: project.ciSamplingSize,
- parallelTasksPerRollout: project.parallelTasksPerRollout,
+ issueLabels: props.project.issueLabels,
+ forceIssueLabels: props.project.forceIssueLabels,
+ allowModifyStatement: props.project.allowModifyStatement,
+ autoResolveIssue: props.project.autoResolveIssue,
+ enforceIssueTitle: props.project.enforceIssueTitle,
+ enforceSqlReview: props.project.enforceSqlReview,
+ autoEnableBackup: props.project.autoEnableBackup,
+ skipBackupErrors: props.project.skipBackupErrors,
+ postgresDatabaseTenantMode: props.project.postgresDatabaseTenantMode,
+ allowSelfApproval: props.project.allowSelfApproval,
+ executionRetryPolicy: props.project.executionRetryPolicy
+ ? createProto(Project_ExecutionRetryPolicySchema, {
+ maximumRetries: props.project.executionRetryPolicy.maximumRetries,
+ })
+ : createProto(Project_ExecutionRetryPolicySchema, {
+ maximumRetries: 0,
+ }),
+ ciSamplingSize: props.project.ciSamplingSize,
+ parallelTasksPerRollout: props.project.parallelTasksPerRollout,
+ requireIssueApproval: props.project.requireIssueApproval,
+ requirePlanCheckNoError: props.project.requirePlanCheckNoError,
};
};
@@ -492,6 +566,12 @@ const updateMask = computed(() => {
) {
mask.push("parallel_tasks_per_rollout");
}
+ if (state.requireIssueApproval !== props.project.requireIssueApproval) {
+ mask.push("require_issue_approval");
+ }
+ if (state.requirePlanCheckNoError !== props.project.requirePlanCheckNoError) {
+ mask.push("require_plan_check_no_error");
+ }
return mask;
});
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 9e39ec996d..f1df2c0124 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -1621,26 +1621,7 @@
"tip": "The policy is applied to issues retroactively.",
"info": "Tasks can be executed by users with '{permission}' permission or the following roles.",
"auto": "Automatic",
- "auto-info": "If all check pass, the change will be rolled out and executed automatically.",
- "checkers": {
- "self": "Requirements",
- "required-issue-approval": {
- "self": "Require Issue Approval",
- "description": "Issue must be approved before rollout can proceed."
- },
- "plan-check-enforcement": {
- "self": "Plan Check Enforcement",
- "description": "Block rollout based on plan check results.",
- "error-only": {
- "self": "Block on Errors Only",
- "description": "Block rollout only when plan check finds errors."
- },
- "strict": {
- "self": "Strict Enforcement",
- "description": "Block rollout when plan check finds errors or warnings."
- }
- }
- }
+ "auto-info": "If all check pass, the change will be rolled out and executed automatically."
},
"environment-tier": {
"name": "Environment Tier",
@@ -1968,6 +1949,14 @@
"parallel_tasks_per_rollout": {
"self": "Parallel tasks per rollout",
"description": "Control the number of parallel tasks per rollout. Setting this to zero disables any throttling."
+ },
+ "require-issue-approval": {
+ "self": "Require issue approval",
+ "description": "Issue must be approved before rollout."
+ },
+ "require-plan-check-no-error": {
+ "self": "Require plan check no error",
+ "description": "Block rollout if plan check has errors."
}
},
"project-labels": {
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 0befdf2a0e..1635ae2fc4 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -1621,26 +1621,7 @@
"tip": "La política se aplica retrospectivamente a las incidencias.",
"info": "Las tareas pueden ser ejecutadas por usuarios con el permiso '{permission}' o los siguientes roles.",
"auto": "Automático",
- "auto-info": "Si se aprueban todas las comprobaciones, el cambio se implementará y ejecutará automáticamente.",
- "checkers": {
- "self": "Requisitos",
- "required-issue-approval": {
- "self": "Requerir aprobación de emisión",
- "description": "El problema debe ser aprobado antes de que pueda continuar la implementación."
- },
- "plan-check-enforcement": {
- "self": "Control de cumplimiento del plan",
- "description": "Implementación de bloques según los resultados de la verificación del plan.",
- "error-only": {
- "self": "Bloquear solo errores",
- "description": "Bloquear la implementación solo cuando la verificación del plan encuentre errores."
- },
- "strict": {
- "self": "Aplicación estricta",
- "description": "Bloquear la implementación cuando la verificación del plan encuentra errores o advertencias."
- }
- }
- }
+ "auto-info": "Si se aprueban todas las comprobaciones, el cambio se implementará y ejecutará automáticamente."
},
"environment-tier": {
"name": "Nivel de Entorno",
@@ -1968,6 +1949,14 @@
"parallel_tasks_per_rollout": {
"self": "Tareas paralelas por despliegue",
"description": "Controle el número de tareas paralelas por despliegue. \nEstablecer esto en cero deshabilita cualquier estrangulamiento."
+ },
+ "require-issue-approval": {
+ "self": "Require issue approval",
+ "description": "Issue must be approved before rollout."
+ },
+ "require-plan-check-no-error": {
+ "self": "Require plan check no error",
+ "description": "Block rollout if plan check has errors."
}
},
"project-labels": {
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index cd1ff79c02..2f5bdf7974 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -1621,26 +1621,7 @@
"tip": "新しいポリシーは古いイシューにも適用されます",
"info": "タスクは、「{permission}」許可または次の役割でユーザーが実行できます。",
"auto": "自動",
- "auto-info": "すべての事前チェックに合格すると、自動的にリリースされ、変更が反映されます。",
- "checkers": {
- "self": "要件",
- "required-issue-approval": {
- "self": "問題の承認が必要",
- "description": "ロールアウトを続行する前に、問題を承認する必要があります。"
- },
- "plan-check-enforcement": {
- "self": "計画チェックの実施",
- "description": "計画チェック結果に基づいてブロックのロールアウトを行います。",
- "error-only": {
- "self": "エラーのみブロック",
- "description": "計画チェックでエラーが見つかった場合のみロールアウトをブロックします。"
- },
- "strict": {
- "self": "厳格な施行",
- "description": "計画チェックでエラーまたは警告が見つかった場合は、ロールアウトをブロックします。"
- }
- }
- }
+ "auto-info": "すべての事前チェックに合格すると、自動的にリリースされ、変更が反映されます。"
},
"environment-tier": {
"name": "環境レベル",
@@ -1968,6 +1949,14 @@
"parallel_tasks_per_rollout": {
"self": "ロールアウトごとの並列タスク",
"description": "ロールアウトあたりの並列タスクの数を制御します。\nこれをゼロに設定すると、スロットリングが無効になります。"
+ },
+ "require-issue-approval": {
+ "self": "Require issue approval",
+ "description": "Issue must be approved before rollout."
+ },
+ "require-plan-check-no-error": {
+ "self": "Require plan check no error",
+ "description": "Block rollout if plan check has errors."
}
},
"project-labels": {
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 3473c0761f..417781c6f9 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -1621,26 +1621,7 @@
"tip": "Chính sách được áp dụng cho các vấn đề hồi tố.",
"info": "Các tác vụ có thể được thực hiện bởi người dùng có quyền 'taskRuns.Create' hoặc các vai trò sau.",
"auto": "Triển khai tự động",
- "auto-info": "Nếu tất cả kiểm tra vượt qua, thay đổi sẽ được triển khai và thực hiện tự động.",
- "checkers": {
- "self": "Yêu cầu",
- "required-issue-approval": {
- "self": "Yêu cầu phê duyệt vấn đề",
- "description": "Vấn đề phải được chấp thuận trước khi triển khai."
- },
- "plan-check-enforcement": {
- "self": "Kiểm tra kế hoạch thực thi",
- "description": "Triển khai theo khối dựa trên kết quả kiểm tra kế hoạch.",
- "error-only": {
- "self": "Chỉ chặn lỗi",
- "description": "Chỉ chặn triển khai khi kiểm tra kế hoạch phát hiện lỗi."
- },
- "strict": {
- "self": "Thực thi nghiêm ngặt",
- "description": "Chặn triển khai khi kiểm tra kế hoạch phát hiện lỗi hoặc cảnh báo."
- }
- }
- }
+ "auto-info": "Nếu tất cả kiểm tra vượt qua, thay đổi sẽ được triển khai và thực hiện tự động."
},
"environment-tier": {
"name": "Cấp môi trường",
@@ -1968,6 +1949,14 @@
"parallel_tasks_per_rollout": {
"self": "Nhiệm vụ song song cho mỗi lần triển khai",
"description": "Kiểm soát số lượng các tác vụ song song cho mỗi lần triển khai. \nĐặt điều này thành 0 vô hiệu hóa bất kỳ điều chỉnh."
+ },
+ "require-issue-approval": {
+ "self": "Require issue approval",
+ "description": "Issue must be approved before rollout."
+ },
+ "require-plan-check-no-error": {
+ "self": "Require plan check no error",
+ "description": "Block rollout if plan check has errors."
}
},
"project-labels": {
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 732816526c..bcb18e4140 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -1621,26 +1621,7 @@
"tip": "新策略对旧工单也生效",
"info": "拥有 “{permission}” 权限或以下角色的用户可以发布。",
"auto": "自动发布",
- "auto-info": "如果预检查都通过的话,会自动发布,执行变更。",
- "checkers": {
- "self": "控制项",
- "required-issue-approval": {
- "self": "工单需要通过审批",
- "description": "工单必须先通过审批,才能继续发布任务。"
- },
- "plan-check-enforcement": {
- "self": "任务检查结果控制",
- "description": "根据任务检查的结果来控制能否发布。",
- "error-only": {
- "self": "仅在错误时阻止",
- "description": "仅当任务检查发现错误时阻止发布。"
- },
- "strict": {
- "self": "严格模式",
- "description": "当任务检查发现错误或警告时均阻止发布。"
- }
- }
- }
+ "auto-info": "如果预检查都通过的话,会自动发布,执行变更。"
},
"environment-tier": {
"name": "环境级别",
@@ -1968,6 +1949,14 @@
"parallel_tasks_per_rollout": {
"self": "每个发布的并行任务数",
"description": "控制每个发布的并行任务数量。\n将其设置为零,可以禁用任何节流。"
+ },
+ "require-issue-approval": {
+ "self": "Require issue approval",
+ "description": "Issue must be approved before rollout."
+ },
+ "require-plan-check-no-error": {
+ "self": "Require plan check no error",
+ "description": "Block rollout if plan check has errors."
}
},
"project-labels": {
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.ts
index 0164cdf248..5540520769 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
@@ -596,6 +596,20 @@ export declare type Project = Message<"bytebase.v1.Project"> & {
* @generated from field: bool enforce_sql_review = 26;
*/
enforceSqlReview: boolean;
+
+ /**
+ * Whether to require issue approval before rollout.
+ *
+ * @generated from field: bool require_issue_approval = 27;
+ */
+ requireIssueApproval: boolean;
+
+ /**
+ * Whether to require plan check to have no error before rollout.
+ *
+ * @generated from field: bool require_plan_check_no_error = 28;
+ */
+ requirePlanCheckNoError: boolean;
};
/**
diff --git a/frontend/src/types/proto-es/v1/project_service_pb.js b/frontend/src/types/proto-es/v1/project_service_pb.js
index ab9403220e..6b3c057947 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("Chh2MS9wcm9qZWN0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIj8KEUdldFByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiYgoTTGlzdFByb2plY3RzUmVxdWVzdBIRCglwYWdlX3NpemUYASABKAUSEgoKcGFnZV90b2tlbhgCIAEoCRIUCgxzaG93X2RlbGV0ZWQYAyABKAgSDgoGZmlsdGVyGAQgASgJIlcKFExpc3RQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiZAoVU2VhcmNoUHJvamVjdHNSZXF1ZXN0EhQKDHNob3dfZGVsZXRlZBgBIAEoCBIOCgZmaWx0ZXIYAiABKAkSEQoJcGFnZV9zaXplGAMgASgFEhIKCnBhZ2VfdG9rZW4YBCABKAkiWQoWU2VhcmNoUHJvamVjdHNSZXNwb25zZRImCghwcm9qZWN0cxgBIAMoCzIULmJ5dGViYXNlLnYxLlByb2plY3QSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIlYKFENyZWF0ZVByb2plY3RSZXF1ZXN0EioKB3Byb2plY3QYASABKAsyFC5ieXRlYmFzZS52MS5Qcm9qZWN0QgPgQQISEgoKcHJvamVjdF9pZBgCIAEoCSKKAQoUVXBkYXRlUHJvamVjdFJlcXVlc3QSKgoHcHJvamVjdBgBIAEoCzIULmJ5dGViYXNlLnYxLlByb2plY3RCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJgChREZWxldGVQcm9qZWN0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg0KBWZvcmNlGAIgASgIEg0KBXB1cmdlGAMgASgIIkQKFlVuZGVsZXRlUHJvamVjdFJlcXVlc3QSKgoEbmFtZRgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdCJYChpCYXRjaERlbGV0ZVByb2plY3RzUmVxdWVzdBIrCgVuYW1lcxgBIAMoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBINCgVmb3JjZRgCIAEoCCI9ChhCYXRjaEdldElhbVBvbGljeVJlcXVlc3QSEgoFc2NvcGUYASABKAlCA+BBAhINCgVuYW1lcxgCIAMoCSKxAQoZQmF0Y2hHZXRJYW1Qb2xpY3lSZXNwb25zZRJLCg5wb2xpY3lfcmVzdWx0cxgBIAMoCzIzLmJ5dGViYXNlLnYxLkJhdGNoR2V0SWFtUG9saWN5UmVzcG9uc2UuUG9saWN5UmVzdWx0GkcKDFBvbGljeVJlc3VsdBIPCgdwcm9qZWN0GAEgASgJEiYKBnBvbGljeRgCIAEoCzIWLmJ5dGViYXNlLnYxLklhbVBvbGljeSI0CgVMYWJlbBINCgV2YWx1ZRgBIAEoCRINCgVjb2xvchgCIAEoCRINCgVncm91cBgDIAEoCSKpBgoHUHJvamVjdBIMCgRuYW1lGAEgASgJEiEKBXN0YXRlGAMgASgOMhIuYnl0ZWJhc2UudjEuU3RhdGUSFwoFdGl0bGUYBCABKAlCCLpIBXIDGMgBEiYKCHdlYmhvb2tzGAsgAygLMhQuYnl0ZWJhc2UudjEuV2ViaG9vaxIlCh1kYXRhX2NsYXNzaWZpY2F0aW9uX2NvbmZpZ19pZBgMIAEoCRIoCgxpc3N1ZV9sYWJlbHMYDSADKAsyEi5ieXRlYmFzZS52MS5MYWJlbBIaChJmb3JjZV9pc3N1ZV9sYWJlbHMYDiABKAgSHgoWYWxsb3dfbW9kaWZ5X3N0YXRlbWVudBgPIAEoCBIaChJhdXRvX3Jlc29sdmVfaXNzdWUYECABKAgSGwoTZW5mb3JjZV9pc3N1ZV90aXRsZRgRIAEoCBIaChJhdXRvX2VuYWJsZV9iYWNrdXAYEiABKAgSGgoSc2tpcF9iYWNrdXBfZXJyb3JzGBMgASgIEiUKHXBvc3RncmVzX2RhdGFiYXNlX3RlbmFudF9tb2RlGBQgASgIEhsKE2FsbG93X3NlbGZfYXBwcm92YWwYFSABKAgSSQoWZXhlY3V0aW9uX3JldHJ5X3BvbGljeRgWIAEoCzIpLmJ5dGViYXNlLnYxLlByb2plY3QuRXhlY3V0aW9uUmV0cnlQb2xpY3kSGAoQY2lfc2FtcGxpbmdfc2l6ZRgXIAEoBRIiChpwYXJhbGxlbF90YXNrc19wZXJfcm9sbG91dBgYIAEoBRIwCgZsYWJlbHMYGSADKAsyIC5ieXRlYmFzZS52MS5Qcm9qZWN0LkxhYmVsc0VudHJ5EhoKEmVuZm9yY2Vfc3FsX3JldmlldxgaIAEoCBovChRFeGVjdXRpb25SZXRyeVBvbGljeRIXCg9tYXhpbXVtX3JldHJpZXMYASABKAUaLQoLTGFiZWxzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ATot6kEqChRieXRlYmFzZS5jb20vUHJvamVjdBIScHJvamVjdHMve3Byb2plY3R9SgQIAhADIm4KEUFkZFdlYmhvb2tSZXF1ZXN0Ei0KB3Byb2plY3QYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSKgoHd2ViaG9vaxgCIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAiKKAQoUVXBkYXRlV2ViaG9va1JlcXVlc3QSKgoHd2ViaG9vaxgBIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJCChRSZW1vdmVXZWJob29rUmVxdWVzdBIqCgd3ZWJob29rGAEgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECIm8KElRlc3RXZWJob29rUmVxdWVzdBItCgdwcm9qZWN0GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EioKB3dlYmhvb2sYAiABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQIiJAoTVGVzdFdlYmhvb2tSZXNwb25zZRINCgVlcnJvchgBIAEoCSKBAgoHV2ViaG9vaxIMCgRuYW1lGAEgASgJEisKBHR5cGUYAiABKA4yGC5ieXRlYmFzZS52MS5XZWJob29rVHlwZUID4EECEhIKBXRpdGxlGAMgASgJQgPgQQISEAoDdXJsGAQgASgJQgPgQQISFgoOZGlyZWN0X21lc3NhZ2UYBiABKAgSOwoSbm90aWZpY2F0aW9uX3R5cGVzGAUgAygOMhouYnl0ZWJhc2UudjEuQWN0aXZpdHkuVHlwZUID4EEGOkDqQT0KFGJ5dGViYXNlLmNvbS9XZWJob29rEiVwcm9qZWN0cy97cHJvamVjdH0vd2ViaG9va3Mve3dlYmhvb2t9IqwCCghBY3Rpdml0eSKfAgoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASGQoVTk9USUZZX0lTU1VFX0FQUFJPVkVEEBcSGwoXTk9USUZZX1BJUEVMSU5FX1JPTExPVVQQGBIQCgxJU1NVRV9DUkVBVEUQARIYChRJU1NVRV9DT01NRU5UX0NSRUFURRACEhYKEklTU1VFX0ZJRUxEX1VQREFURRADEhcKE0lTU1VFX1NUQVRVU19VUERBVEUQBBIZChVJU1NVRV9BUFBST1ZBTF9OT1RJRlkQFRImCiJJU1NVRV9QSVBFTElORV9TVEFHRV9TVEFUVVNfVVBEQVRFEAUSKQolSVNTVUVfUElQRUxJTkVfVEFTS19SVU5fU1RBVFVTX1VQREFURRAWMp0SCg5Qcm9qZWN0U2VydmljZRJ/CgpHZXRQcm9qZWN0Eh4uYnl0ZWJhc2UudjEuR2V0UHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IjvaQQRuYW1liuowD2JiLnByb2plY3RzLmdldJDqMAGC0+STAhcSFS92MS97bmFtZT1wcm9qZWN0cy8qfRKEAQoMTGlzdFByb2plY3RzEiAuYnl0ZWJhc2UudjEuTGlzdFByb2plY3RzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RQcm9qZWN0c1Jlc3BvbnNlIi/aQQCK6jAQYmIucHJvamVjdHMubGlzdJDqMAGC0+STAg4SDC92MS9wcm9qZWN0cxKAAQoOU2VhcmNoUHJvamVjdHMSIi5ieXRlYmFzZS52MS5TZWFyY2hQcm9qZWN0c1JlcXVlc3QaIy5ieXRlYmFzZS52MS5TZWFyY2hQcm9qZWN0c1Jlc3BvbnNlIiXaQQCQ6jACgtPkkwIYOgEqIhMvdjEvcHJvamVjdHM6c2VhcmNoEoQBCg1DcmVhdGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuQ3JlYXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IjraQQCK6jASYmIucHJvamVjdHMuY3JlYXRlkOowAYLT5JMCFzoHcHJvamVjdCIML3YxL3Byb2plY3RzEqgBCg1VcGRhdGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuVXBkYXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0Il7aQRNwcm9qZWN0LHVwZGF0ZV9tYXNriuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAig6B3Byb2plY3QyHS92MS97cHJvamVjdC5uYW1lPXByb2plY3RzLyp9Eo4BCg1EZWxldGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuRGVsZXRlUHJvamVjdFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiQtpBBG5hbWWK6jASYmIucHJvamVjdHMuZGVsZXRlkOowAZjqMAGC0+STAhcqFS92MS97bmFtZT1wcm9qZWN0cy8qfRKXAQoPVW5kZWxldGVQcm9qZWN0EiMuYnl0ZWJhc2UudjEuVW5kZWxldGVQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiSYrqMBRiYi5wcm9qZWN0cy51bmRlbGV0ZZDqMAGY6jABgtPkkwIjOgEqIh4vdjEve25hbWU9cHJvamVjdHMvKn06dW5kZWxldGUSmQEKE0JhdGNoRGVsZXRlUHJvamVjdHMSJy5ieXRlYmFzZS52MS5CYXRjaERlbGV0ZVByb2plY3RzUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSJBiuowEmJiLnByb2plY3RzLmRlbGV0ZZDqMAGY6jABgtPkkwIdOgEqIhgvdjEvcHJvamVjdHM6YmF0Y2hEZWxldGUSmAEKDEdldElhbVBvbGljeRIgLmJ5dGViYXNlLnYxLkdldElhbVBvbGljeVJlcXVlc3QaFi5ieXRlYmFzZS52MS5JYW1Qb2xpY3kiTorqMBhiYi5wcm9qZWN0cy5nZXRJYW1Qb2xpY3mQ6jABgtPkkwIoEiYvdjEve3Jlc291cmNlPXByb2plY3RzLyp9OmdldElhbVBvbGljeRKwAQoRQmF0Y2hHZXRJYW1Qb2xpY3kSJS5ieXRlYmFzZS52MS5CYXRjaEdldElhbVBvbGljeVJlcXVlc3QaJi5ieXRlYmFzZS52MS5CYXRjaEdldElhbVBvbGljeVJlc3BvbnNlIkyK6jAYYmIucHJvamVjdHMuZ2V0SWFtUG9saWN5kOowAoLT5JMCJhIkL3YxL3tzY29wZT0qLyp9L2lhbVBvbGljaWVzOmJhdGNoR2V0Ep8BCgxTZXRJYW1Qb2xpY3kSIC5ieXRlYmFzZS52MS5TZXRJYW1Qb2xpY3lSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuSWFtUG9saWN5IlWK6jAYYmIucHJvamVjdHMuc2V0SWFtUG9saWN5kOowAZjqMAGC0+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("Chh2MS9wcm9qZWN0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIj8KEUdldFByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiYgoTTGlzdFByb2plY3RzUmVxdWVzdBIRCglwYWdlX3NpemUYASABKAUSEgoKcGFnZV90b2tlbhgCIAEoCRIUCgxzaG93X2RlbGV0ZWQYAyABKAgSDgoGZmlsdGVyGAQgASgJIlcKFExpc3RQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiZAoVU2VhcmNoUHJvamVjdHNSZXF1ZXN0EhQKDHNob3dfZGVsZXRlZBgBIAEoCBIOCgZmaWx0ZXIYAiABKAkSEQoJcGFnZV9zaXplGAMgASgFEhIKCnBhZ2VfdG9rZW4YBCABKAkiWQoWU2VhcmNoUHJvamVjdHNSZXNwb25zZRImCghwcm9qZWN0cxgBIAMoCzIULmJ5dGViYXNlLnYxLlByb2plY3QSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIlYKFENyZWF0ZVByb2plY3RSZXF1ZXN0EioKB3Byb2plY3QYASABKAsyFC5ieXRlYmFzZS52MS5Qcm9qZWN0QgPgQQISEgoKcHJvamVjdF9pZBgCIAEoCSKKAQoUVXBkYXRlUHJvamVjdFJlcXVlc3QSKgoHcHJvamVjdBgBIAEoCzIULmJ5dGViYXNlLnYxLlByb2plY3RCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJgChREZWxldGVQcm9qZWN0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg0KBWZvcmNlGAIgASgIEg0KBXB1cmdlGAMgASgIIkQKFlVuZGVsZXRlUHJvamVjdFJlcXVlc3QSKgoEbmFtZRgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdCJYChpCYXRjaERlbGV0ZVByb2plY3RzUmVxdWVzdBIrCgVuYW1lcxgBIAMoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBINCgVmb3JjZRgCIAEoCCI9ChhCYXRjaEdldElhbVBvbGljeVJlcXVlc3QSEgoFc2NvcGUYASABKAlCA+BBAhINCgVuYW1lcxgCIAMoCSKxAQoZQmF0Y2hHZXRJYW1Qb2xpY3lSZXNwb25zZRJLCg5wb2xpY3lfcmVzdWx0cxgBIAMoCzIzLmJ5dGViYXNlLnYxLkJhdGNoR2V0SWFtUG9saWN5UmVzcG9uc2UuUG9saWN5UmVzdWx0GkcKDFBvbGljeVJlc3VsdBIPCgdwcm9qZWN0GAEgASgJEiYKBnBvbGljeRgCIAEoCzIWLmJ5dGViYXNlLnYxLklhbVBvbGljeSI0CgVMYWJlbBINCgV2YWx1ZRgBIAEoCRINCgVjb2xvchgCIAEoCRINCgVncm91cBgDIAEoCSLuBgoHUHJvamVjdBIMCgRuYW1lGAEgASgJEiEKBXN0YXRlGAMgASgOMhIuYnl0ZWJhc2UudjEuU3RhdGUSFwoFdGl0bGUYBCABKAlCCLpIBXIDGMgBEiYKCHdlYmhvb2tzGAsgAygLMhQuYnl0ZWJhc2UudjEuV2ViaG9vaxIlCh1kYXRhX2NsYXNzaWZpY2F0aW9uX2NvbmZpZ19pZBgMIAEoCRIoCgxpc3N1ZV9sYWJlbHMYDSADKAsyEi5ieXRlYmFzZS52MS5MYWJlbBIaChJmb3JjZV9pc3N1ZV9sYWJlbHMYDiABKAgSHgoWYWxsb3dfbW9kaWZ5X3N0YXRlbWVudBgPIAEoCBIaChJhdXRvX3Jlc29sdmVfaXNzdWUYECABKAgSGwoTZW5mb3JjZV9pc3N1ZV90aXRsZRgRIAEoCBIaChJhdXRvX2VuYWJsZV9iYWNrdXAYEiABKAgSGgoSc2tpcF9iYWNrdXBfZXJyb3JzGBMgASgIEiUKHXBvc3RncmVzX2RhdGFiYXNlX3RlbmFudF9tb2RlGBQgASgIEhsKE2FsbG93X3NlbGZfYXBwcm92YWwYFSABKAgSSQoWZXhlY3V0aW9uX3JldHJ5X3BvbGljeRgWIAEoCzIpLmJ5dGViYXNlLnYxLlByb2plY3QuRXhlY3V0aW9uUmV0cnlQb2xpY3kSGAoQY2lfc2FtcGxpbmdfc2l6ZRgXIAEoBRIiChpwYXJhbGxlbF90YXNrc19wZXJfcm9sbG91dBgYIAEoBRIwCgZsYWJlbHMYGSADKAsyIC5ieXRlYmFzZS52MS5Qcm9qZWN0LkxhYmVsc0VudHJ5EhoKEmVuZm9yY2Vfc3FsX3JldmlldxgaIAEoCBIeChZyZXF1aXJlX2lzc3VlX2FwcHJvdmFsGBsgASgIEiMKG3JlcXVpcmVfcGxhbl9jaGVja19ub19lcnJvchgcIAEoCBovChRFeGVjdXRpb25SZXRyeVBvbGljeRIXCg9tYXhpbXVtX3JldHJpZXMYASABKAUaLQoLTGFiZWxzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ATot6kEqChRieXRlYmFzZS5jb20vUHJvamVjdBIScHJvamVjdHMve3Byb2plY3R9SgQIAhADIm4KEUFkZFdlYmhvb2tSZXF1ZXN0Ei0KB3Byb2plY3QYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSKgoHd2ViaG9vaxgCIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAiKKAQoUVXBkYXRlV2ViaG9va1JlcXVlc3QSKgoHd2ViaG9vaxgBIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJCChRSZW1vdmVXZWJob29rUmVxdWVzdBIqCgd3ZWJob29rGAEgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECIm8KElRlc3RXZWJob29rUmVxdWVzdBItCgdwcm9qZWN0GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EioKB3dlYmhvb2sYAiABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQIiJAoTVGVzdFdlYmhvb2tSZXNwb25zZRINCgVlcnJvchgBIAEoCSKBAgoHV2ViaG9vaxIMCgRuYW1lGAEgASgJEisKBHR5cGUYAiABKA4yGC5ieXRlYmFzZS52MS5XZWJob29rVHlwZUID4EECEhIKBXRpdGxlGAMgASgJQgPgQQISEAoDdXJsGAQgASgJQgPgQQISFgoOZGlyZWN0X21lc3NhZ2UYBiABKAgSOwoSbm90aWZpY2F0aW9uX3R5cGVzGAUgAygOMhouYnl0ZWJhc2UudjEuQWN0aXZpdHkuVHlwZUID4EEGOkDqQT0KFGJ5dGViYXNlLmNvbS9XZWJob29rEiVwcm9qZWN0cy97cHJvamVjdH0vd2ViaG9va3Mve3dlYmhvb2t9IqwCCghBY3Rpdml0eSKfAgoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASGQoVTk9USUZZX0lTU1VFX0FQUFJPVkVEEBcSGwoXTk9USUZZX1BJUEVMSU5FX1JPTExPVVQQGBIQCgxJU1NVRV9DUkVBVEUQARIYChRJU1NVRV9DT01NRU5UX0NSRUFURRACEhYKEklTU1VFX0ZJRUxEX1VQREFURRADEhcKE0lTU1VFX1NUQVRVU19VUERBVEUQBBIZChVJU1NVRV9BUFBST1ZBTF9OT1RJRlkQFRImCiJJU1NVRV9QSVBFTElORV9TVEFHRV9TVEFUVVNfVVBEQVRFEAUSKQolSVNTVUVfUElQRUxJTkVfVEFTS19SVU5fU1RBVFVTX1VQREFURRAWMp0SCg5Qcm9qZWN0U2VydmljZRJ/CgpHZXRQcm9qZWN0Eh4uYnl0ZWJhc2UudjEuR2V0UHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IjvaQQRuYW1liuowD2JiLnByb2plY3RzLmdldJDqMAGC0+STAhcSFS92MS97bmFtZT1wcm9qZWN0cy8qfRKEAQoMTGlzdFByb2plY3RzEiAuYnl0ZWJhc2UudjEuTGlzdFByb2plY3RzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RQcm9qZWN0c1Jlc3BvbnNlIi/aQQCK6jAQYmIucHJvamVjdHMubGlzdJDqMAGC0+STAg4SDC92MS9wcm9qZWN0cxKAAQoOU2VhcmNoUHJvamVjdHMSIi5ieXRlYmFzZS52MS5TZWFyY2hQcm9qZWN0c1JlcXVlc3QaIy5ieXRlYmFzZS52MS5TZWFyY2hQcm9qZWN0c1Jlc3BvbnNlIiXaQQCQ6jACgtPkkwIYOgEqIhMvdjEvcHJvamVjdHM6c2VhcmNoEoQBCg1DcmVhdGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuQ3JlYXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IjraQQCK6jASYmIucHJvamVjdHMuY3JlYXRlkOowAYLT5JMCFzoHcHJvamVjdCIML3YxL3Byb2plY3RzEqgBCg1VcGRhdGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuVXBkYXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0Il7aQRNwcm9qZWN0LHVwZGF0ZV9tYXNriuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAig6B3Byb2plY3QyHS92MS97cHJvamVjdC5uYW1lPXByb2plY3RzLyp9Eo4BCg1EZWxldGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuRGVsZXRlUHJvamVjdFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiQtpBBG5hbWWK6jASYmIucHJvamVjdHMuZGVsZXRlkOowAZjqMAGC0+STAhcqFS92MS97bmFtZT1wcm9qZWN0cy8qfRKXAQoPVW5kZWxldGVQcm9qZWN0EiMuYnl0ZWJhc2UudjEuVW5kZWxldGVQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiSYrqMBRiYi5wcm9qZWN0cy51bmRlbGV0ZZDqMAGY6jABgtPkkwIjOgEqIh4vdjEve25hbWU9cHJvamVjdHMvKn06dW5kZWxldGUSmQEKE0JhdGNoRGVsZXRlUHJvamVjdHMSJy5ieXRlYmFzZS52MS5CYXRjaERlbGV0ZVByb2plY3RzUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSJBiuowEmJiLnByb2plY3RzLmRlbGV0ZZDqMAGY6jABgtPkkwIdOgEqIhgvdjEvcHJvamVjdHM6YmF0Y2hEZWxldGUSmAEKDEdldElhbVBvbGljeRIgLmJ5dGViYXNlLnYxLkdldElhbVBvbGljeVJlcXVlc3QaFi5ieXRlYmFzZS52MS5JYW1Qb2xpY3kiTorqMBhiYi5wcm9qZWN0cy5nZXRJYW1Qb2xpY3mQ6jABgtPkkwIoEiYvdjEve3Jlc291cmNlPXByb2plY3RzLyp9OmdldElhbVBvbGljeRKwAQoRQmF0Y2hHZXRJYW1Qb2xpY3kSJS5ieXRlYmFzZS52MS5CYXRjaEdldElhbVBvbGljeVJlcXVlc3QaJi5ieXRlYmFzZS52MS5CYXRjaEdldElhbVBvbGljeVJlc3BvbnNlIkyK6jAYYmIucHJvamVjdHMuZ2V0SWFtUG9saWN5kOowAoLT5JMCJhIkL3YxL3tzY29wZT0qLyp9L2lhbVBvbGljaWVzOmJhdGNoR2V0Ep8BCgxTZXRJYW1Qb2xpY3kSIC5ieXRlYmFzZS52MS5TZXRJYW1Qb2xpY3lSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuSWFtUG9saWN5IlWK6jAYYmIucHJvamVjdHMuc2V0SWFtUG9saWN5kOowAZjqMAGC0+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]);
/**
* Describes the message bytebase.v1.GetProjectRequest.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index fd6e98f331..e16d557165 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -12583,6 +12583,12 @@ components:
description: |-
Whether to enforce SQL review checks to pass before issue creation.
If enabled, issues cannot be created when SQL review finds errors.
+ requireIssueApproval:
+ type: boolean
+ description: Whether to require issue approval before rollout.
+ requirePlanCheckNoError:
+ type: boolean
+ description: Whether to require plan check to have no error before rollout.
Project_ExecutionRetryPolicy:
type: object
properties:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 5c6d5a945b..0a17f42d29 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -212,8 +212,6 @@
- [Policy](#bytebase-store-Policy)
- [QueryDataPolicy](#bytebase-store-QueryDataPolicy)
- [RolloutPolicy](#bytebase-store-RolloutPolicy)
- - [RolloutPolicy.Checkers](#bytebase-store-RolloutPolicy-Checkers)
- - [RolloutPolicy.Checkers.RequiredStatusChecks](#bytebase-store-RolloutPolicy-Checkers-RequiredStatusChecks)
- [TagPolicy](#bytebase-store-TagPolicy)
- [TagPolicy.TagsEntry](#bytebase-store-TagPolicy-TagsEntry)
@@ -222,7 +220,6 @@
- [MaskingExceptionPolicy.MaskingException.Action](#bytebase-store-MaskingExceptionPolicy-MaskingException-Action)
- [Policy.Resource](#bytebase-store-Policy-Resource)
- [Policy.Type](#bytebase-store-Policy-Type)
- - [RolloutPolicy.Checkers.PlanCheckEnforcement](#bytebase-store-RolloutPolicy-Checkers-PlanCheckEnforcement)
- [store/project.proto](#store_project-proto)
- [Label](#bytebase-store-Label)
@@ -3602,38 +3599,6 @@ QueryDataPolicy is the policy configuration for querying data.
| ----- | ---- | ----- | ----------- |
| automatic | [bool](#bool) | | |
| roles | [string](#string) | repeated | |
-| checkers | [RolloutPolicy.Checkers](#bytebase-store-RolloutPolicy-Checkers) | | Checkers that must pass before rollout execution. These checks are performed in UI workflows only. |
-
-
-
-
-
-
-<a name="bytebase-store-RolloutPolicy-Checkers"></a>
-
-### RolloutPolicy.Checkers
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| required_issue_approval | [bool](#bool) | | Whether issue approval is required before proceeding with rollout. |
-| required_status_checks | [RolloutPolicy.Checkers.RequiredStatusChecks](#bytebase-store-RolloutPolicy-Checkers-RequiredStatusChecks) | | Status checks that must pass before rollout can be executed. |
-
-
-
-
-
-
-<a name="bytebase-store-RolloutPolicy-Checkers-RequiredStatusChecks"></a>
-
-### RolloutPolicy.Checkers.RequiredStatusChecks
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| plan_check_enforcement | [RolloutPolicy.Checkers.PlanCheckEnforcement](#bytebase-store-RolloutPolicy-Checkers-PlanCheckEnforcement) | | Enforcement level for plan check results during rollout validation. |
@@ -3743,19 +3708,6 @@ QueryDataPolicy is the policy configuration for querying data.
| DATA_SOURCE_QUERY | 10 | |
-
-<a name="bytebase-store-RolloutPolicy-Checkers-PlanCheckEnforcement"></a>
-
-### RolloutPolicy.Checkers.PlanCheckEnforcement
-
-
-| Name | Number | Description |
-| ---- | ------ | ----------- |
-| PLAN_CHECK_ENFORCEMENT_UNSPECIFIED | 0 | Allow rollout regardless of plan check results (no enforcement). |
-| ERROR_ONLY | 1 | Block rollout only when plan check finds errors. |
-| STRICT | 2 | Block rollout when plan check finds errors or warnings. |
-
-
@@ -3810,6 +3762,8 @@ Project contains settings and configuration for a Bytebase project.
| parallel_tasks_per_rollout | [int32](#int32) | | The maximum number of parallel tasks to run during the rollout. |
| labels | [Project.LabelsEntry](#bytebase-store-Project-LabelsEntry) | repeated | Labels are key-value pairs that can be attached to the project. For example, { &#34;environment&#34;: &#34;production&#34;, &#34;team&#34;: &#34;backend&#34; } |
| enforce_sql_review | [bool](#bool) | | Whether to enforce SQL review checks to pass before issue creation. If enabled, issues cannot be created when SQL review finds errors. |
+| require_issue_approval | [bool](#bool) | | Whether issue approval is required before proceeding with rollout. |
+| require_plan_check_no_error | [bool](#bool) | | Whether to block rollout when plan check finds errors. |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index ea81570d35..9650563995 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -1013,14 +1013,6 @@
<a href="#bytebase.store.RolloutPolicy"><span class="badge">M</span>RolloutPolicy</a>
</li>
- <li>
- <a href="#bytebase.store.RolloutPolicy.Checkers"><span class="badge">M</span>RolloutPolicy.Checkers</a>
- </li>
-
- <li>
- <a href="#bytebase.store.RolloutPolicy.Checkers.RequiredStatusChecks"><span class="badge">M</span>RolloutPolicy.Checkers.RequiredStatusChecks</a>
- </li>
-
<li>
<a href="#bytebase.store.TagPolicy"><span class="badge">M</span>TagPolicy</a>
</li>
@@ -1050,10 +1042,6 @@
<a href="#bytebase.store.Policy.Type"><span class="badge">E</span>Policy.Type</a>
</li>
- <li>
- <a href="#bytebase.store.RolloutPolicy.Checkers.PlanCheckEnforcement"><span class="badge">E</span>RolloutPolicy.Checkers.PlanCheckEnforcement</a>
- </li>
-
</ul>
@@ -9983,69 +9971,6 @@ The default value is -1, means no limit. </p></td>
<td><p> </p></td>
</tr>
- <tr>
- <td>checkers</td>
- <td><a href="#bytebase.store.RolloutPolicy.Checkers">RolloutPolicy.Checkers</a></td>
- <td></td>
- <td><p>Checkers that must pass before rollout execution.
-These checks are performed in UI workflows only. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
- <h3 id="bytebase.store.RolloutPolicy.Checkers">RolloutPolicy.Checkers</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>required_issue_approval</td>
- <td><a href="#bool">bool</a></td>
- <td></td>
- <td><p>Whether issue approval is required before proceeding with rollout. </p></td>
- </tr>
-
- <tr>
- <td>required_status_checks</td>
- <td><a href="#bytebase.store.RolloutPolicy.Checkers.RequiredStatusChecks">RolloutPolicy.Checkers.RequiredStatusChecks</a></td>
- <td></td>
- <td><p>Status checks that must pass before rollout can be executed. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
- <h3 id="bytebase.store.RolloutPolicy.Checkers.RequiredStatusChecks">RolloutPolicy.Checkers.RequiredStatusChecks</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>plan_check_enforcement</td>
- <td><a href="#bytebase.store.RolloutPolicy.Checkers.PlanCheckEnforcement">RolloutPolicy.Checkers.PlanCheckEnforcement</a></td>
- <td></td>
- <td><p>Enforcement level for plan check results during rollout validation. </p></td>
- </tr>
-
</tbody>
</table>
@@ -10292,35 +10217,6 @@ For example, the environment resource can have the SQL review config tag, such a
</tbody>
</table>
- <h3 id="bytebase.store.RolloutPolicy.Checkers.PlanCheckEnforcement">RolloutPolicy.Checkers.PlanCheckEnforcement</h3>
- <p></p>
- <table class="enum-table">
- <thead>
- <tr><td>Name</td><td>Number</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>PLAN_CHECK_ENFORCEMENT_UNSPECIFIED</td>
- <td>0</td>
- <td><p>Allow rollout regardless of plan check results (no enforcement).</p></td>
- </tr>
-
- <tr>
- <td>ERROR_ONLY</td>
- <td>1</td>
- <td><p>Block rollout only when plan check finds errors.</p></td>
- </tr>
-
- <tr>
- <td>STRICT</td>
- <td>2</td>
- <td><p>Block rollout when plan check finds errors or warnings.</p></td>
- </tr>
-
- </tbody>
- </table>
-
@@ -10483,6 +10379,20 @@ For example, { &#34;environment&#34;: &#34;production&#34;, &#34;team&#34;: &#34
If enabled, issues cannot be created when SQL review finds errors. </p></td>
</tr>
+ <tr>
+ <td>require_issue_approval</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether issue approval is required before proceeding with rollout. </p></td>
+ </tr>
+
+ <tr>
+ <td>require_plan_check_no_error</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether to block rollout when plan check finds errors. </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index c0ec203146..2afeffebea 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -8421,6 +8421,8 @@ When paginating, all other parameters provided to `ListProjects` must match the
| parallel_tasks_per_rollout | [int32](#int32) | | The maximum number of parallel tasks allowed during rollout execution. |
| labels | [Project.LabelsEntry](#bytebase-v1-Project-LabelsEntry) | repeated | Labels are key-value pairs that can be attached to the project. For example, { &#34;environment&#34;: &#34;production&#34;, &#34;team&#34;: &#34;backend&#34; } |
| enforce_sql_review | [bool](#bool) | | Whether to enforce SQL review checks to pass before issue creation. If enabled, issues cannot be created when SQL review finds errors. |
+| require_issue_approval | [bool](#bool) | | Whether to require issue approval before rollout. |
+| require_plan_check_no_error | [bool](#bool) | | Whether to require plan check to have no error before rollout. |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 016dcdf2c3..4ce7699073 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -23582,6 +23582,20 @@ For example, { &#34;environment&#34;: &#34;production&#34;, &#34;team&#34;: &#34
If enabled, issues cannot be created when SQL review finds errors. </p></td>
</tr>
+ <tr>
+ <td>require_issue_approval</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether to require issue approval before rollout. </p></td>
+ </tr>
+
+ <tr>
+ <td>require_plan_check_no_error</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether to require plan check to have no error before rollout. </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/store/store/policy.proto b/proto/store/store/policy.proto
index 42ad8f6ad0..95cc509349 100644
--- a/proto/store/store/policy.proto
+++ b/proto/store/store/policy.proto
@@ -30,33 +30,6 @@ message Policy {
message RolloutPolicy {
bool automatic = 1;
repeated string roles = 2;
- // Checkers that must pass before rollout execution.
- // These checks are performed in UI workflows only.
- Checkers checkers = 4;
-
- message Checkers {
- // Whether issue approval is required before proceeding with rollout.
- bool required_issue_approval = 1;
-
- // Status checks that must pass before rollout can be executed.
- RequiredStatusChecks required_status_checks = 2;
-
- message RequiredStatusChecks {
- // Enforcement level for plan check results during rollout validation.
- PlanCheckEnforcement plan_check_enforcement = 1;
- }
-
- enum PlanCheckEnforcement {
- // Allow rollout regardless of plan check results (no enforcement).
- PLAN_CHECK_ENFORCEMENT_UNSPECIFIED = 0;
-
- // Block rollout only when plan check finds errors.
- ERROR_ONLY = 1;
-
- // Block rollout when plan check finds errors or warnings.
- STRICT = 2;
- }
- }
}
// MaskingExceptionPolicy is the allowlist of users who can access sensitive data.
diff --git a/proto/store/store/project.proto b/proto/store/store/project.proto
index f5a9e5f29c..978b458c4e 100644
--- a/proto/store/store/project.proto
+++ b/proto/store/store/project.proto
@@ -65,4 +65,10 @@ message Project {
// Whether to enforce SQL review checks to pass before issue creation.
// If enabled, issues cannot be created when SQL review finds errors.
bool enforce_sql_review = 15;
+
+ // Whether issue approval is required before proceeding with rollout.
+ bool require_issue_approval = 16;
+
+ // Whether to block rollout when plan check finds errors.
+ bool require_plan_check_no_error = 17;
}
diff --git a/proto/v1/v1/project_service.proto b/proto/v1/v1/project_service.proto
index 8194eafafc..854350e63b 100644
--- a/proto/v1/v1/project_service.proto
+++ b/proto/v1/v1/project_service.proto
@@ -447,6 +447,12 @@ message Project {
// Whether to enforce SQL review checks to pass before issue creation.
// If enabled, issues cannot be created when SQL review finds errors.
bool enforce_sql_review = 26;
+
+ // Whether to require issue approval before rollout.
+ bool require_issue_approval = 27;
+
+ // Whether to require plan check to have no error before rollout.
+ bool require_plan_check_no_error = 28;
}
message AddWebhookRequest {