Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/database/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/database_group/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/environments/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/groups/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/iamPolicy/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/instances/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/policies/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/projects/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/risk/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/roles/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/settings/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/setup/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/sql_review/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/users/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
terraform {
required_providers {
bytebase = {
version = "3.11.1"
version = "3.11.3"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
12 changes: 6 additions & 6 deletions provider/data_source_setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -718,13 +718,13 @@ func flattenWorkspaceApprovalSetting(ctx context.Context, client api.Client, set
ruleList := []interface{}{}
for _, rule := range setting.Rules {
roleList := []interface{}{}
for _, role := range rule.Template.Flow.Roles {
for _, role := range rule.GetTemplate().GetFlow().GetRoles() {
roleList = append(roleList, role)
}

conditionList := []map[string]interface{}{}
if rule.Condition.Expression != "" {
parsedExpr, err := client.ParseExpression(ctx, rule.Condition.Expression)
if expr := rule.GetCondition().GetExpression(); expr != "" {
parsedExpr, err := client.ParseExpression(ctx, expr)
if err != nil {
return nil, err
}
Expand All @@ -739,9 +739,9 @@ func flattenWorkspaceApprovalSetting(ctx context.Context, client api.Client, set
"conditions": conditionList,
"flow": []interface{}{
map[string]interface{}{
"id": rule.Template.Id,
"title": rule.Template.Title,
"description": rule.Template.Description,
"id": rule.GetTemplate().GetId(),
"title": rule.GetTemplate().GetTitle(),
"description": rule.GetTemplate().GetDescription(),
"roles": roleList,
},
},
Expand Down
1 change: 0 additions & 1 deletion provider/resource_review_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ func resourceReviewConfig() *schema.Resource {
ValidateFunc: validation.StringInSlice([]string{
v1pb.SQLReviewRuleLevel_WARNING.String(),
v1pb.SQLReviewRuleLevel_ERROR.String(),
v1pb.SQLReviewRuleLevel_DISABLED.String(),
}, false),
},
"payload": {
Expand Down