From b0d15937850c21be84e3b3d879cc12f5eb1c85c6 Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Thu, 23 Feb 2023 15:29:00 -0500 Subject: [PATCH 1/2] Upgrade disco client Pull in https://github.com/rqlite/rqlite-disco-clients/pull/12 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 04b21aab..9bc2c488 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/mkideal/pkg v0.1.3 github.com/rqlite/go-sqlite3 v1.27.1 github.com/rqlite/raft-boltdb v0.0.0-20211018013422-771de01086ce - github.com/rqlite/rqlite-disco-clients v0.0.0-20220328160918-ec33ecd01491 + github.com/rqlite/rqlite-disco-clients v0.0.0-20230223142702-e7b84b86c5e1 github.com/rqlite/sql v0.0.0-20221103124402-8f9ff0ceb8f0 go.etcd.io/bbolt v1.3.6 go.etcd.io/etcd/client/v3 v3.5.6 // indirect diff --git a/go.sum b/go.sum index 42000b0c..4c2692d9 100644 --- a/go.sum +++ b/go.sum @@ -724,8 +724,8 @@ github.com/rqlite/go-sqlite3 v1.27.1 h1:BZMF7lB7kflMgWbULsM8TpKHM9vzcINEknbe0YC6 github.com/rqlite/go-sqlite3 v1.27.1/go.mod h1:nd4ooHtz396nqTudi+5u7stMN8EEkHjceyUARVYOceY= github.com/rqlite/raft-boltdb v0.0.0-20211018013422-771de01086ce h1:sVlzmCJiaM0LGK3blAHOD/43QxJZ8bLCDcsqZRatnFE= github.com/rqlite/raft-boltdb v0.0.0-20211018013422-771de01086ce/go.mod h1:mc+WNDHyskdViYAoPnaMXEBnSKBmoUgiEZjrlAj6G34= -github.com/rqlite/rqlite-disco-clients v0.0.0-20220328160918-ec33ecd01491 h1:EtnrSIl+hdibyxb8ykdU9BFxqKUH4c4trKWLwNQD2vM= -github.com/rqlite/rqlite-disco-clients v0.0.0-20220328160918-ec33ecd01491/go.mod h1:pym85nj6JnCI7rM9RxTZ4cubkTQyyg7uLwVydso9B80= +github.com/rqlite/rqlite-disco-clients v0.0.0-20230223142702-e7b84b86c5e1 h1:VpkBFpaovYdXLC+gKOmApgW8wrsNVQ7hWmb+y6HydS8= +github.com/rqlite/rqlite-disco-clients v0.0.0-20230223142702-e7b84b86c5e1/go.mod h1:pym85nj6JnCI7rM9RxTZ4cubkTQyyg7uLwVydso9B80= github.com/rqlite/sql v0.0.0-20221103124402-8f9ff0ceb8f0 h1:C8DZB5okjhCSd7zvkOM+zxGz7S6ulUFIL34bpkqFk+0= github.com/rqlite/sql v0.0.0-20221103124402-8f9ff0ceb8f0/go.mod h1:ib9zVtNgRKiGuoMyUqqL5aNpk+r+++YlyiVIkclVqPg= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= From 4f0b82eb85a1324913de11a4e1505203cecb2fdf Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Thu, 23 Feb 2023 15:31:24 -0500 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03f1fbbd..9a53cb06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 7.13.2 (unreleased) ### Implementation changes and bug fixes - [PR #1156](https://github.com/rqlite/rqlite/pull/1156): Better error message when rqlite shell can't connect to a node. +- [PR #1162](https://github.com/rqlite/rqlite/pull/1162): Fix Consul-based discovery issue when using TLS. ## 7.13.1 (January 6th 2023) ### Implementation changes and bug fixes