Merge pull request #27 from cthit/additions_config

Get additions file from config
cthit · Mar 25, 2024 · 659fbe7 · 659fbe7
2 parents 803fd92 + c90e6cd
commit 659fbe7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/example.config.toml b/example.config.toml
@@ -10,6 +10,9 @@
     apiKey = "key"
     url = "http://localhost:8081"
 
+[additions]
+	file = "additions.json"
+
 [ldap]
 	url = "ldap.mydomain.ex:636"
 	servername = "mydomain.ex"

diff --git a/internal/app/web/services.go b/internal/app/web/services.go
@@ -111,7 +111,7 @@ func getChangeSuggestions(fromJson string, toJson string) (actions.UserActions,
 	consumerUsers = collectUsers(consumer)
 
 	// Get and process additions
-	providerGroups, providerUsers = pkg.AddAdditions(providerGroups, providerUsers, "additions.json")
+	providerGroups, providerUsers = pkg.AddAdditions(providerGroups, providerUsers, viper.GetString("additions.file"))
 
 	// Check for and handle duplicates
 	providerUsers, providerGroups = duplicates.RemoveDuplicates(providerUsers, providerGroups)