fix: use valid MSSQL image

mdelapenya · mdelapenya · commit 4dbd1834bcce · 2024-09-19T23:48:07.000+02:00
diff --git a/modules/mssql/examples_test.go b/modules/mssql/examples_test.go
@@ -10,18 +10,13 @@ import (
 )
 
 func ExampleRun() {
-	// TODO: restore once #2785 is fixed
-	if true {
-		fmt.Println("true")
-		return
-	}
 	// runMSSQLServerContainer {
 	ctx := context.Background()
 
 	password := "SuperStrong@Passw0rd"
 
 	mssqlContainer, err := mssql.Run(ctx,
-		"mcr.microsoft.com/mssql/server:2022-RTM-GDR1-ubuntu-20.04",
+		"mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
 		mssql.WithAcceptEULA(),
 		mssql.WithPassword(password),
 	)
diff --git a/modules/mssql/mssql.go b/modules/mssql/mssql.go
@@ -44,7 +44,7 @@ func WithPassword(password string) testcontainers.CustomizeRequestOption {
 // Deprecated: use Run instead
 // RunContainer creates an instance of the MSSQLServer container type
 func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomizer) (*MSSQLServerContainer, error) {
-	return Run(ctx, "mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-22.04", opts...)
+	return Run(ctx, "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04", opts...)
 }
 
 // Run creates an instance of the MSSQLServer container type
diff --git a/modules/mssql/mssql_test.go b/modules/mssql/mssql_test.go
@@ -14,11 +14,10 @@ import (
 )
 
 func TestMSSQLServer(t *testing.T) {
-	t.Skip("broken see #2785")
 	ctx := context.Background()
 
 	ctr, err := mssql.Run(ctx,
-		"mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-22.04",
+		"mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
 		mssql.WithAcceptEULA(),
 	)
 	testcontainers.CleanupContainer(t, ctr)
@@ -44,11 +43,10 @@ func TestMSSQLServer(t *testing.T) {
 }
 
 func TestMSSQLServerWithMissingEulaOption(t *testing.T) {
-	t.Skip("broken see #2785")
 	ctx := context.Background()
 
 	ctr, err := mssql.Run(ctx,
-		"mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-22.04",
+		"mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
 		testcontainers.WithWaitStrategy(
 			wait.ForLog("The SQL Server End-User License Agreement (EULA) must be accepted")),
 	)
@@ -64,11 +62,10 @@ func TestMSSQLServerWithMissingEulaOption(t *testing.T) {
 }
 
 func TestMSSQLServerWithConnectionStringParameters(t *testing.T) {
-	t.Skip("broken see #2785")
 	ctx := context.Background()
 
 	ctr, err := mssql.Run(ctx,
-		"mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-22.04",
+		"mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
 		mssql.WithAcceptEULA(),
 	)
 	testcontainers.CleanupContainer(t, ctr)
@@ -95,11 +92,10 @@ func TestMSSQLServerWithConnectionStringParameters(t *testing.T) {
 }
 
 func TestMSSQLServerWithCustomStrongPassword(t *testing.T) {
-	t.Skip("broken see #2785")
 	ctx := context.Background()
 
 	ctr, err := mssql.Run(ctx,
-		"mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-22.04",
+		"mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
 		mssql.WithAcceptEULA(),
 		mssql.WithPassword("Strong@Passw0rd"),
 	)
@@ -120,11 +116,10 @@ func TestMSSQLServerWithCustomStrongPassword(t *testing.T) {
 
 // tests that a weak password is not accepted by the container due to Microsoft's password strength policy
 func TestMSSQLServerWithInvalidPassword(t *testing.T) {
-	t.Skip("broken see #2785")
 	ctx := context.Background()
 
 	ctr, err := mssql.Run(ctx,
-		"mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-22.04",
+		"mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
 		testcontainers.WithWaitStrategy(
 			wait.ForLog("Password validation failed")),
 		mssql.WithAcceptEULA(),
@@ -133,26 +128,3 @@ func TestMSSQLServerWithInvalidPassword(t *testing.T) {
 	testcontainers.CleanupContainer(t, ctr)
 	require.NoError(t, err)
 }
-
-func TestMSSQLServerWithAlternativeImage(t *testing.T) {
-	t.Skip("broken see #2785")
-	ctx := context.Background()
-
-	ctr, err := mssql.Run(ctx,
-		"mcr.microsoft.com/mssql/server:2022-RTM-GDR1-ubuntu-20.04",
-		mssql.WithAcceptEULA(),
-	)
-	testcontainers.CleanupContainer(t, ctr)
-	require.NoError(t, err)
-
-	// perform assertions
-	connectionString, err := ctr.ConnectionString(ctx)
-	require.NoError(t, err)
-
-	db, err := sql.Open("sqlserver", connectionString)
-	require.NoError(t, err)
-	defer db.Close()
-
-	err = db.Ping()
-	require.NoError(t, err)
-}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func WithPassword(password string) testcontainers.CustomizeRequestOption {`
`44`	`44`	`// Deprecated: use Run instead`
`45`	`45`	`// RunContainer creates an instance of the MSSQLServer container type`
`46`	`46`	`func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomizer) (*MSSQLServerContainer, error) {`
`47`		`- return Run(ctx, "mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-22.04", opts...)`
	`47`	`+ return Run(ctx, "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04", opts...)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// Run creates an instance of the MSSQLServer container type`