upgrade to new dbus pkg (keybase#84)

* fix * change init method
figma · May 6, 2022 · c18928c · c18928c
1 parent ad3b4a8
commit c18928c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/keybase/go-keychain
 go 1.17
 
 require (
-	github.com/keybase/go.dbus v0.0.0-20200324223359-a94be52c0b03
+	github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.5.1
 	golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59

diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/keybase/go.dbus v0.0.0-20200324223359-a94be52c0b03 h1:k9rCqucCsPpBKDh9gDwk3U46TcNd7jpKahed9JGICGY=
-github.com/keybase/go.dbus v0.0.0-20200324223359-a94be52c0b03/go.mod h1:a8clEhrrGV/d76/f9r2I41BwANMihfZYV9C223vaxqE=
+github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a h1:K0EAzgzEQHW4Y5lxrmvPMltmlRDzlhLfGmots9EHUTI=
+github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a/go.mod h1:YPNKjjE7Ubp9dTbnWvsP3HT+hYnY6TfXzubYTBeUxc8=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

diff --git a/secretservice/secretservice.go b/secretservice/secretservice.go
@@ -4,7 +4,7 @@ import (
 	"math/big"
 	"time"
 
-	dbus "github.com/keybase/go.dbus"
+	dbus "github.com/keybase/dbus"
 	errors "github.com/pkg/errors"
 )
 
@@ -67,7 +67,7 @@ const DefaultSessionOpenTimeout = 10 * time.Second
 
 // NewService
 func NewService() (*SecretService, error) {
-	conn, err := dbus.SessionBus()
+	conn, err := dbus.ConnectSessionBus()
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to open dbus connection")
 	}
@@ -82,12 +82,12 @@ func (s *SecretService) SetSessionOpenTimeout(d time.Duration) {
 }
 
 // ServiceObj
-func (s *SecretService) ServiceObj() *dbus.Object {
+func (s *SecretService) ServiceObj() dbus.BusObject {
 	return s.conn.Object(SecretServiceInterface, SecretServiceObjectPath)
 }
 
 // Obj
-func (s *SecretService) Obj(path dbus.ObjectPath) *dbus.Object {
+func (s *SecretService) Obj(path dbus.ObjectPath) dbus.BusObject {
 	return s.conn.Object(SecretServiceInterface, path)
 }
 

diff --git a/secretservice/secretservice_test.go b/secretservice/secretservice_test.go
@@ -10,7 +10,7 @@ package secretservice
 import (
 	"testing"
 
-	dbus "github.com/keybase/go.dbus"
+	dbus "github.com/keybase/dbus"
 	"github.com/stretchr/testify/require"
 )