From 5fb3fe64781bb5088b0a947850186882c12822de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C4=8Ctvrtka?= Date: Wed, 18 Sep 2024 20:43:30 +0200 Subject: [PATCH] Revert "PMM-13132 Test DB." This reverts commit e8f94bf32a85fee0e987b224212f6121aacd24e5. --- encryption-rotation/main_test.go | 2 +- managed/utils/testdb/db.go | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/encryption-rotation/main_test.go b/encryption-rotation/main_test.go index 89a1b5b0b2..13940f51cc 100644 --- a/encryption-rotation/main_test.go +++ b/encryption-rotation/main_test.go @@ -50,7 +50,7 @@ func TestEncryptionRotation(t *testing.T) { err = insertTestData(db) require.NoError(t, err) - statusCode := rotate(db, "pmm-managed-dev") + statusCode := rotate(db, testdb.TestDatabase) require.Equal(t, 0, statusCode) newEncryptionKey, err := os.ReadFile(encryptionKeyTestPath) diff --git a/managed/utils/testdb/db.go b/managed/utils/testdb/db.go index 2f6ee84cc7..9b496bd075 100644 --- a/managed/utils/testdb/db.go +++ b/managed/utils/testdb/db.go @@ -30,7 +30,8 @@ import ( const ( username, password = "postgres", "" - testDatabase = "pmm-managed-dev" + // TestDatabase contains name of pmm-managed DB used for tests. + TestDatabase = "pmm-managed-dev" ) // Open recreates testing PostgreSQL database and returns an open connection to it. @@ -46,15 +47,15 @@ func Open(tb testing.TB, setupFixtures models.SetupFixturesMode, migrationVersio db, err := models.OpenDB(setupParams) require.NoError(tb, err) - _, err = db.Exec(`DROP DATABASE IF EXISTS "` + testDatabase + `"`) + _, err = db.Exec(`DROP DATABASE IF EXISTS "` + TestDatabase + `"`) require.NoError(tb, err) - _, err = db.Exec(`CREATE DATABASE "` + testDatabase + `"`) + _, err = db.Exec(`CREATE DATABASE "` + TestDatabase + `"`) require.NoError(tb, err) err = db.Close() require.NoError(tb, err) - setupParams.Name = testDatabase + setupParams.Name = TestDatabase db, err = models.OpenDB(setupParams) require.NoError(tb, err) SetupDB(tb, db, setupFixtures, migrationVersion)