Fixes TF drift for resource group name and query_limit (#6)

This fixes the following drift:
1. Resource group name would always be in quotes when pulled from the
DB. This PR removes the quotes.
2. Query Limit would always be missing `()` parentheses when pulled from
the DB. This PR standardizes around the query_limit inside the
parentheses. A breaking change is that we expect NO parenthesis to be
passed in for the query_limit from now on. Instead, we will wrap the
query_limit inside parentheses in the actual query rather than rely on
the query_limit string being wrapped in parentheses by the caller.

I also got basic tidb tests working and tested the above changes using
`make testtidb7.5.1`

---------

Co-authored-by: Andrew Chen <[email protected]>
Co-authored-by: Zander Hill <[email protected]>

Author: 3 people

.github/workflows/main.yml

@@ -5,7 +5,7 @@ on:
     branches: ["master"]
     tags: ["*"]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "*" ]
 jobs:
   lint:
     runs-on: ubuntu-22.04
@@ -38,7 +38,6 @@ jobs:
         # Track https://github.com/pingcap/tidb/tags
         - testtidb6.1.0
         - testtidb6.5.3
-        # Fails because not yet available? 20240705
         # - testtidb6.5.10
         - testtidb7.1.5
         - testtidb7.5.2

GNUmakefile

@@ -2,25 +2,29 @@ TEST?=$$(go list ./... |grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=mysql
-TERRAFORM_VERSION=0.14.7
+# Last version before hashicorp relicensing to BSL
+TERRAFORM_VERSION=1.5.6
 TERRAFORM_OS=$(shell uname -s | tr A-Z a-z)
 TEST_USER=root
 TEST_PASSWORD=my-secret-pw
 DATESTAMP=$(shell date "+%Y%m%d")
 SHA_SHORT=$(shell git describe --match=FORCE_NEVER_MATCH --always --abbrev=40 --dirty --abbrev)
 MOST_RECENT_UPSTREAM_TAG=$(shell git for-each-ref refs/tags --sort=-taggerdate --format="%(refname)" | head -1 | grep -E -o "v\d+\.\d+\.\d+")
 
-OS_ARCH=linux_amd64
 # Set correct OS_ARCH on Mac
 UNAME := $(shell uname -s)
+HW := $(shell uname -m)
+ifeq ($(HW),arm64)
+	ARCH=$(HW)
+else
+	ARCH=amd64
+endif
+
 ifeq ($(UNAME),Darwin)
-	HW := $(shell uname -m)
-	ifeq ($(HW),arm64)
-		ARCH=$(HW)
-	else
-		ARCH=amd64
-	endif
 	OS_ARCH=darwin_$(ARCH)
+else
+	ARCH=amd64
+	OS_ARCH=linux_$(ARCH)
 endif
 
 HOSTNAME=registry.terraform.io
@@ -39,7 +43,7 @@ test: acceptance
 
 bin/terraform:
 	mkdir -p "$(CURDIR)/bin"
-	curl -sfL https://releases.hashicorp.com/terraform/$(TERRAFORM_VERSION)/terraform_$(TERRAFORM_VERSION)_$(TERRAFORM_OS)_amd64.zip > $(CURDIR)/bin/terraform.zip
+	curl -sfL https://releases.hashicorp.com/terraform/$(TERRAFORM_VERSION)/terraform_$(TERRAFORM_VERSION)_$(TERRAFORM_OS)_$(ARCH).zip > $(CURDIR)/bin/terraform.zip
 	(cd $(CURDIR)/bin/ ; unzip terraform.zip)
 
 testacc: fmtcheck bin/terraform

mysql/provider_test.go

@@ -217,3 +217,42 @@ func testAccPreCheckSkipNotTiDB(t *testing.T) {
 		t.Skip(msg)
 	}
 }
+
+func testAccPreCheckSkipNotTiDBVersionMin(t *testing.T, minVersion string) {
+	testAccPreCheck(t)
+
+	ctx := context.Background()
+	db, err := connectToMySQL(ctx, testAccProvider.Meta().(*MySQLConfiguration))
+	if err != nil {
+		t.Fatalf("Cannot connect to DB (SkipNotTiDBVersionMin): %v", err)
+		return
+	}
+
+	currentVersion, err := serverVersion(db)
+	if err != nil {
+		t.Fatalf("Cannot get DB version string (SkipNotTiDBVersionMin): %v", err)
+		return
+	}
+
+	versionMin, _ := version.NewVersion(minVersion)
+	if currentVersion.LessThan(versionMin) {
+		isTiDB, tidbVersion, _, err := serverTiDB(db)
+		if err != nil {
+			t.Fatalf("Cannot get DB version string (SkipNotTiDBVersionMin): %v", err)
+			return
+		}
+		if isTiDB {
+			tidbSemVar, err := version.NewVersion(tidbVersion)
+			if err != nil {
+				t.Fatalf("Cannot get DB version string for TiDB (SkipNotTiDBVersionMin): %s %v", tidbSemVar, err)
+				return
+			}
+			if tidbSemVar.LessThan(versionMin) {
+				t.Skip("Skip on TiDB (SkipNotTiDBVersionMin)")
+			}
+			return
+		}
+
+		t.Skip("Skip on MySQL")
+	}
+}

mysql/resource_ti_resource_group.go

@@ -34,8 +34,7 @@ func (rg *ResourceGroup) buildSQLQuery(prefix string) string {
 	query = append(query, fmt.Sprintf(`PRIORITY = %s`, rg.Priority))
 
 	if rg.QueryLimit != DefaultResourceGroup.QueryLimit {
-		query = append(query, fmt.Sprintf(`QUERY_LIMIT=%s`, rg.QueryLimit))
-
+		query = append(query, fmt.Sprintf(`QUERY_LIMIT=(%s)`, rg.QueryLimit))
 	}
 
 	query = append(query, fmt.Sprintf(`BURSTABLE = %t`, rg.Burstable))
@@ -51,9 +50,11 @@ var DefaultResourceGroup = ResourceGroup{
 	Name:       "tfDefault",
 	Priority:   "medium",
 	Burstable:  false,
-	QueryLimit: "()",
+	QueryLimit: "",
 }
 
+var ResourceGroupTiDBMinVersion = "7.5.0"
+
 func resourceTiResourceGroup() *schema.Resource {
 	return &schema.Resource{
 		CreateContext: CreateResourceGroup,
@@ -208,10 +209,10 @@ func getResourceGroupFromDB(db *sql.DB, name string) (*ResourceGroup, error) {
 	/*
 		Coerce types on SQL side into good types for golang
 		Burstable is a varchar(3) so we coerce to BOOLEAN
-		QUERY_LIMIT is nullable in DB, but we coerce to standard "empty" string type of "()"
+		QUERY_LIMIT is nullable in DB, but we coerce to standard "empty" string type of ""
 		Lowercase priority for less configuration variability
 	*/
-	query := `SELECT NAME, RU_PER_SEC, LOWER(PRIORITY), BURSTABLE = 'YES' as BURSTABLE, IFNULL(QUERY_LIMIT,"()") FROM information_schema.resource_groups WHERE NAME = ?`
+	query := `SELECT NAME, RU_PER_SEC, LOWER(PRIORITY), BURSTABLE = 'YES' as BURSTABLE, IFNULL(QUERY_LIMIT,"") FROM information_schema.resource_groups WHERE NAME = ?`
 
 	ctx := context.Background()
 	tflog.SetField(ctx, "query", query)