From bd6485565e78c0bbb9ee830c4e5b114c6248dc97 Mon Sep 17 00:00:00 2001
From: Roberto Hidalgo <un@rob.mx>
Date: Mon, 8 May 2023 19:29:47 -0600
Subject: allow additional ServiceMeta, docs

---
 doc/book/reference-manual/configuration.md | 15 +++++++++++++--
 src/rpc/consul_services.rs                 | 19 ++++++++++++-------
 src/util/config.rs                         |  3 +++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/doc/book/reference-manual/configuration.md b/doc/book/reference-manual/configuration.md
index 38062bab..348a352a 100644
--- a/doc/book/reference-manual/configuration.md
+++ b/doc/book/reference-manual/configuration.md
@@ -42,6 +42,17 @@ client_cert = "/etc/consul/consul-client.crt"
 client_key = "/etc/consul/consul-key.crt"
 tls_skip_verify = false
 
+[consul_service_discovery]
+consul_http_addr = "https://127.0.0.1:8501"
+consul_http_token = "abcdef-01234-56789"
+service_name = "garage"
+ca_cert = "/etc/consul/consul-ca.crt"
+tls_skip_verify = false
+# tags to add to the published service
+tags = [ "dns-enabled" ]
+# additional service meta to send along registration
+meta = { dns-acl = "allow trusted" }
+
 [kubernetes_discovery]
 namespace = "garage"
 service_name = "garage-daemon"
@@ -201,7 +212,7 @@ Garage supports the following replication modes:
     that should probably never be used.
 
 Note that in modes `2` and `3`,
-if at least the same number of zones are available, an arbitrary number of failures in 
+if at least the same number of zones are available, an arbitrary number of failures in
 any given zone is tolerated as copies of data will be spread over several zones.
 
 **Make sure `replication_mode` is the same in the configuration files of all nodes.
@@ -245,7 +256,7 @@ Values between `1` (faster compression) and `19` (smaller file) are standard com
 levels for zstd. From `20` to `22`, compression levels are referred as "ultra" and must be
 used with extra care as it will use lot of memory. A value of `0` will let zstd choose a
 default value (currently `3`). Finally, zstd has also compression designed to be faster
-than default compression levels, they range from `-1` (smaller file) to `-99` (faster 
+than default compression levels, they range from `-1` (smaller file) to `-99` (faster
 compression).
 
 If you do not specify a `compression_level` entry, Garage will set it to `1` for you. With
diff --git a/src/rpc/consul_services.rs b/src/rpc/consul_services.rs
index 928c7691..aaf3c4a1 100644
--- a/src/rpc/consul_services.rs
+++ b/src/rpc/consul_services.rs
@@ -129,17 +129,22 @@ impl ConsulServiceDiscovery {
 		]
 		.concat();
 
+		let mut meta = HashMap::from([
+			(format!("{}-pubkey", META_PREFIX), hex::encode(node_id)),
+			(format!("{}-hostname", META_PREFIX), hostname.to_string()),
+		]);
+
+		if let Some(global_meta) = &self.config.meta {
+			for (key, value) in global_meta.into_iter() {
+				meta.insert(key.clone(), value.clone());
+			}
+		}
+
 		let advertisement: ConsulPublishService = ConsulPublishService {
 			service_id: node.clone(),
 			service_name: self.config.service_name.clone(),
 			tags,
-			meta: [
-				(format!("{}-pubkey", META_PREFIX), hex::encode(node_id)),
-				(format!("{}-hostname", META_PREFIX), hostname.to_string()),
-			]
-			.iter()
-			.cloned()
-			.collect(),
+			meta,
 			address: rpc_public_addr.ip(),
 			port: rpc_public_addr.port(),
 		};
diff --git a/src/util/config.rs b/src/util/config.rs
index 4b32f8ba..84a8e34f 100644
--- a/src/util/config.rs
+++ b/src/util/config.rs
@@ -168,6 +168,9 @@ pub struct ConsulServiceConfig {
 	// Additional tags to add to the service
 	#[serde(default)]
 	pub tags: Vec<String>,
+	// Additional service metadata to add
+	#[serde(default)]
+	pub meta: Option<std::collections::HashMap<String, String>>,
 	/// Skip TLS hostname verification
 	#[serde(default)]
 	pub tls_skip_verify: bool,
-- 
cgit v1.2.3