From c4deaf09941cc951198f8adef25538dd88296da4 Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Wed, 11 Jan 2023 09:50:12 +0100
Subject: [PATCH] cscli: avoid initializing the db configuration twice (#1982)

---
 cmd/crowdsec-cli/alerts.go   | 3 ---
 cmd/crowdsec-cli/bouncers.go | 3 ---
 cmd/crowdsec-cli/machines.go | 4 ----
 cmd/crowdsec-cli/utils.go    | 3 ---
 4 files changed, 13 deletions(-)

diff --git a/cmd/crowdsec-cli/alerts.go b/cmd/crowdsec-cli/alerts.go
index 0ac3b88b9..c3f5862a8 100644
--- a/cmd/crowdsec-cli/alerts.go
+++ b/cmd/crowdsec-cli/alerts.go
@@ -443,9 +443,6 @@ cscli alerts delete -s crowdsecurity/ssh-bf"`,
 			if err := csConfig.LoadAPIServer(); err != nil || csConfig.DisableAPI {
 				log.Fatal("Local API is disabled, please run this command on the local API machine")
 			}
-			if err := csConfig.LoadDBConfig(); err != nil {
-				log.Fatal(err)
-			}
 			dbClient, err = database.NewClient(csConfig.DbConfig)
 			if err != nil {
 				log.Fatalf("unable to create new database client: %s", err)
diff --git a/cmd/crowdsec-cli/bouncers.go b/cmd/crowdsec-cli/bouncers.go
index 3c2dcec34..025fa11b7 100644
--- a/cmd/crowdsec-cli/bouncers.go
+++ b/cmd/crowdsec-cli/bouncers.go
@@ -206,9 +206,6 @@ Note: This command requires database direct access, so is intended to be run on
 			if err := csConfig.LoadAPIServer(); err != nil || csConfig.DisableAPI {
 				log.Fatal("Local API is disabled, please run this command on the local API machine")
 			}
-			if err := csConfig.LoadDBConfig(); err != nil {
-				log.Fatal(err)
-			}
 			dbClient, err = database.NewClient(csConfig.DbConfig)
 			if err != nil {
 				log.Fatalf("unable to create new database client: %s", err)
diff --git a/cmd/crowdsec-cli/machines.go b/cmd/crowdsec-cli/machines.go
index 2c9722af3..62f6ee124 100644
--- a/cmd/crowdsec-cli/machines.go
+++ b/cmd/crowdsec-cli/machines.go
@@ -407,10 +407,6 @@ Note: This command requires database direct access, so is intended to be run on
 				}
 				log.Fatal("Local API is disabled, please run this command on the local API machine")
 			}
-			if err := csConfig.LoadDBConfig(); err != nil {
-				log.Errorf("This command requires direct database access (must be run on the local API machine)")
-				log.Fatal(err)
-			}
 		},
 	}
 
diff --git a/cmd/crowdsec-cli/utils.go b/cmd/crowdsec-cli/utils.go
index b2f14f45c..01817ac09 100644
--- a/cmd/crowdsec-cli/utils.go
+++ b/cmd/crowdsec-cli/utils.go
@@ -739,9 +739,6 @@ func getDBClient() (*database.Client, error) {
 	if err := csConfig.LoadAPIServer(); err != nil || csConfig.DisableAPI {
 		return nil, err
 	}
-	if err := csConfig.LoadDBConfig(); err != nil {
-		return nil, err
-	}
 	ret, err := database.NewClient(csConfig.DbConfig)
 	if err != nil {
 		return nil, err