chore: allow set fallback rule for approval (#169)

ecmadao · web-flow · commit 771f04dba035 · 2026-01-29T22:51:47.000-08:00
* chore: allow set fallback rule for approval

* chore: update
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.14.0
+3.14.1
diff --git a/docs/resources/setting.md b/docs/resources/setting.md
@@ -45,7 +45,10 @@ Required:
 
 - `condition` (String) The condition that is associated with the rule. Check the proto message https://github.com/bytebase/bytebase/blob/c7304123902610b8a2c83e49fcd1c4d4eb972f0d/proto/v1/v1/setting_service.proto#L280 for details.
 - `flow` (Block List, Min: 1) (see [below for nested schema](#nestedblock--approval_flow--rules--flow))
-- `source` (String)
+
+Optional:
+
+- `source` (String) The source for this rule can be CHANGE_DATABASE, CREATE_DATABASE, EXPORT_DATA, or REQUEST_ROLE. If the source is not set, the condition must only contain "resource.project_id" or "true", and the rule will serve as a fallback without a specific source.
 
 <a id="nestedblock--approval_flow--rules--flow"></a>
 ### Nested Schema for `approval_flow.rules.flow`
diff --git a/examples/database/main.tf b/examples/database/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/database_group/main.tf b/examples/database_group/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/environments/main.tf b/examples/environments/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/groups/main.tf b/examples/groups/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/iamPolicy/main.tf b/examples/iamPolicy/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/instances/main.tf b/examples/instances/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/policies/main.tf b/examples/policies/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/projects/main.tf b/examples/projects/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/roles/main.tf b/examples/roles/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/settings/main.tf b/examples/settings/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/setup/approval_flow.tf b/examples/setup/approval_flow.tf
@@ -31,5 +31,18 @@ resource "bytebase_setting" "approval_flow" {
       source    = "EXPORT_DATA"
       condition = "resource.environment_id == \"prod\" && resource.table_name == \"employee\""
     }
+
+    rules {
+      flow {
+        title = "Fallback rule"
+
+        # Approval flow following the step order.
+        roles = [
+          "roles/workspaceDBA"
+        ]
+      }
+
+      condition = "true"
+    }
   }
 }
diff --git a/examples/setup/main.tf b/examples/setup/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/sql_review/main.tf b/examples/sql_review/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/users/main.tf b/examples/users/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/provider/data_source_setting.go b/provider/data_source_setting.go
@@ -520,8 +520,9 @@ func getWorkspaceApprovalSetting(computed bool) *schema.Schema {
 								},
 							},
 							"source": {
-								Type:     schema.TypeString,
-								Required: true,
+								Optional:    true,
+								Type:        schema.TypeString,
+								Description: `The source for this rule can be CHANGE_DATABASE, CREATE_DATABASE, EXPORT_DATA, or REQUEST_ROLE. If the source is not set, the condition must only contain "resource.project_id" or "true", and the rule will serve as a fallback without a specific source.`,
 								ValidateFunc: validation.StringInSlice([]string{
 									v1pb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE.String(),
 									v1pb.WorkspaceApprovalSetting_Rule_CREATE_DATABASE.String(),
@@ -623,7 +624,6 @@ func flattenWorkspaceApprovalSetting(setting *v1pb.WorkspaceApprovalSetting) ([]
 		}
 
 		raw := map[string]interface{}{
-			"source":    rule.Source.String(),
 			"condition": rule.Condition.Expression,
 			"flow": []interface{}{
 				map[string]interface{}{
@@ -633,6 +633,9 @@ func flattenWorkspaceApprovalSetting(setting *v1pb.WorkspaceApprovalSetting) ([]
 				},
 			},
 		}
+		if rule.Source != v1pb.WorkspaceApprovalSetting_Rule_SOURCE_UNSPECIFIED {
+			raw["source"] = rule.Source.String()
+		}
 
 		ruleList = append(ruleList, raw)
 	}
diff --git a/tutorials/0-provider.tf b/tutorials/0-provider.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.14.0"
+      version = "3.14.1"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/tutorials/4-2-approval-flow.tf b/tutorials/4-2-approval-flow.tf
@@ -15,5 +15,16 @@ resource "bytebase_setting" "approval_flow" {
       source    = "CHANGE_DATABASE"
       condition = "request.risk >= 100"
     }
+
+    rules {
+      flow {
+        title = "Fallback rule"
+        # Approval flow following the step order.
+        roles = [
+          "roles/workspaceDBA"
+        ]
+      }
+      condition = "true"
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`bytebase = {`
`5`		`- version = "3.14.0"`
	`5`	`+ version = "3.14.1"`
`6`	`6`	`# For local development, please use "terraform.local/bytebase/bytebase" instead`
`7`	`7`	`source = "registry.terraform.io/bytebase/bytebase"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`bytebase = {`
`4`		`- version = "3.14.0"`
	`4`	`+ version = "3.14.1"`
`5`	`5`	`# For local development, please use "terraform.local/bytebase/bytebase" instead`
`6`	`6`	`source = "registry.terraform.io/bytebase/bytebase"`
`7`	`7`	`}`