scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 02:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

serverless sqldb use same env for test config as normal

Browse source
This commit is contained in:
Matthew Jaffee 2023-03-21 15:21:39 -05:00
parent 2f7ae30784
commit 4f95b32093
3 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.gitlab/.gitlab-ci.yml
View file

@ -256,13 +256,13 @@ run go tests race:
image: golang:$GOVERSION
extends: .go-cache
variables:
SQLDB_DB: run_go_tests_race
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE: run_go_tests_race
POSTGRES_DB: run_go_tests_race
SQLDB_USER: postgres
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: postgres
POSTGRES_USER: postgres
SQLDB_PASSWORD: $POSTGRES_PASSWORD
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: $POSTGRES_PASSWORD
POSTGRES_PASSWORD: $POSTGRES_PASSWORD
SQLDB_HOST: postgres
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: postgres
services:
- postgres:14.7
rules:
@ -287,13 +287,13 @@ run go tests:
image: golang:$GOVERSION
extends: .go-cache
variables:
SQLDB_DB: run_go_tests
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE: run_go_tests
POSTGRES_DB: run_go_tests
SQLDB_USER: postgres
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: postgres
POSTGRES_USER: postgres
SQLDB_PASSWORD: $POSTGRES_PASSWORD
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: $POSTGRES_PASSWORD
POSTGRES_PASSWORD: $POSTGRES_PASSWORD
SQLDB_HOST: postgres
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: postgres
services:
- postgres:14.7
rules:
@ -319,13 +319,13 @@ run go tests dax/test/dax:
tags:
- docker
variables:
SQLDB_DB: run_go_tests_dax
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE: run_go_tests_dax
POSTGRES_DB: run_go_tests_dax
SQLDB_USER: postgres
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: postgres
POSTGRES_USER: postgres
SQLDB_PASSWORD: $POSTGRES_PASSWORD
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: $POSTGRES_PASSWORD
POSTGRES_PASSWORD: $POSTGRES_PASSWORD
SQLDB_HOST: postgres
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: postgres
services:
- postgres:14.7
rules:

18
dax/controller/sqldb/test.go
View file

@ -20,11 +20,11 @@ func EnvOr(envName, defaultVal string) string {
func GetTestConfig() *controller.SQLDBConfig {
return &controller.SQLDBConfig{
Dialect: "postgres",
Database: EnvOr("SQLDB_DB", "dax_test"),
Host: EnvOr("SQLDB_HOST", "127.0.0.1"),
Port: EnvOr("SQLDB_PORT", "5432"),
User: EnvOr("SQLDB_USER", "postgres"),
Password: EnvOr("SQLDB_PASSWORD", "testpass"),
Database: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_DATABASE", "dax_test"),
Host: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST", "127.0.0.1"),
Port: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PORT", "5432"),
User: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER", "postgres"),
Password: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD", "testpass"),
}
}
@ -33,9 +33,9 @@ func GetTestConfigRandomDB(dbprefix string) *controller.SQLDBConfig {
return &controller.SQLDBConfig{
Dialect: "postgres",
Database: fmt.Sprintf("%s_%d", dbprefix, rnd.Int()),
Host: EnvOr("SQLDB_HOST", "127.0.0.1"),
Port: EnvOr("SQLDB_PORT", "5432"),
User: EnvOr("SQLDB_USER", "postgres"),
Password: EnvOr("SQLDB_PASSWORD", "testpass"),
Host: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST", "127.0.0.1"),
Port: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PORT", "5432"),
User: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER", "postgres"),
Password: EnvOr("FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD", "testpass"),
}
}

4
idk/docker-compose.yml
View file

@ -147,10 +147,6 @@ services:
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_USER: "postgres"
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_PASSWORD: "password"
FEATUREBASE_CONTROLLER_CONFIG_SQLDB_HOST: "postgres"
SQLDB_DB: "postgres"
SQLDB_USER: "postgres"
SQLDB_PASSWORD: "password"
SQLDB_HOST: "postgres"
FEATUREBASE_COMPUTER_RUN: "true"
FEATUREBASE_COMPUTER_CONFIG_DATA_DIR: /dax-data/computer
FEATUREBASE_COMPUTER_CONFIG_WRITELOGGER_DIR: /dax-data/wl