From 18e0f395e696e72819ea6e5cbd51349d798012b7 Mon Sep 17 00:00:00 2001
From: Evgeny Glukhov <gluhov1998@yandex.ru>
Date: Tue, 9 Jan 2024 12:17:36 +0300
Subject: [PATCH] replicaset: support ipv6 uri

cartridge tool doesn't work with ipv6 addrs. Without this changes
operation `cartridge replicasets setup --bootstrap-vshard` failed because
`replicaset.master.uri` contains ipv6 addr without brackets.

Changes add brackets to replica uri if it is ipv6 address.

Needed for tarantool/cartridge#2166

NO_DOC=minor
---
 test/replicaset-luatest/replicaset_3_test.lua | 10 ++++++++++
 vshard/replicaset.lua                         |  2 +-
 vshard/util.lua                               | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/test/replicaset-luatest/replicaset_3_test.lua b/test/replicaset-luatest/replicaset_3_test.lua
index 0107e7ba..20806699 100644
--- a/test/replicaset-luatest/replicaset_3_test.lua
+++ b/test/replicaset-luatest/replicaset_3_test.lua
@@ -300,3 +300,13 @@ test_group.test_named_replicaset = function(g)
     t.assert_equals(ret, nil)
     vtest.storage_start(g.replica_1_b, global_cfg)
 end
+
+test_group.test_ipv6_uri = function(g)
+    local new_cfg = table.deepcopy(global_cfg)
+    local rs_uuid = g.replica_1_a:replicaset_uuid()
+    local uuid = g.replica_1_a:instance_uuid()
+    new_cfg.sharding[rs_uuid].replicas[uuid].uri = 'storage:storage@[::1]:3301'
+    local _, rs = next(vreplicaset.buildall(new_cfg))
+    local replica_string = 'replica_1_a(storage@[::1]:3301)'
+    t.assert_equals(tostring(rs.master), replica_string)
+end
diff --git a/vshard/replicaset.lua b/vshard/replicaset.lua
index ef3e7376..5fbecf75 100644
--- a/vshard/replicaset.lua
+++ b/vshard/replicaset.lua
@@ -1204,7 +1204,7 @@ local replica_mt = {
         safe_uri = function(replica)
             local uri = luri.parse(replica.uri)
             uri.password = nil
-            return luri.format(uri)
+            return util.uri_format(uri)
         end,
         detach_conn = replica_detach_conn,
     },
diff --git a/vshard/util.lua b/vshard/util.lua
index a4aeb18e..4e519bf7 100644
--- a/vshard/util.lua
+++ b/vshard/util.lua
@@ -418,6 +418,22 @@ else
     end
 end
 
+local uri_v6_str = "[::1]:80"
+local uri_format
+-- URI module format() function doesn't behave correctly for IPv6 addresses on
+-- some Tarantool versions (all <= 3.0). In fact, at the time of writing none of
+-- the versions have this bug fixed.
+if luri.format(luri.parse(uri_v6_str)) ~= uri_v6_str then
+    uri_format = function(u)
+        if u.ipv6 then
+            u.host = '[' .. u.host .. ']'
+        end
+        return luri.format(u)
+    end
+else
+    uri_format = luri.format
+end
+
 return {
     core_version = tnt_version,
     uri_eq = uri_eq,
@@ -439,4 +455,5 @@ return {
     feature = feature,
     schema_version = schema_version,
     replicaset_uuid = replicaset_uuid,
+    uri_format = uri_format,
 }