From 72dfc85ceb933a942ad35f69921d136575e0532d Mon Sep 17 00:00:00 2001 From: codenoid <14269809+codenoid@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:40:58 +0700 Subject: [PATCH] StackExchange/wmi is archived, replace with active fork --- go.mod | 31 ++++++++++++++++--------------- go.sum | 4 ++++ go/device/device.go | 2 +- go/identity/identity.go | 3 ++- go/os/os_windows.go | 2 +- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index adf07b1e..46903447 100644 --- a/go.mod +++ b/go.mod @@ -3,21 +3,22 @@ module github.com/google/glazier go 1.18 require ( - github.com/StackExchange/wmi v1.2.0 - github.com/capnspacehook/taskmaster v0.0.0-20210519235353-1629df7c85e9 - github.com/go-ole/go-ole v1.2.5 - github.com/google/deck v0.0.0-20221206151953-9363e9de5515 - github.com/google/go-cmp v0.5.6 - github.com/google/logger v1.1.1 - github.com/google/uuid v1.3.0 - github.com/google/winops v0.0.0-20210803215038-c8511b84de2b - github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 - github.com/pkg/errors v0.9.1 - github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e - golang.org/x/sys v0.2.0 + github.com/StackExchange/wmi v1.2.0 + github.com/capnspacehook/taskmaster v0.0.0-20210519235353-1629df7c85e9 + github.com/go-ole/go-ole v1.2.6 + github.com/google/deck v0.0.0-20221206151953-9363e9de5515 + github.com/google/go-cmp v0.5.6 + github.com/google/logger v1.1.1 + github.com/google/uuid v1.3.0 + github.com/google/winops v0.0.0-20210803215038-c8511b84de2b + github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 + github.com/pkg/errors v0.9.1 + github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e + golang.org/x/sys v0.2.0 ) require ( - github.com/rickb777/date v1.14.2 // indirect - github.com/rickb777/plural v1.2.2 // indirect -) \ No newline at end of file + github.com/rickb777/date v1.14.2 // indirect + github.com/rickb777/plural v1.2.2 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect +) diff --git a/go.sum b/go.sum index 703b0e07..22954cfc 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -49,6 +51,8 @@ github.com/rickb777/plural v1.2.2 h1:4CU5NiUqXSM++2+7JCrX+oguXd2D7RY5O1YisMw1yCI github.com/rickb777/plural v1.2.2/go.mod h1:xyHbelv4YvJE51gjMnHvk+U2e9zIysg6lTnSQK8XUYA= github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e h1:+/AzLkOdIXEPrAQtwAeWOBnPQ0BnYlBW0aCZmSb47u4= github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e/go.mod h1:9Tc1SKnfACJb9N7cw2eyuI6xzy845G7uZONBsi5uPEA= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/go/device/device.go b/go/device/device.go index 7559d0ab..b8385bf4 100644 --- a/go/device/device.go +++ b/go/device/device.go @@ -24,7 +24,7 @@ import ( "os" "strings" - "github.com/StackExchange/wmi" + "github.com/yusufpapurcu/wmi" ) var ( diff --git a/go/identity/identity.go b/go/identity/identity.go index 627de956..4242e212 100644 --- a/go/identity/identity.go +++ b/go/identity/identity.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build windows // +build windows // Package identity provides helpers for managing host identity. @@ -22,7 +23,7 @@ import ( "strings" "github.com/google/uuid" - "github.com/StackExchange/wmi" + "github.com/yusufpapurcu/wmi" ) type Win32_ComputerSystem struct { diff --git a/go/os/os_windows.go b/go/os/os_windows.go index f66d8047..e25d2c41 100644 --- a/go/os/os_windows.go +++ b/go/os/os_windows.go @@ -19,7 +19,7 @@ package os import ( - "github.com/StackExchange/wmi" + "github.com/yusufpapurcu/wmi" ) // GetType attempts to distinguish between client and server OS.