From 3281b1d32b9a9e5e43bb33ffb2553118df1e5d89 Mon Sep 17 00:00:00 2001 From: Conrad Hoffmann Date: Wed, 23 Feb 2022 13:36:51 +0100 Subject: [PATCH] Switch to new interfaces with context See https://github.com/emersion/go-webdav/pull/53 --- go.mod | 13 +++++++------ go.sum | 4 ++-- storage/postgresql.go | 14 ++++++++------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 0a4b27f..04cbb38 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,11 @@ module git.sr.ht/~sircmpwn/tokidoki go 1.17 require ( - github.com/emersion/go-imap v1.2.0 // indirect - github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac // indirect - github.com/emersion/go-vcard v0.0.0-20210521075357-3445b9171995 // indirect - github.com/emersion/go-webdav v0.3.1 // indirect - github.com/go-chi/chi/v5 v5.0.7 // indirect - golang.org/x/text v0.3.7 // indirect + github.com/emersion/go-imap v1.2.0 + github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac + github.com/emersion/go-vcard v0.0.0-20210521075357-3445b9171995 + github.com/emersion/go-webdav v0.3.2-0.20220223110113-0f6744ede83c + github.com/go-chi/chi/v5 v5.0.7 ) + +require golang.org/x/text v0.3.7 // indirect diff --git a/go.sum b/go.sum index 7089ed4..4bc541c 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1: github.com/emersion/go-vcard v0.0.0-20191221110513-5f81fa0d3cc7/go.mod h1:HMJKR5wlh/ziNp+sHEDV2ltblO4JD2+IdDOWtGcQBTM= github.com/emersion/go-vcard v0.0.0-20210521075357-3445b9171995 h1:DpVfmcoBs6o9VYcccNWbuKFQxuHCgt25/y4q9H8AUvc= github.com/emersion/go-vcard v0.0.0-20210521075357-3445b9171995/go.mod h1:HMJKR5wlh/ziNp+sHEDV2ltblO4JD2+IdDOWtGcQBTM= -github.com/emersion/go-webdav v0.3.1 h1:8ISu6AlBwu7DKg9RQE3iRpE3CPM8Bfpfz7L3bi/xlGI= -github.com/emersion/go-webdav v0.3.1/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q= +github.com/emersion/go-webdav v0.3.2-0.20220223110113-0f6744ede83c h1:HOnawYumt/OFrlda12w+TKS/3m0eqsET7nJbgrAS/fI= +github.com/emersion/go-webdav v0.3.2-0.20220223110113-0f6744ede83c/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q= github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/storage/postgresql.go b/storage/postgresql.go index 843a2d0..2b3a945 100644 --- a/storage/postgresql.go +++ b/storage/postgresql.go @@ -1,6 +1,8 @@ package storage import ( + "context" + "github.com/emersion/go-vcard" "github.com/emersion/go-webdav/carddav" ) @@ -13,26 +15,26 @@ func NewPostgreSQL() carddav.Backend { return &psqlBackend{} } -func (*psqlBackend) AddressBook() (*carddav.AddressBook, error) { +func (*psqlBackend) AddressBook(ctx context.Context) (*carddav.AddressBook, error) { panic("TODO") } -func (*psqlBackend) GetAddressObject(path string, req *carddav.AddressDataRequest) (*carddav.AddressObject, error) { +func (*psqlBackend) GetAddressObject(ctx context.Context, path string, req *carddav.AddressDataRequest) (*carddav.AddressObject, error) { panic("TODO") } -func (*psqlBackend) ListAddressObjects(req *carddav.AddressDataRequest) ([]carddav.AddressObject, error) { +func (*psqlBackend) ListAddressObjects(ctx context.Context, req *carddav.AddressDataRequest) ([]carddav.AddressObject, error) { panic("TODO") } -func (*psqlBackend) QueryAddressObjects(query *carddav.AddressBookQuery) ([]carddav.AddressObject, error) { +func (*psqlBackend) QueryAddressObjects(ctx context.Context, query *carddav.AddressBookQuery) ([]carddav.AddressObject, error) { panic("TODO") } -func (*psqlBackend) PutAddressObject(path string, card vcard.Card) (loc string, err error) { +func (*psqlBackend) PutAddressObject(ctx context.Context, path string, card vcard.Card) (loc string, err error) { panic("TODO") } -func (*psqlBackend) DeleteAddressObject(path string) error { +func (*psqlBackend) DeleteAddressObject(ctx context.Context, path string) error { panic("TODO") }