Skip to content

Commit

Permalink
upgrade go-libvirt to latest revision (@8648fbd) (digitalocean#180)
Browse files Browse the repository at this point in the history 
This involves some additional changes to overcome breaking changes from
go-libvirt.

These are the new changes in this revision of go-libvirt since the last
release go-qemu has been using:

* remove invitation to empty IRC channel
* rpc_test: use Libvirt.addStream to add streams
* MockLibvirt: deep-copy response before adding ID
* monitor socket conn state in initLibvirtComms
* libvirttest: use atomic to read "serial"
* integration: wait for Disconnected before assert
* add CODEOWNERS
* Merge pull request digitalocean#152 from clarkwalcott/readme_update_rpc_link
* Docs: Update README with working link
* expose Libvirt.Disconnected method
* Add NetworkUpdateCompat
* update libvirt configuration step for new releases
* search generated include directory for header files
* ci updates (digitalocean#142)
* integration tests (digitalocean#141)
* take dialer as input instead of already existing connection (digitalocean#140)
* support authentication via polkit (digitalocean#138)
* fix some stream problems (digitalocean#137)
* Merge pull request digitalocean#136 from digitalocean/jenni/fix_potential_segfault
* write lock only needed for actual write
* rm unneeded nil'ing of reader and writer
* socket Disconnect close can race with nil of conn
* Merge pull request digitalocean#135 from digitalocean/jenni/update_cgo
* run go get golang.org/x/tools/go/internal/cgo@v0.1.1
* Merge pull request digitalocean#134 from digitalocean/jenni/add_socket_type
* change socket to pointer ref
* Merge branch 'master' of github.com:digitalocean/go-libvirt into jenni/add_socket_type
* Merge pull request digitalocean#133 from digitalocean/jenni/fix_event_unsubscribe_race
* reorder stream shutdown/delete
* fix race in disconnect of event stream cleanup
* add socket type to handle socket connection management
* Merge pull request digitalocean#132 from digitalocean/jenni/fix_client_deadlock
* fix typo and func conciseness
* move listen and cleanup into a func
* add timeout on waiting for disconnected
* move temporary read error check to a function
* Libvirt chan socketCleanupDone -> disconnected
* fix accidental go fmt of generated files
* add connect/disconnect to unit tests
* add tests for callback cleanup on connection disconnect
* fix rpc lookup test
* fix deadlocked clients on lack of libvirt response
* add more robust connection error checking
* Merge pull request digitalocean#131 from digitalocean/jenni/fix_invalid_test_data
* fix incorrect test data
* Merge pull request digitalocean#130 from digitalocean/jenni/stream_shutdown
* fix missing stream shutdown in lifecycle subscribe
* Merge pull request digitalocean#129 from digitalocean/geoff/vet-cleanup
* remove travis config file
* Clean up some linter errors
* Merge pull request digitalocean#125 from dmacvicar/dmacvicar_puberror
* Run generators against libvirt 7.2.0
* Unexport From* (ErrorDomain)
* golint
* go fmt
* libvirt.Error: expose only Code and Message
* Run generators against libvirt 7.1.0
* go fmt
* Make libvirtError public (libvirt.Error)
* github actions (digitalocean#128)
* internal/event/stream: fixes unsafe queue access (digitalocean#127)
* Merge pull request digitalocean#124 from sam-github/check-wrapped-errors
* Check wrapped errors for IsNotFound()
* Fix two race conditions related to Disconnect (digitalocean#120)
* Merge pull request digitalocean#119 from weizhouapache/readme-add-tls-port
* README: Add missing tls port in example
* README: Add example connect to libvirt via TLS over TCP (digitalocean#118)
* Add overload for Connect() to allow other libvirt drivers (digitalocean#117)
  • Loading branch information
@connorkuehl
connorkuehl committed Aug 4, 2022
1 parent 9bde4c7 commit 85651f1
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 27 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/digitalocean/go-qemu
go 1.15

require (
github.com/digitalocean/go-libvirt v0.0.0-20201209184759-e2a69bcd5bd1
github.com/digitalocean/go-libvirt v0.0.0-20220804181439-8648fbde413e
github.com/fatih/camelcase v1.0.0
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4
golang.org/x/sys v0.0.0-20210510120138-977fb7262007
)
37 changes: 21 additions & 16 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,44 @@
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/digitalocean/go-libvirt v0.0.0-20201209184759-e2a69bcd5bd1 h1:j6vGflaQ2T7yOWqVgPdiRF73j/U2Zmpbbzab8nyDCRQ=
github.com/digitalocean/go-libvirt v0.0.0-20201209184759-e2a69bcd5bd1/go.mod h1:QS1XzqZLcDniNYrN7EZefq3wIyb/M2WmJbql4ZKoc1Q=
github.com/digitalocean/go-libvirt v0.0.0-20220704152101-6d260d9c16a3 h1:Xo40yaf991bC6M6cPWGmmoWyP67JxtKd9PpBv01rivY=
github.com/digitalocean/go-libvirt v0.0.0-20220704152101-6d260d9c16a3/go.mod h1:o129ljs6alsIQTc8d6eweihqpmmrbxZ2g1jhgjhPykI=
github.com/digitalocean/go-libvirt v0.0.0-20220802191312-ca9ffa5e873e h1:n2CI8AXLnveCM2KuI10OKN4GRyEdEm4217vYueKpTmo=
github.com/digitalocean/go-libvirt v0.0.0-20220802191312-ca9ffa5e873e/go.mod h1:o129ljs6alsIQTc8d6eweihqpmmrbxZ2g1jhgjhPykI=
github.com/digitalocean/go-libvirt v0.0.0-20220804180232-c811be39ab76 h1:HawPl7MaY81IvYgjeR3ND/9an0zCvnGf81sglNb3ePc=
github.com/digitalocean/go-libvirt v0.0.0-20220804180232-c811be39ab76/go.mod h1:o129ljs6alsIQTc8d6eweihqpmmrbxZ2g1jhgjhPykI=
github.com/digitalocean/go-libvirt v0.0.0-20220804181439-8648fbde413e h1:SCnqm8SjSa0QqRxXbo5YY//S+OryeJioe17nK+iDZpg=
github.com/digitalocean/go-libvirt v0.0.0-20220804181439-8648fbde413e/go.mod h1:o129ljs6alsIQTc8d6eweihqpmmrbxZ2g1jhgjhPykI=
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200711155855-7342f9734a7d h1:F3OmlXCzYtG9YE6tXDnUOlJBzVzHF8EcmZ1yTJlcgIk=
golang.org/x/tools v0.0.0-20200711155855-7342f9734a7d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
Expand Down
3 changes: 2 additions & 1 deletion hypervisor/rpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import (

var hvConn = func() (net.Conn, error) {
m := libvirttest.New()
return m, nil
conn, err := m.Dial()
return conn, err
}

func TestRPCDriverDomainNames(t *testing.T) {
Expand Down
48 changes: 40 additions & 8 deletions qmp/rpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ var testEvent = []byte{
}

func TestNewLibvirtRPCMonitor(t *testing.T) {
conn := libvirttest.New()
lv := libvirttest.New()
conn, err := lv.Dial()
if err != nil {
t.Error(err)
}

domain := "test-1"
rpc := NewLibvirtRPCMonitor(domain, conn)
Expand Down Expand Up @@ -118,29 +122,47 @@ func TestQMPEvent(t *testing.T) {
}

func TestLibvirtRPCMonitorConnect(t *testing.T) {
conn := libvirttest.New()
lv := libvirttest.New()
conn, err := lv.Dial()
if err != nil {
t.Error(err)
}
mon := NewLibvirtRPCMonitor("test", conn)

err := mon.Connect()
err = mon.Connect()
if err != nil {
t.Error(err)
}
}

func TestLibvirtRPCMonitorDisconnect(t *testing.T) {
conn := libvirttest.New()
lv := libvirttest.New()
conn, err := lv.Dial()
if err != nil {
t.Error(err)
}
mon := NewLibvirtRPCMonitor("test", conn)

err := mon.Disconnect()
err = mon.Disconnect()
if err != nil {
t.Error(err)
}
}

func TestLibvirtRPCMonitorRun(t *testing.T) {
conn := libvirttest.New()
lv := libvirttest.New()
conn, err := lv.Dial()
if err != nil {
t.Error(err)
}
mon := NewLibvirtRPCMonitor("test", conn)

err = mon.Connect()
if err != nil {
t.Error(err)
}
defer mon.Disconnect()

res, err := mon.Run([]byte(`{"query-version"}`))
if err != nil {
t.Error(err)
Expand Down Expand Up @@ -171,8 +193,18 @@ func TestLibvirtRPCMonitorRun(t *testing.T) {

func TestLibvirtRPCMonitorEvents(t *testing.T) {
ctx := context.Background()
conn := libvirttest.New()
lv := libvirttest.New()
conn, err := lv.Dial()
if err != nil {
t.Error(err)
}
mon := NewLibvirtRPCMonitor("test", conn)
err = mon.Connect()
if err != nil {
t.Error(err)
}
defer mon.Disconnect()

done := make(chan struct{})

stream, err := mon.Events(ctx)
Expand All @@ -191,7 +223,7 @@ func TestLibvirtRPCMonitorEvents(t *testing.T) {
}()

// send an event to the listener goroutine
_, _ = conn.Test.Write(testEvent)
_, _ = lv.Test.Write(testEvent)

// wait for completion
<-done
Expand Down

0 comments on commit 85651f1

Please sign in to comment.