Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,8 @@ class AccessControlServiceRunSpec extends AnyFlatSpec with Matchers {
// below also passes for an initialize() that opens nothing at all, off a pool some earlier
// test in this JVM installed.
initialized.sqlServerAfter.map(_ ne initialized.sqlServerBefore.orNull) shouldBe Some(true)
// Not the test-cases database: pointing the running service at it would have every access
// check read a schema that the CI e2e specs truncate underneath it. Only the URL is pinned —
// storage.conf ships username and password as the same string ("postgres"), so nothing here
// can tell the two credential arguments apart.
// Only the URL is pinned — storage.conf ships username and password as the same string
// ("postgres"), so nothing here can tell the two credential arguments apart.
initialized.pooledJdbcUrl.get shouldBe StorageConfig.jdbcUrl
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,6 @@ class TexeraWebApplicationSpec extends AnyFlatSpec with Matchers {
databaseReachable,
"run() requires a reachable Postgres at the configured JDBC URL (provided in CI)"
)
// Not the test-cases database: pointing the running server at it would have every dashboard
// read and write a schema that the CI e2e specs truncate underneath it.
ranEnvironment
pooledJdbcUrl shouldBe Some(StorageConfig.jdbcUrl)
}
Expand Down
6 changes: 0 additions & 6 deletions common/config/src/main/resources/storage.conf
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,6 @@ storage {
url = "jdbc:postgresql://localhost:5432/texera_db?currentSchema=texera_db,public"
url = ${?STORAGE_JDBC_URL}

# Some e2e test cases require the user system. To make sure running those test cases can pass the CI, and that
# running them locally do not contaminate developers' own texera_db, we use another database with a different
# name for running these test cases.
url-for-test-cases = "jdbc:postgresql://localhost:5432/texera_db_for_test_cases?currentSchema=texera_db,public"
url-for-test-cases = ${?STORAGE_JDBC_URL_FOR_TEST_CASES}

username = "postgres"
username = ${?STORAGE_JDBC_USERNAME}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ object StorageConfig {

// JDBC specifics
val jdbcUrl: String = conf.getString("storage.jdbc.url")
val jdbcUrlForTestCases: String = conf.getString("storage.jdbc.url-for-test-cases")
val jdbcUsername: String = conf.getString("storage.jdbc.username")
val jdbcPassword: String = conf.getString("storage.jdbc.password")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,7 @@ class ConfigServiceRunSpec
// below also passes for an initialize() that opens nothing at all, off a pool some earlier
// test in this JVM installed.
initialized.sqlServerAfter.map(_ ne initialized.sqlServerBefore.orNull) shouldBe Some(true)
// Not the test-cases database: preloading the defaults into it would leave the deployment's
// own site_settings empty while the CI e2e specs truncate the rows that were written. Only
// the URL is pinned — storage.conf ships username and password as the same string
// Only the URL is pinned — storage.conf ships username and password as the same string
// ("postgres"), so nothing here can tell the two credential arguments apart.
initialized.pooledJdbcUrl.get shouldBe StorageConfig.jdbcUrl
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,8 @@ class NotebookMigrationServiceRunSpec extends AnyFlatSpec with Matchers {
// below also passes for an initialize() that opens nothing at all, off a pool some earlier
// test in this JVM installed.
initialized.sqlServerAfter.map(_ ne initialized.sqlServerBefore.orNull) shouldBe Some(true)
// Not the test-cases database: pointing the running service at it would have every migration
// record land in a schema that the CI e2e specs truncate underneath it. Only the URL is
// pinned — storage.conf ships username and password as the same string ("postgres"), so
// nothing here can tell the two credential arguments apart.
// Only the URL is pinned — storage.conf ships username and password as the same string
// ("postgres"), so nothing here can tell the two credential arguments apart.
initialized.pooledJdbcUrl.get shouldBe StorageConfig.jdbcUrl
}
}
Expand Down
Loading