From c990c47aa90cd5ebb78fd50d455f719f2b048f99 Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Sun, 6 Oct 2024 16:38:35 +0200 Subject: [PATCH 1/2] test(mssql): add MS SQLServer 2022 for tests --- database/sqlserver/sqlserver_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/sqlserver/sqlserver_test.go b/database/sqlserver/sqlserver_test.go index e7af5d7f9..179b77308 100644 --- a/database/sqlserver/sqlserver_test.go +++ b/database/sqlserver/sqlserver_test.go @@ -44,8 +44,8 @@ var ( // Container versions: https://mcr.microsoft.com/v2/mssql/server/tags/list specs = []dktesting.ContainerSpec{ {ImageName: "mcr.microsoft.com/azure-sql-edge:latest", Options: sqlEdgeOpts}, - {ImageName: "mcr.microsoft.com/mssql/server:2017-latest", Options: sqlServerOpts}, {ImageName: "mcr.microsoft.com/mssql/server:2019-latest", Options: sqlServerOpts}, + {ImageName: "mcr.microsoft.com/mssql/server:2022-latest", Options: sqlServerOpts}, } ) From c478594b142bec557385ea976d846d8d9f6423f4 Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Sun, 6 Oct 2024 17:27:11 +0200 Subject: [PATCH 2/2] test(mssql): remove Azure SQL Edge from test matrix https://github.com/MicrosoftDocs/azure-docs/blob/2355e02795c14c072f628bd3fd0f4c566f7cf36f/articles/azure-sql-edge/includes/retirement-notice.md --- database/sqlserver/sqlserver_test.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/database/sqlserver/sqlserver_test.go b/database/sqlserver/sqlserver_test.go index 179b77308..e9d57dbf2 100644 --- a/database/sqlserver/sqlserver_test.go +++ b/database/sqlserver/sqlserver_test.go @@ -12,7 +12,6 @@ import ( "time" "github.com/dhui/dktest" - "github.com/docker/go-connections/nat" "github.com/golang-migrate/migrate/v4" dt "github.com/golang-migrate/migrate/v4/database/testing" @@ -25,25 +24,12 @@ const defaultPort = 1433 const saPassword = "Root1234" var ( - sqlEdgeOpts = dktest.Options{ - Env: map[string]string{"ACCEPT_EULA": "Y", "MSSQL_SA_PASSWORD": saPassword}, - PortBindings: map[nat.Port][]nat.PortBinding{ - nat.Port(fmt.Sprintf("%d/tcp", defaultPort)): { - nat.PortBinding{ - HostIP: "0.0.0.0", - HostPort: "0/tcp", - }, - }, - }, - PortRequired: true, ReadyFunc: isReady, PullTimeout: 2 * time.Minute, - } sqlServerOpts = dktest.Options{ Env: map[string]string{"ACCEPT_EULA": "Y", "MSSQL_SA_PASSWORD": saPassword, "MSSQL_PID": "Express"}, PortRequired: true, ReadyFunc: isReady, PullTimeout: 2 * time.Minute, } // Container versions: https://mcr.microsoft.com/v2/mssql/server/tags/list specs = []dktesting.ContainerSpec{ - {ImageName: "mcr.microsoft.com/azure-sql-edge:latest", Options: sqlEdgeOpts}, {ImageName: "mcr.microsoft.com/mssql/server:2019-latest", Options: sqlServerOpts}, {ImageName: "mcr.microsoft.com/mssql/server:2022-latest", Options: sqlServerOpts}, }