go-dqlite v2

canonical · Nov 14, 2024 · beefaa8 · beefaa8
1 parent c5cd2a0
commit beefaa8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 470 deletions.
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
@@ -69,8 +69,8 @@ jobs:
 
   benchmarks:
     permissions:
-      contents: read  # for actions/checkout to fetch code
-      pull-requests: write  # for marocchino/sticky-pull-request-comment to create or update PR comment
+      contents: read # for actions/checkout to fetch code
+      pull-requests: write # for marocchino/sticky-pull-request-comment to create or update PR comment
     name: Run Benchmarks
     runs-on: ubuntu-latest
 
@@ -97,7 +97,7 @@ jobs:
       - name: Install Dqlite
         run: |
           sudo add-apt-repository -y ppa:dqlite/dev 
-          sudo apt install libdqlite-dev
+          sudo apt install libdqlite1.17-dev
 
       - name: Run benchmarks
         id: bench
@@ -152,11 +152,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           header: Benchmarks
           message: |
-            ### Benchmark Result
+            ### Benchmark
+
+            <details><summary>Results </summary>
 
             ```
             ${{ steps.stats.outputs.diff }}
             ```
+            </details>
 
             <details><summary>Current status</summary>
 

diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ bin/static/k8s-dqlite: $(DQLITE_BUILD_SCRIPTS_DIR)/.deps/static/lib/libdqlite.a
 
 bin/static/dqlite: $(DQLITE_BUILD_SCRIPTS_DIR)/.deps/static/lib/libdqlite.a
 	mkdir -p bin/static
-	GOBIN=$(shell pwd)/bin/static $(DQLITE_BUILD_SCRIPTS_DIR)/static-go-install.sh github.com/canonical/go-dqlite/cmd/dqlite@v1.20.0
+	GOBIN=$(shell pwd)/bin/static $(DQLITE_BUILD_SCRIPTS_DIR)/static-go-install.sh github.com/canonical/go-dqlite/v2/cmd/dqlite@v2.0.0
 
 ## Dynamic Builds
 dynamic: bin/dynamic/k8s-dqlite bin/dynamic/dqlite
@@ -44,7 +44,7 @@ bin/dynamic/k8s-dqlite: bin/dynamic/lib/libdqlite.so $(GO_SOURCES)
 
 bin/dynamic/dqlite: bin/dynamic/lib/libdqlite.so
 	mkdir -p bin/dynamic
-	GOBIN=$(shell pwd)/bin/dynamic $(DQLITE_BUILD_SCRIPTS_DIR)/dynamic-go-install.sh github.com/canonical/go-dqlite/cmd/dqlite@v1.20.0
+	GOBIN=$(shell pwd)/bin/dynamic $(DQLITE_BUILD_SCRIPTS_DIR)/dynamic-go-install.sh github.com/canonical/go-dqlite/v2/cmd/dqlite@v2.0.0
 
 ## Cleanup
 clean:

diff --git a/go.mod b/go.mod
@@ -2,16 +2,14 @@ module github.com/canonical/k8s-dqlite
 
 go 1.22
 
-toolchain go1.22.8
-
 require (
-	github.com/canonical/go-dqlite v1.22.0
+	github.com/canonical/go-dqlite/v2 v2.0.0
 	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/onsi/gomega v1.27.10
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.8.0
+	github.com/spf13/cobra v1.8.1
 	go.etcd.io/etcd/api/v3 v3.5.12
 	go.etcd.io/etcd/client/pkg/v3 v3.5.12
 	go.etcd.io/etcd/client/v3 v3.5.12

diff --git a/go.sum b/go.sum
diff --git a/pkg/kine/drivers/dqlite/dqlite.go b/pkg/kine/drivers/dqlite/dqlite.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/canonical/go-dqlite"
-	"github.com/canonical/go-dqlite/driver"
+	"github.com/canonical/go-dqlite/v2"
+	"github.com/canonical/go-dqlite/v2/driver"
 	"github.com/canonical/k8s-dqlite/pkg/kine/drivers/generic"
 	"github.com/canonical/k8s-dqlite/pkg/kine/drivers/sqlite"
 	"github.com/canonical/k8s-dqlite/pkg/kine/server"

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -10,9 +10,9 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/canonical/go-dqlite"
-	"github.com/canonical/go-dqlite/app"
-	"github.com/canonical/go-dqlite/client"
+	"github.com/canonical/go-dqlite/v2"
+	"github.com/canonical/go-dqlite/v2/app"
+	"github.com/canonical/go-dqlite/v2/client"
 	"github.com/canonical/k8s-dqlite/pkg/kine/drivers/generic"
 	"github.com/canonical/k8s-dqlite/pkg/kine/endpoint"
 	"github.com/canonical/k8s-dqlite/pkg/kine/server"

diff --git a/test/util_test.go b/test/util_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/canonical/go-dqlite/app"
+	"github.com/canonical/go-dqlite/v2/app"
 	"github.com/canonical/k8s-dqlite/pkg/instrument"
 	"github.com/canonical/k8s-dqlite/pkg/kine/endpoint"
 	"github.com/canonical/k8s-dqlite/pkg/kine/server"