Enforce DOCKER_IMAGE validation in all test functions

- Update getSharedMySQLContainer to validate DOCKER_IMAGE is set
- Fail early if image parameter doesn't match DOCKER_IMAGE
- Fail early if sharedContainer is nil (TestMain should have created it)
- Add validation to startMySQLContainer and startSharedMySQLContainer
- Update all test files to use empty string instead of hardcoded 'mysql:8.0'
- Tests now use DOCKER_IMAGE env var set by workflow, not hardcoded values

Author: zph

mysql/data_source_databases_testcontainers_test.go

@@ -15,7 +15,7 @@ import (
 // Uses shared container set up in TestMain
 func TestAccDataSourceDatabases_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	// Run the same test logic as the original test
 	resource.Test(t, resource.TestCase{

mysql/data_source_tables_testcontainers_test.go

@@ -15,7 +15,7 @@ import (
 // Uses shared container set up in TestMain
 func TestAccDataSourceTables_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	// Run the same test logic as the original test
 	resource.Test(t, resource.TestCase{

mysql/resource_database_testcontainers_test.go

@@ -16,7 +16,7 @@ import (
 // Uses shared container set up in TestMain
 func TestAccDatabase_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := "terraform_acceptance_test"
 	resource.Test(t, resource.TestCase{
@@ -45,7 +45,7 @@ func TestAccDatabase_WithTestcontainers(t *testing.T) {
 // Uses shared container set up in TestMain
 func TestAccDatabase_collationChange_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := "terraform_acceptance_test"
 

mysql/resource_default_roles_testcontainers_test.go

@@ -15,7 +15,7 @@ import (
 // Uses shared container set up in TestMain (MySQL 8.0 required for default roles)
 func TestAccDefaultRoles_basic_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },

mysql/resource_global_variable_testcontainers_test.go

@@ -14,7 +14,7 @@ import (
 // Uses shared container set up in TestMain
 func TestAccGlobalVar_basic_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	varName := "max_connections"
 	resourceName := "mysql_global_variable.test"
@@ -41,7 +41,7 @@ func TestAccGlobalVar_basic_WithTestcontainers(t *testing.T) {
 // Uses shared container set up in TestMain
 func TestAccGlobalVar_parseBoolean_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	varName := "autocommit"
 	resourceName := "mysql_global_variable.test"

mysql/resource_grant_testcontainers_test.go

@@ -16,7 +16,7 @@ import (
 // Uses shared container set up in TestMain
 func TestAccGrant_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 	userName := fmt.Sprintf("jdoe-%s", dbName)
@@ -58,7 +58,7 @@ func TestAccGrant_WithTestcontainers(t *testing.T) {
 // TestAccRevokePrivRefresh_WithTestcontainers tests privilege revocation and refresh
 func TestAccRevokePrivRefresh_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 
@@ -108,7 +108,7 @@ func TestAccRevokePrivRefresh_WithTestcontainers(t *testing.T) {
 // TestAccBroken_WithTestcontainers tests error handling for duplicate grants
 func TestAccBroken_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 	resource.Test(t, resource.TestCase{
@@ -144,7 +144,7 @@ func TestAccBroken_WithTestcontainers(t *testing.T) {
 // TestAccDifferentHosts_WithTestcontainers tests grants with different hosts
 func TestAccDifferentHosts_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 	resource.Test(t, resource.TestCase{
@@ -180,7 +180,7 @@ func TestAccDifferentHosts_WithTestcontainers(t *testing.T) {
 // TestAccGrantComplex_WithTestcontainers tests complex grant scenarios
 func TestAccGrantComplex_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 	resource.Test(t, resource.TestCase{
@@ -251,7 +251,7 @@ func TestAccGrantComplex_WithTestcontainers(t *testing.T) {
 // TestAccGrantComplexMySQL8_WithTestcontainers tests MySQL 8.0 specific grants
 func TestAccGrantComplexMySQL8_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 	resource.Test(t, resource.TestCase{
@@ -277,7 +277,7 @@ func TestAccGrantComplexMySQL8_WithTestcontainers(t *testing.T) {
 // TestAccGrant_role_WithTestcontainers tests role grants (requires MySQL 8.0+)
 func TestAccGrant_role_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 	roleName := fmt.Sprintf("TFRole-exp%d", rand.Intn(100))
@@ -312,7 +312,7 @@ func TestAccGrant_role_WithTestcontainers(t *testing.T) {
 // TestAccGrant_roleToUser_WithTestcontainers tests granting roles to users (requires MySQL 8.0+)
 func TestAccGrant_roleToUser_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 	roleName := fmt.Sprintf("TFRole-%d", rand.Intn(100))
@@ -336,7 +336,7 @@ func TestAccGrant_roleToUser_WithTestcontainers(t *testing.T) {
 // TestAccGrant_complexRoleGrants_WithTestcontainers tests complex role grant scenarios (requires MySQL 8.0+)
 func TestAccGrant_complexRoleGrants_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 	resource.Test(t, resource.TestCase{
@@ -354,7 +354,7 @@ func TestAccGrant_complexRoleGrants_WithTestcontainers(t *testing.T) {
 // TestAccGrantOnProcedure_WithTestcontainers tests procedure grants
 func TestAccGrantOnProcedure_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	procedureName := "test_procedure"
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
@@ -395,7 +395,7 @@ func TestAccGrantOnProcedure_WithTestcontainers(t *testing.T) {
 // TestAllowDuplicateUsersDifferentTables_WithTestcontainers tests allowing duplicate grants on different tables
 func TestAllowDuplicateUsersDifferentTables_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 
@@ -464,7 +464,7 @@ func TestAllowDuplicateUsersDifferentTables_WithTestcontainers(t *testing.T) {
 // TestDisallowDuplicateUsersSameTable_WithTestcontainers tests disallowing duplicate grants on same table
 func TestDisallowDuplicateUsersSameTable_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
 

mysql/resource_role_testcontainers_test.go

@@ -14,7 +14,7 @@ import (
 // Uses shared container set up in TestMain (MySQL 8.0 required for roles)
 func TestAccRole_basic_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	roleName := "tf-test-role"
 	resourceName := "mysql_role.test"

mysql/resource_user_password_testcontainers_test.go

@@ -14,7 +14,7 @@ import (
 // Uses shared container set up in TestMain
 func TestAccUserPassword_basic_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },

mysql/resource_user_testcontainers_test.go

@@ -16,7 +16,7 @@ import (
 // Uses shared container set up in TestMain
 func TestAccUser_basic_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -63,7 +63,7 @@ func TestAccUser_basic_WithTestcontainers(t *testing.T) {
 // Note: mysql_no_login plugin may not be available in all MySQL distributions
 func TestAccUser_auth_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
@@ -122,7 +122,7 @@ func TestAccUser_auth_WithTestcontainers(t *testing.T) {
 // Uses shared container set up in TestMain
 func TestAccUser_authConnect_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -164,7 +164,7 @@ func TestAccUser_authConnect_WithTestcontainers(t *testing.T) {
 // Uses shared container set up in TestMain
 func TestAccUser_authConnectRetainOldPassword_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -199,7 +199,7 @@ func TestAccUser_authConnectRetainOldPassword_WithTestcontainers(t *testing.T) {
 // Uses shared container set up in TestMain
 func TestAccUser_deprecated_WithTestcontainers(t *testing.T) {
 	// Use shared container set up in TestMain
-	_ = getSharedMySQLContainer(t, "mysql:8.0")
+	_ = getSharedMySQLContainer(t, "")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },

mysql/testcontainers_helper.go

@@ -63,7 +63,11 @@ type MySQLTestContainer struct {
 
 // startMySQLContainer starts a MySQL/Percona/MariaDB container for testing
 // Supports MySQL, Percona, and MariaDB images
+// image must not be empty - function will panic if empty
 func startMySQLContainer(ctx context.Context, t *testing.T, image string) *MySQLTestContainer {
+	if image == "" {
+		t.Fatalf("ERROR: startMySQLContainer called with empty image. DOCKER_IMAGE must be set.")
+	}
 	// Determine timeout based on image/version
 	timeout := 120 * time.Second
 	if contains(image, "5.6") || contains(image, "5.7") || contains(image, "6.1") || contains(image, "6.5") {
@@ -155,24 +159,42 @@ func contains(s, substr string) bool {
 	return strings.Contains(s, substr)
 }
 
-// getSharedMySQLContainer returns a shared MySQL container for all tests
-// The container is created once and reused across all tests in the package
+// getSharedMySQLContainer returns the shared MySQL container set up by TestMain
+// The image parameter is ignored - TestMain uses DOCKER_IMAGE env var
+// This function validates that DOCKER_IMAGE is set and fails early if not
 func getSharedMySQLContainer(t *testing.T, image string) *MySQLTestContainer {
-	sharedContainerOnce.Do(func() {
-		ctx := context.Background()
-		sharedContainer = startMySQLContainer(ctx, t, image)
+	// Validate that DOCKER_IMAGE is set (required by TestMain)
+	dockerImage := os.Getenv("DOCKER_IMAGE")
+	if dockerImage == "" {
+		t.Fatalf("ERROR: DOCKER_IMAGE environment variable is not set. This is required for MySQL/Percona/MariaDB tests.\n" +
+			"Please set DOCKER_IMAGE to the appropriate Docker image (e.g., mysql:5.6, percona:8.0, mariadb:10.10)\n" +
+			"The 'image' parameter to getSharedMySQLContainer is ignored - use DOCKER_IMAGE env var instead.")
+	}
+
+	// Validate that the provided image matches DOCKER_IMAGE (if provided)
+	if image != "" && image != dockerImage {
+		t.Fatalf("ERROR: getSharedMySQLContainer called with image '%s' but DOCKER_IMAGE is set to '%s'.\n"+
+			"Remove the hardcoded image parameter - TestMain uses DOCKER_IMAGE env var to create the shared container.",
+			image, dockerImage)
+	}
+
+	// TestMain should have already created sharedContainer
+	// If it's nil, something went wrong in TestMain
+	if sharedContainer == nil {
+		t.Fatalf("ERROR: sharedContainer is nil. TestMain should have created it using DOCKER_IMAGE='%s'.\n"+
+			"This indicates a problem with TestMain initialization.", dockerImage)
+	}
 
-		// Set up environment variables for the shared container
-		os.Setenv("MYSQL_ENDPOINT", sharedContainer.Endpoint)
-		os.Setenv("MYSQL_USERNAME", sharedContainer.Username)
-		os.Setenv("MYSQL_PASSWORD", sharedContainer.Password)
-	})
 	return sharedContainer
 }
 
 // startSharedMySQLContainer starts a shared MySQL container without requiring a testing.T
 // Used by TestMain for initial setup
+// image must not be empty - function will return error if empty
 func startSharedMySQLContainer(image string) (*MySQLTestContainer, error) {
+	if image == "" {
+		return nil, fmt.Errorf("ERROR: startSharedMySQLContainer called with empty image. DOCKER_IMAGE must be set")
+	}
 	ctx := context.Background()
 
 	// Determine timeout based on image/version