internal/wguser: use x/sys/windows instead of syscall

samczsun commented 4 years ago

This commit in wireguard-go changed the import from syscall to x/sys/windows

mdlayher commented 4 years ago

LGTM but I assume the wireguard-go dependency has to be updated too. We don't have a good windows CI solution at this point so I can't tell if this works as is. I am mobile at the moment but can test later.

mdlayher commented 4 years ago

Ah, looks like master has been broken for a bit on Windows. Oops. Thanks for this PR, I can confirm it works:

matt@DESKTOP-2G8V6U5  ~/wgctrl-go (bugfix/windows-import)
$ WGCTRL_INTEGRATION=yesreallydoit go test -v .
=== RUN   TestClientClose
--- PASS: TestClientClose (0.00s)
=== RUN   TestClientDevices
--- PASS: TestClientDevices (0.00s)
=== RUN   TestClientDevice
=== RUN   TestClientDevice/first_error
=== RUN   TestClientDevice/not_found
=== RUN   TestClientDevice/first_not_found
=== RUN   TestClientDevice/first_ok
--- PASS: TestClientDevice (0.00s)
    --- PASS: TestClientDevice/first_error (0.00s)
    --- PASS: TestClientDevice/not_found (0.00s)
    --- PASS: TestClientDevice/first_not_found (0.00s)
    --- PASS: TestClientDevice/first_ok (0.00s)
=== RUN   TestClientConfigureDevice
=== RUN   TestClientConfigureDevice/first_error
=== RUN   TestClientConfigureDevice/not_found
=== RUN   TestClientConfigureDevice/first_not_found
=== RUN   TestClientConfigureDevice/first_ok
--- PASS: TestClientConfigureDevice (0.00s)
    --- PASS: TestClientConfigureDevice/first_error (0.00s)
    --- PASS: TestClientConfigureDevice/not_found (0.00s)
    --- PASS: TestClientConfigureDevice/first_not_found (0.00s)
    --- PASS: TestClientConfigureDevice/first_ok (0.00s)
=== RUN   TestIntegrationClient
=== RUN   TestIntegrationClient/get
=== RUN   TestIntegrationClient/get/wgwindows0
=== RUN   TestIntegrationClient/configure
=== RUN   TestIntegrationClient/configure/wgwindows0
=== RUN   TestIntegrationClient/configure_many_IPs
=== RUN   TestIntegrationClient/configure_many_IPs/wgwindows0
=== RUN   TestIntegrationClient/configure_many_peers
=== RUN   TestIntegrationClient/configure_many_peers/wgwindows0
=== RUN   TestIntegrationClient/configure_peers_update_only 
=== RUN   TestIntegrationClient/configure_peers_update_only/wgwindows0 
=== RUN   TestIntegrationClient/reset 
=== RUN   TestIntegrationClient/reset/wgwindows0 
--- PASS: TestIntegrationClient (21.86s) 
    --- PASS: TestIntegrationClient/get (0.01s)
        --- PASS: TestIntegrationClient/get/wgwindows0 (0.01s)
            client_integration_test.go:129: device: wgwindows0: 40Har5v8ur2gCO9fgSpvJfDWwUZcIP3yv9PjAFzmi0E= 
    --- PASS: TestIntegrationClient/configure (0.03s)
        --- PASS: TestIntegrationClient/configure/wgwindows0 (0.03s)
            client_integration_test.go:153: before: wgwindows0: 40Har5v8ur2gCO9fgSpvJfDWwUZcIP3yv9PjAFzmi0E= 
            client_integration_test.go:199:  after: wgwindows0: YxfaZHTkh86XozotIWQNhn9P+jj+u3ndqeu6B0r0rhI= 
                - peer: whbuRzrP3oTLIUlF+xaYx1EC5z9+sGfxZIPVRH+rNmU=, IPs: 192.0.2.0/32, 2001:db8::/128      

    --- PASS: TestIntegrationClient/configure_many_IPs (0.36s)
        --- PASS: TestIntegrationClient/configure_many_IPs/wgwindows0 (0.36s)
            client_integration_test.go:259: device: wgwindows0: 1022 IPs
    --- PASS: TestIntegrationClient/configure_many_peers (21.36s)
        --- PASS: TestIntegrationClient/configure_many_peers/wgwindows0 (21.36s)
            client_integration_test.go:319: device: wgwindows0: 256 peers, 512 IPs
    --- PASS: TestIntegrationClient/configure_peers_update_only (0.02s)
        --- PASS: TestIntegrationClient/configure_peers_update_only/wgwindows0 (0.02s)
    --- PASS: TestIntegrationClient/reset (0.08s)
        --- PASS: TestIntegrationClient/reset/wgwindows0 (0.08s)
=== RUN   TestIntegrationClientIsNotExist
--- PASS: TestIntegrationClientIsNotExist (0.00s)
PASS
ok      golang.zx2c4.com/wireguard/wgctrl       22.357s

WireGuard / wgctrl-go

internal/wguser: use x/sys/windows instead of syscall #77