Skip to content

Fix bug that prevented removal of query limits #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2025
Merged

Fix bug that prevented removal of query limits #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion mysql/resource_ti_resource_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ func (rg *ResourceGroup) buildSQLQuery(prefix string) string {

query = append(query, fmt.Sprintf(`PRIORITY = %s`, rg.Priority))

if rg.QueryLimit != DefaultResourceGroup.QueryLimit {
if rg.QueryLimit == "" {
query = append(query, fmt.Sprintf(`QUERY_LIMIT=NULL`))
} else {
query = append(query, fmt.Sprintf(`QUERY_LIMIT=(%s)`, rg.QueryLimit))
}

Expand Down
43 changes: 42 additions & 1 deletion mysql/resource_ti_resource_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
)

func TestTIDBResourceGroup_basic(t *testing.T) {
func TestTIDBResourceGroup_basic_to_full(t *testing.T) {
varName := "rg100"
varResourceUnits := 100
varNewResourceUnits := 1000
Expand Down Expand Up @@ -53,6 +53,47 @@ func TestTIDBResourceGroup_basic(t *testing.T) {
})
}

func TestTIDBResourceGroup_full_to_basic(t *testing.T) {
varName := "rg100"
varResourceUnits := 1000
varNewResourceUnits := 100
varQueryLimit := "EXEC_ELAPSED='15s', ACTION=COOLDOWN, WATCH=SIMILAR DURATION='10m0s'"
varNewQueryLimit := ""
varBurstable := true
varPriority := "low"
resourceName := "mysql_ti_resource_group.test"

resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
testAccPreCheckSkipNotTiDB(t)
testAccPreCheckSkipNotTiDBVersionMin(t, ResourceGroupTiDBMinVersion)
},
ProviderFactories: testAccProviderFactories,
CheckDestroy: testAccResourceGroupCheckDestroy(varName),
Steps: []resource.TestStep{
{
Config: testAccResourceGroupConfigFull(varName, varResourceUnits, varQueryLimit, varBurstable, varPriority),
Check: resource.ComposeTestCheckFunc(
testAccResourceGroupExists(varName),
resource.TestCheckResourceAttr(resourceName, "name", varName),
resource.TestCheckResourceAttr(resourceName, "query_limit", varQueryLimit),
resource.TestCheckResourceAttr(resourceName, "burstable", fmt.Sprintf("%t", varBurstable)),
resource.TestCheckResourceAttr(resourceName, "priority", varPriority),
),
},
{
Config: testAccResourceGroupConfigBasic(varName, varNewResourceUnits, varNewQueryLimit),
Check: resource.ComposeTestCheckFunc(
testAccResourceGroupExists(varName),
resource.TestCheckResourceAttr(resourceName, "name", varName),
resource.TestCheckResourceAttr(resourceName, "query_limit", varNewQueryLimit),
),
},
},
})
}

func testAccResourceGroupExists(varName string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rg, err := getResourceGroup(varName)
Expand Down