Skip to content

Fix tests, remove bitnami images #41

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
dermodmaster merged 6 commits into from
Oct 6, 2025
Merged

Fix tests, remove bitnami images #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecb227a
attempt to fix mongodump by using official image and adding mongodb-d…
Oct 6, 2025
13e2a4a
try to use official image
Oct 6, 2025
4eca4f1
attempt to fix mysql test by using official image
Oct 6, 2025
1748e5e
attempt to fix postgres test by using official image
Oct 6, 2025
c6605fe
fix postgres image url
Oct 6, 2025
07ad343
remove dockerfile
Oct 6, 2025
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
37 changes: 37 additions & 0 deletions test/pkg/source/internal/testcommons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import (
"io"
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"sync"

"github.com/pkg/errors"
"github.com/spf13/viper"
Expand All @@ -18,6 +21,40 @@ import (
const ResticPort = "8000/tcp"
const ResticPassword = "resticRepo"

var (
projectRootOnce sync.Once
projectRoot string
projectRootErr error
)

// ProjectRoot returns the repository root as determined by the location of go.mod relative to this file.
func ProjectRoot() string {
projectRootOnce.Do(func() {
_, thisFile, _, ok := runtime.Caller(0)
if !ok {
projectRootErr = errors.New("unable to determine caller for project root lookup")
return
}
dir := filepath.Dir(thisFile)
for {
if _, err := os.Stat(filepath.Join(dir, "go.mod")); err == nil {
projectRoot = dir
return
}
parent := filepath.Dir(dir)
if parent == dir {
projectRootErr = errors.New("go.mod not found while searching for project root")
return
}
dir = parent
}
})
if projectRootErr != nil {
panic(projectRootErr)
}
return projectRoot
}

// TestContainerSetup is a wrapper for testcontainers that gives easy access to container-address and container-port
type TestContainerSetup struct {
Container testcontainers.Container
Expand Down
6 changes: 3 additions & 3 deletions test/pkg/source/mongodbtest/mongodb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const dumpKind = "mongodump"
const restoreKind = "mongorestore"
const dbName = "test"
const collName = "testColl"
const mongoImage = "docker.io/bitnami/mongodb:latest"
const mongoImage = "docker.io/mongo:latest"
const logString = "Waiting for connections"

type MongoDumpAndRestoreTestSuite struct {
Expand Down Expand Up @@ -243,8 +243,8 @@ var mongoRequest = testcontainers.ContainerRequest{
Image: mongoImage,
ExposedPorts: []string{mongoPort},
Env: map[string]string{
"MONGODB_ROOT_USERNAME": mongoUser,
"MONGODB_ROOT_PASSWORD": mongoPW,
"MONGO_INITDB_ROOT_USERNAME": mongoUser,
"MONGO_INITDB_ROOT_PASSWORD": mongoPW,
},
WaitingFor: wait.ForLog(logString),
}
Expand Down
6 changes: 2 additions & 4 deletions test/pkg/source/mysqltest/mysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ const tableName = "testTable"

// mysql and psql are a bit picky when it comes to localhost, use ip instead
const hostName = "127.0.0.1"
const logString = "** Starting MySQL **"
const mysqlImage = "docker.io/bitnami/mysql:5.7"
const logString = "ready for connections"
const mysqlImage = "docker.io/mysql:5.7"

type MySQLDumpAndRestoreTestSuite struct {
suite.Suite
Expand Down Expand Up @@ -461,8 +461,6 @@ var mySQLRequest = testcontainers.ContainerRequest{
"MYSQL_DATABASE": mySQLDatabase,
"MYSQL_USER": mySQLUser,
"MYSQL_PASSWORD": mySQLPw,
"JDBC_PARAMS": "useSSL=false",
"MYSQL_EXTRA_FLAGS": "--default-authentication-plugin=mysql_native_password --skip-ssl",
},
WaitingFor: wait.ForLog(logString),
}
2 changes: 1 addition & 1 deletion test/pkg/source/postgrestest/postgres_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const dumpKind = "pgdump"
// mysql and psql are a bit picky when it comes to localhost, use ip instead
const hostName = "127.0.0.1"
const dbDriver = "pgx"
const pgImage = "docker.io/bitnami/postgresql:17"
const pgImage = "docker.io/postgres:17"
const plainKind = "plain"

type PGDumpAndRestoreTestSuite struct {
Expand Down