Skip to content

Commit 69327d0

Browse files
committed
RHINENG-22333: admin and feed_db need db admin
1 parent 98dcf1e commit 69327d0

4 files changed

Lines changed: 18 additions & 4 deletions

File tree

base/core/config.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,22 @@ var (
1414
dbWait = utils.PodConfig.GetString("wait_for_db", "empty")
1515
)
1616

17-
func ConfigureApp() {
17+
func configureBaseApp() {
1818
utils.ConfigureLogging()
19-
database.Configure()
2019
metrics.Configure()
2120
database.DBWait(dbWait)
2221
}
2322

23+
func ConfigureApp() {
24+
database.Configure()
25+
configureBaseApp()
26+
}
27+
28+
func ConfigureAdminApp() {
29+
database.ConfigureAdmin()
30+
configureBaseApp()
31+
}
32+
2433
func SetupTestEnvironment() {
2534
utils.SetDefaultEnvOrFail("LOG_LEVEL", "debug")
2635
ConfigureApp()

base/database/setup.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ func Configure() {
5050
loadAdditionalParamsFromDB()
5151
}
5252

53+
func ConfigureAdmin() {
54+
InitAdminDB()
55+
loadAdditionalParamsFromDB()
56+
}
57+
5358
// PostgreSQLConfig PostgreSQL database config
5459
type PostgreSQLConfig struct {
5560
Host string

scripts/feed_db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
)
77

88
func main() {
9-
database.InitDB()
9+
database.InitAdminDB()
1010
if len(os.Args) > 1 {
1111
switch os.Args[1] {
1212
case "inventory_hosts":

turnpike/admin_api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
// @BasePath /api/patch/admin
2626
func RunAdminAPI() {
27-
core.ConfigureApp()
27+
core.ConfigureAdminApp()
2828

2929
// Toggle Turnpike authentication for internal API (manual sync, re-calc)
3030
enableTurnpikeAuth := utils.PodConfig.GetBool("turnpike_auth", true)

0 commit comments

Comments
 (0)