2 files changed, 23 insertions, 6 deletions
diff --git a/src/zenutil/consul/consul.cpp b/src/zenutil/consul/consul.cpp
index c9144e589..ad1b92b38 100644
--- a/src/zenutil/consul/consul.cpp
+++ b/src/zenutil/consul/consul.cpp
@@ -107,7 +107,7 @@ ConsulProcess::StopConsulAgent()
 
 //////////////////////////////////////////////////////////////////////////
 
-ConsulClient::ConsulClient(std::string_view BaseUri, std::string_view Token) : m_Token(Token), m_HttpClient(BaseUri)
+ConsulClient::ConsulClient(const Configuration& Config) : m_Config(Config), m_HttpClient(m_Config.BaseUri)
 {
 }
 
@@ -241,9 +241,19 @@ ConsulClient::DeregisterService(std::string_view ServiceId)
 void
 ConsulClient::ApplyCommonHeaders(HttpClient::KeyValueMap& InOutHeaderMap)
 {
-	if (!m_Token.empty())
+	std::string Token;
+	if (!m_Config.StaticToken.empty())
 	{
-		InOutHeaderMap.Entries.emplace("X-Consul-Token", m_Token);
+		Token = m_Config.StaticToken;
+	}
+	else if (!m_Config.TokenEnvName.empty())
+	{
+		Token = GetEnvVariable(m_Config.TokenEnvName);
+	}
+
+	if (!Token.empty())
+	{
+		InOutHeaderMap.Entries.emplace("X-Consul-Token", Token);
 	}
 }
 
diff --git a/src/zenutil/include/zenutil/consul.h b/src/zenutil/include/zenutil/consul.h
index 4002d5d23..f48e5b212 100644
--- a/src/zenutil/include/zenutil/consul.h
+++ b/src/zenutil/include/zenutil/consul.h
@@ -28,7 +28,14 @@ struct ServiceRegistrationInfo
 class ConsulClient
 {
 public:
-	ConsulClient(std::string_view BaseUri, std::string_view Token = "");
+	struct Configuration
+	{
+		std::string BaseUri;
+		std::string StaticToken;
+		std::string TokenEnvName;
+	};
+
+	ConsulClient(const Configuration& Config);
 	~ConsulClient();
 
 	ConsulClient(const ConsulClient&) = delete;
@@ -56,8 +63,8 @@ private:
 	static bool FindServiceInJson(std::string_view Json, std::string_view ServiceId);
 	void		ApplyCommonHeaders(HttpClient::KeyValueMap& InOutHeaderMap);
 
-	std::string m_Token;
-	HttpClient	m_HttpClient;
+	Configuration m_Config;
+	HttpClient	  m_HttpClient;
 };
 
 class ConsulProcess