fix: migrate the level in the approval expression (#160)

ecmadao · web-flow · commit ae02d9b774e8 · 2025-10-31T12:22:16.000+08:00
* fix: readme

* fix: migrate the level in the approval expression

* fix: test
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.11.3
+3.11.4
diff --git a/api/setting.go b/api/setting.go
diff --git a/examples/database/main.tf b/examples/database/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/risk/main.tf b/examples/risk/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/setup/main.tf b/examples/setup/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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.11.3"
+      version = "3.11.4"
       # 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
@@ -558,10 +558,10 @@ func getWorkspaceApprovalSetting(computed bool) *schema.Schema {
 											Computed: computed,
 											Optional: true,
 											ValidateFunc: validation.StringInSlice([]string{
-												string(api.RiskLevelDefault),
-												string(api.RiskLevelLow),
-												string(api.RiskLevelModerate),
-												string(api.RiskLevelHigh),
+												v1pb.RiskLevel_LOW.String(),
+												v1pb.RiskLevel_MODERATE.String(),
+												v1pb.RiskLevel_HIGH.String(),
+												v1pb.RiskLevel_RISK_LEVEL_UNSPECIFIED.String(),
 											}, false),
 										},
 									},
@@ -677,23 +677,10 @@ func parseApprovalExpression(callExpr *v1alpha1.Expr_Call) ([]map[string]interfa
 			}
 
 			argName := argExpr.Args[0].GetIdentExpr().Name
+			constExpr := argExpr.Args[1].GetConstExpr()
 			switch argName {
-			case "source":
-				resp[argName] = argExpr.Args[1].GetConstExpr().GetStringValue()
-			case "level":
-				levelNumber := argExpr.Args[1].GetConstExpr().GetInt64Value()
-				switch int(levelNumber) {
-				case api.RiskLevelDefault.Int():
-					resp[argName] = api.RiskLevelDefault
-				case api.RiskLevelLow.Int():
-					resp[argName] = api.RiskLevelLow
-				case api.RiskLevelModerate.Int():
-					resp[argName] = api.RiskLevelModerate
-				case api.RiskLevelHigh.Int():
-					resp[argName] = api.RiskLevelHigh
-				default:
-					return nil, errors.Errorf("unknown risk level: %v", levelNumber)
-				}
+			case "source", "level":
+				resp[argName] = constExpr.GetStringValue()
 			default:
 				return nil, errors.Errorf("unsupport arg: %v", argName)
 			}
diff --git a/provider/internal/mock_client.go b/provider/internal/mock_client.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"slices"
-	"strconv"
 	"strings"
 	"sync"
 
@@ -641,6 +640,12 @@ func (*mockClient) ParseExpression(_ context.Context, expression string) (*v1alp
 }
 
 func parseCondition(condition string, baseID int64) *v1alpha1.Expr {
+	// Trim outer parentheses and whitespace first
+	condition = strings.TrimSpace(condition)
+	condition = strings.TrimPrefix(condition, "(")
+	condition = strings.TrimSuffix(condition, ")")
+	condition = strings.TrimSpace(condition)
+
 	// Parse AND conditions (&&)
 	parts := strings.Split(condition, " && ")
 	if len(parts) != 2 {
@@ -656,22 +661,22 @@ func parseCondition(condition string, baseID int64) *v1alpha1.Expr {
 	}
 
 	var sourceValue string
-	var levelValue int64
+	var levelValue string
 
 	for _, part := range parts {
 		part = strings.TrimSpace(part)
 		if strings.HasPrefix(part, "source ==") {
-			// Extract source value
-			sourceValue = strings.Trim(strings.TrimPrefix(part, "source =="), ` "`)
+			// Extract source value: remove 'source == ' and surrounding quotes
+			val := strings.TrimPrefix(part, "source ==")
+			val = strings.TrimSpace(val)
+			val = strings.Trim(val, `"`)
+			sourceValue = val
 		} else if strings.HasPrefix(part, "level ==") {
-			// Extract level value
-			levelStr := strings.TrimSpace(strings.TrimPrefix(part, "level =="))
-			var err error
-			levelValue, err = strconv.ParseInt(levelStr, 10, 64)
-			if err != nil {
-				// Default to 0 if parsing fails
-				levelValue = 0
-			}
+			// Extract level value as string: remove 'level == ' and surrounding quotes
+			val := strings.TrimPrefix(part, "level ==")
+			val = strings.TrimSpace(val)
+			val = strings.Trim(val, `"`)
+			levelValue = val
 		}
 	}
 
@@ -727,8 +732,8 @@ func parseCondition(condition string, baseID int64) *v1alpha1.Expr {
 										Id: baseID + 6,
 										ExprKind: &v1alpha1.Expr_ConstExpr{
 											ConstExpr: &v1alpha1.Constant{
-												ConstantKind: &v1alpha1.Constant_Int64Value{
-													Int64Value: levelValue,
+												ConstantKind: &v1alpha1.Constant_StringValue{
+													StringValue: levelValue,
 												},
 											},
 										},
diff --git a/provider/resource_setting.go b/provider/resource_setting.go
@@ -359,8 +359,7 @@ func convertToV1ApprovalSetting(d *schema.ResourceData) (*v1pb.WorkspaceApproval
 		buildCondition := []string{}
 		for _, condition := range conditionList {
 			rawCondition := condition.(map[string]interface{})
-			rawLevel := rawCondition["level"].(string)
-			buildCondition = append(buildCondition, fmt.Sprintf(`source == "%s" && level == %d`, rawCondition["source"].(string), api.RiskLevel(rawLevel).Int()))
+			buildCondition = append(buildCondition, fmt.Sprintf(`(source == "%s" && level == "%s")`, rawCondition["source"].(string), rawCondition["level"].(string)))
 		}
 		expression := strings.Join(buildCondition, " || ")
 
diff --git a/tutorials/0-provider.tf b/tutorials/0-provider.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "3.11.3"
+      version = "3.11.4"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }

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.11.3"`
	`5`	`+ version = "3.11.4"`
`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.11.3"`
	`4`	`+ version = "3.11.4"`
`5`	`5`	`# For local development, please use "terraform.local/bytebase/bytebase" instead`
`6`	`6`	`source = "registry.terraform.io/bytebase/bytebase"`
`7`	`7`	`}`