configurable env token name

XohoTech · Nov 20, 2018 · e7d4410 · e7d4410
1 parent 21f60ff
commit e7d4410
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/server/src/main/resources/reference.conf b/server/src/main/resources/reference.conf
@@ -32,6 +32,7 @@ broccoli {
   nomad {
     # The URL of the Nomad client to be used by Broccoli.
     url = "http://localhost:4646"
+    token-env-name = "NOMAD_BROCCOLI_TOKEN"
   }
 
   # The frequency by which to ask Nomad and Consul for running tasks and services respectively

diff --git a/server/src/main/scala/de/frosner/broccoli/nomad/NomadConfiguration.scala b/server/src/main/scala/de/frosner/broccoli/nomad/NomadConfiguration.scala
@@ -1,10 +1,8 @@
 package de.frosner.broccoli.nomad
 
-import com.typesafe.config.Config
-
 /**
   * The Nomad configuration.
   *
   * @param url The URL to connect to to access nomad via HTTP.
   */
-final case class NomadConfiguration(url: String)
+final case class NomadConfiguration(url: String, tokenEnvName: String)
diff --git a/server/src/main/scala/de/frosner/broccoli/services/NomadService.scala b/server/src/main/scala/de/frosner/broccoli/services/NomadService.scala
@@ -23,7 +23,7 @@ class NomadService @Inject()(nomadConfiguration: NomadConfiguration, ws: WSClien
 
   private val log = play.api.Logger(getClass)
 
-  val headers = sys.env.get("NOMAD-BROCCOLI-TOKEN").map(authToken => ("X-Nomad-Token", authToken)).toList
+  val headers = sys.env.get(nomadConfiguration.tokenEnvName).map(authToken => ("X-Nomad-Token", authToken)).toList
 
   log.info(s"Starting $this")