diff --git a/Makefile b/Makefile index 4c456003..c0ef994a 100644 --- a/Makefile +++ b/Makefile @@ -16,12 +16,18 @@ bin/golangci-lint: validate: bin/golangci-lint ./bin/golangci-lint run --skip-dirs "test/e2e" -.PHONY: build +.PHONY: build build: validate bin bin/kvpctl.exe bin/dumpvms.exe bin/createvm.exe bin/updatevm.exe bin: mkdir -p bin +.PHONY: vendor +vendor: + go mod tidy + go mod vendor + go mod verify + bin/kvpctl.exe: $(SRC) go.mod go.sum go build -o bin ./cmd/kvpctl diff --git a/go.mod b/go.mod index 98ff16de..a91fc419 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/containers/libhvee go 1.18 require ( - github.com/containers/podman/v4 v4.9.0 - github.com/containers/storage v1.52.0 + github.com/containers/common v0.57.1-0.20240205132223-de5cb00e891c + github.com/containers/storage v1.52.1-0.20240130205044-62997abeaf2f github.com/go-ole/go-ole v1.3.0 github.com/onsi/ginkgo/v2 v2.15.0 github.com/onsi/gomega v1.31.1 @@ -20,7 +20,7 @@ require ( github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/rivo/uniseg v0.4.4 // indirect - golang.org/x/net v0.19.0 // indirect + golang.org/x/net v0.20.0 // indirect golang.org/x/term v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.16.1 // indirect diff --git a/go.sum b/go.sum index 732d6320..43f8d452 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -github.com/containers/podman/v4 v4.9.0 h1:K7lSZAlloEa3SoEHebFC+v8fY+gBMhFfjpestFDdphQ= -github.com/containers/podman/v4 v4.9.0/go.mod h1:mYrL/jqmfFbcyWpiGhXgGJJgCp0V18okNUFzsADNv7I= -github.com/containers/storage v1.52.0 h1:8QFFeJg2cQFN0TyJguxHrSz3bl7XtMRnfXrTsvLVkuY= -github.com/containers/storage v1.52.0/go.mod h1:PE+L330tisEjQrAVkfAlW8ECvqzc/jusrxJzu9TEi2w= +github.com/containers/common v0.57.1-0.20240205132223-de5cb00e891c h1:Xzo9t4eIalkeilcmYTz0YEgL7hMrGQ12GK6UlSHrEsU= +github.com/containers/common v0.57.1-0.20240205132223-de5cb00e891c/go.mod h1:s1gEyucR3ryIex1aDMo1KzbfpvRl0CaGER6s5jqXRkI= +github.com/containers/storage v1.52.1-0.20240130205044-62997abeaf2f h1:BJSLHe7f1tgu53d8mGIK/y2KhEev5lggWlIk1rWYT7k= +github.com/containers/storage v1.52.1-0.20240130205044-62997abeaf2f/go.mod h1:T/ZMocbhShnMLIF0pdkiLPwpkwlGlyUWJeSXnfC/uew= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -37,8 +37,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/pkg/hypervctl/vhd.go b/pkg/hypervctl/vhd.go index d82fed49..c7310be9 100644 --- a/pkg/hypervctl/vhd.go +++ b/pkg/hypervctl/vhd.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" + "github.com/containers/common/pkg/strongunits" "github.com/containers/libhvee/pkg/wmiext" - "github.com/containers/podman/v4/pkg/strongunits" ) // ResizeDisk takes a diskPath and strongly typed new size and uses powershell diff --git a/test/e2e/disk_test.go b/test/e2e/disk_test.go index 12ea658f..fe1506a9 100644 --- a/test/e2e/disk_test.go +++ b/test/e2e/disk_test.go @@ -2,8 +2,8 @@ package e2e import ( "fmt" + "github.com/containers/common/pkg/strongunits" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v4/pkg/strongunits" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/vendor/github.com/containers/podman/v4/LICENSE b/vendor/github.com/containers/common/LICENSE similarity index 99% rename from vendor/github.com/containers/podman/v4/LICENSE rename to vendor/github.com/containers/common/LICENSE index 9b259bdf..8dada3ed 100644 --- a/vendor/github.com/containers/podman/v4/LICENSE +++ b/vendor/github.com/containers/common/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - https://www.apache.org/licenses/ + http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -192,7 +192,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - https://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/github.com/containers/podman/v4/pkg/strongunits/config.go b/vendor/github.com/containers/common/pkg/strongunits/config.go similarity index 100% rename from vendor/github.com/containers/podman/v4/pkg/strongunits/config.go rename to vendor/github.com/containers/common/pkg/strongunits/config.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 20895180..8e7464bd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,7 +1,7 @@ -# github.com/containers/podman/v4 v4.9.0 -## explicit; go 1.18 -github.com/containers/podman/v4/pkg/strongunits -# github.com/containers/storage v1.52.0 +# github.com/containers/common v0.57.1-0.20240205132223-de5cb00e891c +## explicit; go 1.20 +github.com/containers/common/pkg/strongunits +# github.com/containers/storage v1.52.1-0.20240130205044-62997abeaf2f ## explicit; go 1.20 github.com/containers/storage/pkg/regexp github.com/containers/storage/pkg/stringid @@ -71,7 +71,7 @@ github.com/schollz/progressbar/v3 # github.com/sirupsen/logrus v1.9.3 ## explicit; go 1.13 github.com/sirupsen/logrus -# golang.org/x/net v0.19.0 +# golang.org/x/net v0.20.0 ## explicit; go 1.18 golang.org/x/net/context golang.org/x/net/html