feat: support ipv6 from address

lzgabel · Feb 26, 2024 · 582084b · 582084b
1 parent e1f73af
commit 582084b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/clients/go/cmd/zbctl/internal/commands/root.go b/clients/go/cmd/zbctl/internal/commands/root.go
@@ -98,6 +98,13 @@ var initClient = func(cmd *cobra.Command, args []string) error {
 	var credsProvider zbc.CredentialsProvider
 
 	host, port, err := parseAddress()
+	ip := net.ParseIP(host)
+  if ip == nil {
+    err = fmt.Errorf("Invalid IP address: %s\n", host)
+  } else if ip.To16() != nil {
+      host = fmt.Sprintf("[%s]", host)
+  }
+
 	if err != nil {
 		return err
 	}

diff --git a/clients/go/pkg/zbc/client_test.go b/clients/go/pkg/zbc/client_test.go
@@ -544,6 +544,35 @@ func (s *clientTestSuite) TestOverrideHostAndPortEnvVar() {
 	s.EqualValues(fmt.Sprintf("%s:%s", address, port), config.GatewayAddress)
 }
 
+func (s *clientTestSuite) TestHostWithIPV6() {
+	// given
+	host := "[::1]"
+  port := "9090"
+  lis, grpcServer := createServer(host, port)
+
+  go grpcServer.Serve(lis)
+  defer func() {
+    grpcServer.Stop()
+    _ = lis.Close()
+  }()
+
+  client, err := NewClient(&ClientConfig{
+    GatewayAddress:    fmt.Sprintf("%s:%s", host, port),
+    UsePlaintextConnection: true,
+  })
+
+  s.NoError(err)
+
+  // when
+  _, err = client.NewTopologyCommand().Send(context.Background())
+
+  // then
+  s.Error(err)
+  if grpcStatus, ok := status.FromError(err); ok {
+    s.EqualValues(codes.Unimplemented, grpcStatus.Code())
+  }
+}
+
 func createSecureServer(withSan bool) (net.Listener, *grpc.Server) {
 	certFile := "testdata/chain.cert.pem"
 	keyFile := "testdata/private.key.pem"