From 312103ecfb2f8f2311f9f7e23b1eacbda405bae9 Mon Sep 17 00:00:00 2001 From: Wesley Hershberger Date: Wed, 30 Oct 2024 14:25:45 -0500 Subject: [PATCH 1/3] cmd/demo: Remove deprecated ioutil Signed-off-by: Wesley Hershberger --- cmd/dqlite-demo/dqlite-demo.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/dqlite-demo/dqlite-demo.go b/cmd/dqlite-demo/dqlite-demo.go index ee69d8c4..28fc8326 100644 --- a/cmd/dqlite-demo/dqlite-demo.go +++ b/cmd/dqlite-demo/dqlite-demo.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "crypto/x509" "fmt" - "io/ioutil" + "io" "log" "net" "net/http" @@ -65,7 +65,7 @@ Complete documentation is available at https://github.com/canonical/go-dqlite`, if err != nil { return err } - data, err := ioutil.ReadFile(crt) + data, err := os.ReadFile(crt) if err != nil { return err } @@ -104,7 +104,7 @@ Complete documentation is available at https://github.com/canonical/go-dqlite`, err = row.Scan(&result) case "PUT": result = "done" - value, _ := ioutil.ReadAll(r.Body) + value, _ := io.ReadAll(r.Body) _, err = db.Exec(update, key, string(value[:])) default: err = fmt.Errorf("unsupported method") From 9484ef22f7e0d5fb4ba9503cb265abcc8b268db6 Mon Sep 17 00:00:00 2001 From: Wesley Hershberger Date: Wed, 30 Oct 2024 14:39:36 -0500 Subject: [PATCH 2/3] cmd/demo: Add ReadLastEntryInfo to demo Signed-off-by: Wesley Hershberger --- cmd/dqlite-demo/dqlite-demo.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/dqlite-demo/dqlite-demo.go b/cmd/dqlite-demo/dqlite-demo.go index 28fc8326..b0e9d3d2 100644 --- a/cmd/dqlite-demo/dqlite-demo.go +++ b/cmd/dqlite-demo/dqlite-demo.go @@ -14,6 +14,7 @@ import ( "path/filepath" "strings" + "github.com/canonical/go-dqlite/v3" "github.com/canonical/go-dqlite/v3/app" "github.com/canonical/go-dqlite/v3/client" "github.com/pkg/errors" @@ -138,6 +139,13 @@ Complete documentation is available at https://github.com/canonical/go-dqlite`, app.Handover(context.Background()) app.Close() + lastEntry, err := dqlite.ReadLastEntryInfo(dir) + if err != nil { + return nil + } + + fmt.Printf("dqlite-demo: last entry had term=%d index=%d", lastEntry.Term, lastEntry.Index) + return nil }, } From c9c21c81e18d333f95810c0692a1b47d7165887e Mon Sep 17 00:00:00 2001 From: Wesley Hershberger Date: Wed, 30 Oct 2024 14:44:53 -0500 Subject: [PATCH 3/3] cmd/shell: Remove deprecated ioutil Signed-off-by: Wesley Hershberger --- cmd/dqlite/dqlite.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/dqlite/dqlite.go b/cmd/dqlite/dqlite.go index 5bb74e01..48840287 100644 --- a/cmd/dqlite/dqlite.go +++ b/cmd/dqlite/dqlite.go @@ -6,7 +6,6 @@ import ( "crypto/x509" "fmt" "io" - "io/ioutil" "os" "strings" "time" @@ -72,7 +71,7 @@ func main() { return err } - data, err := ioutil.ReadFile(crt) + data, err := os.ReadFile(crt) if err != nil { return err }