Skip to content

Commit 690fbad

Browse files
committed
RHINENG-22333: admin and feed_db need db admin
1 parent 5d22170 commit 690fbad

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

base/core/config.go

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

17-
func ConfigureApp() {
17+
func ConfigureAppAdmin(useAdmin bool) {
1818
utils.ConfigureLogging()
19-
database.Configure()
19+
database.ConfigureAdmin(useAdmin)
2020
metrics.Configure()
2121
database.DBWait(dbWait)
2222
}
2323

24+
func ConfigureApp() {
25+
ConfigureAppAdmin(false)
26+
}
27+
2428
func SetupTestEnvironment() {
2529
utils.SetDefaultEnvOrFail("LOG_LEVEL", "debug")
2630
ConfigureApp()

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.InitDB(true)
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.ConfigureAppAdmin(true)
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)